From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id A3935E00B47; Wed, 10 May 2017 05:22:13 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no * trust * [192.94.38.131 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 81F31E00B3E for ; Wed, 10 May 2017 05:22:09 -0700 (PDT) Received: from svr-orw-fem-05.mgc.mentorg.com ([147.34.97.43]) by relay1.mentorg.com with esmtp id 1d8Qd6-0003TK-9g from Joe_MacDonald@mentor.com ; Wed, 10 May 2017 05:22:08 -0700 Received: from burninator (147.34.91.1) by svr-orw-fem-05.mgc.mentorg.com (147.34.97.43) with Microsoft SMTP Server id 14.3.224.2; Wed, 10 May 2017 05:22:07 -0700 Received: by burninator (Postfix, from userid 1000) id C98B95812F8; Wed, 10 May 2017 08:22:06 -0400 (EDT) Date: Wed, 10 May 2017 08:22:06 -0400 From: Joe MacDonald To: Dengke Du Message-ID: <20170510122206.GC24456@mentor.com> References: <20170510070330.43118-1-dengke.du@windriver.com> MIME-Version: 1.0 In-Reply-To: <20170510070330.43118-1-dengke.du@windriver.com> X-URL: http://github.com/joeythesaint/joe-s-common-environment/tree/master X-Configuration: git://github.com/joeythesaint/joe-s-common-environment.git X-Editor: Vim-704 http://www.vim.org User-Agent: Mutt/1.5.23 (2014-03-12) Cc: yocto@yoctoproject.org Subject: Re: [meta-selinux][PATCH V3] rpm: modify the rpm bbappend file to suitable for rpm4 X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2017 12:22:13 -0000 X-Groupsio-MsgNum: 35949 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="yLVHuoLXiP9kZBkt" Content-Disposition: inline --yLVHuoLXiP9kZBkt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable [[yocto] [meta-selinux][PATCH V3] rpm: modify the rpm bbappend file to suit= able for rpm4] On 17.05.10 (Wed 03:03) Dengke Du wrote: > Changed in V3: > rebase the patch on the latest master branch. >=20 > 1. change the rpm_5.4.16.bbappend to rpm_git.bbappend, this is > because the rpm in oe-core has become rpm4 from rpm5. >=20 > 2. drop the patch for rpm5. >=20 > 3. delete the does not exist files when run task do_package. >=20 > Signed-off-by: Dengke Du > --- > recipes-devtools/rpm/{rpm_%.bbappend =3D> rpm_git.bbappend} | 4 ---- > 1 file changed, 4 deletions(-) > rename recipes-devtools/rpm/{rpm_%.bbappend =3D> rpm_git.bbappend} (56%) I think I understand what you're looking to do here, but the comments are completely unclear. A commit log should look something like: rpm: move rpm recipe to rpm_git Signed-off-by: Dengke Du --- You can accomplish this with the --annotate flag to git-send-email and then in your editor just ensure the revision history and additional commentary goes after the --- line. As for the change, deleting package contents that are no longer present is fine, but why change % to git in the recipe name? We moved from a specific version number to % so we would be somewhat divorced from the changes in oe-core, this change reverses that decision. -J. > diff --git a/recipes-devtools/rpm/rpm_%.bbappend b/recipes-devtools/rpm/r= pm_git.bbappend > similarity index 56% > rename from recipes-devtools/rpm/rpm_%.bbappend > rename to recipes-devtools/rpm/rpm_git.bbappend > index 199a7e4..9f3ec90 100644 > --- a/recipes-devtools/rpm/rpm_%.bbappend > +++ b/recipes-devtools/rpm/rpm_git.bbappend > @@ -1,8 +1,4 @@ > FILESEXTRAPATHS_prepend :=3D "${THISDIR}/${PN}:" > =20 > -FILES_${PN} +=3D "${libdir}/rpm/bin/spooktool \ > - ${libdir}/rpm/bin/semodule \ > - " > - > inherit with-selinux > PACKAGECONFIG[selinux] =3D "${WITH_SELINUX},${WITHOUT_SELINUX},libsemana= ge," > --=20 > 2.11.0 >=20 --=20 -Joe MacDonald. :wq --yLVHuoLXiP9kZBkt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJZEwXuAAoJEEn8ffcsOfaWPkUH/A31iCjhjJ5GRCHlL6tweyIi aZYEARAEZJPUGl6CLzUR81eqgVCPtXmOdVb6w4GBFaZ3pr4iGP+yL7p6h02k6tRW BZwluiTgX4y/ZqHg7jnCtsBpzO/GirsKf83bnHiDzswhbI6/9qBCo+kXUb5IujEy lbR3fNRhJy5ZLovWZC8PlRww1SJ5VnI7Z58rb9vdjGsLIXa7psXRqRksmcAf7XVn oE77zpFl1CCsHZWQSUv4iA96jNoGeME8/CmihY3TnD1XJq7g+INGBFZWcY2S62kg ki51cV+wLg8l/a64ZzWh0vbaWti0Dv4C75TKqwAXnyciAlSAJNohskcOZUVpG7c= =fYpf -----END PGP SIGNATURE----- --yLVHuoLXiP9kZBkt--