[meta-selinux][PATCH V3] rpm: modify the rpm bbappend file to suitable for rpm4

[meta-selinux][PATCH V3] rpm: modify the rpm bbappend file to suitable for rpm4

[Dengke Du]

Changed in V3:
	rebase the patch on the latest master branch.

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.

2. drop the patch for rpm5.

3. delete the does not exist files when run task do_package.

Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
 recipes-devtools/rpm/{rpm_%.bbappend => rpm_git.bbappend} | 4 ----
 1 file changed, 4 deletions(-)
 rename recipes-devtools/rpm/{rpm_%.bbappend => rpm_git.bbappend} (56%)

diff --git a/recipes-devtools/rpm/rpm_%.bbappend b/recipes-devtools/rpm/rpm_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 := "${THISDIR}/${PN}:"
 
-FILES_${PN} += "${libdir}/rpm/bin/spooktool \
-                ${libdir}/rpm/bin/semodule \
-               "
-
 inherit with-selinux
 PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage,"
-- 
2.11.0

Re: [meta-selinux][PATCH V3] rpm: modify the rpm bbappend file to suitable for rpm4

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 2348 bytes --]

[[yocto] [meta-selinux][PATCH V3] rpm: modify the rpm bbappend file to suitable for rpm4] On 17.05.10 (Wed 03:03) Dengke Du wrote:

> Changed in V3:
> 	rebase the patch on the latest master branch.
> 
> 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.
> 
> 2. drop the patch for rpm5.
> 
> 3. delete the does not exist files when run task do_package.
> 
> Signed-off-by: Dengke Du <dengke.du@windriver.com>
> ---
>  recipes-devtools/rpm/{rpm_%.bbappend => rpm_git.bbappend} | 4 ----
>  1 file changed, 4 deletions(-)
>  rename recipes-devtools/rpm/{rpm_%.bbappend => 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

   <explanation of the problem and how this solves it>

   Signed-off-by: Dengke Du <dengke.du@windriver.com>
   ---
   <diffstat, possibly commentary or further explanation that's not
   important to the commit log itself and explanation of what's changed
   between different versions of the patch, since this is a v3>

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/rpm_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 := "${THISDIR}/${PN}:"
>  
> -FILES_${PN} += "${libdir}/rpm/bin/spooktool \
> -                ${libdir}/rpm/bin/semodule \
> -               "
> -
>  inherit with-selinux
>  PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage,"
> -- 
> 2.11.0
> 
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]