Patchwork classes/license: fix manifest to work with deb

login
register
mail settings
Submitter Paul Eggleton
Date July 5, 2012, 2:48 p.m.
Message ID <1341499703-6867-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/31247/
State Accepted
Commit 56fafe083fdb63f156a081344fb1d836e3182bf0
Headers show

Comments

Paul Eggleton - July 5, 2012, 2:48 p.m.
Prepend the license manifest creation call to ROOTFS_POSTPROCESS_COMMAND
instead of appending to ROOTFS_POSTINSTALL_COMMAND. The latter is not
implemented for the deb backend (and probably ought to just be removed
completely), and by using _prepend we can still ensure it occurs before
package info is removed (and before buildhistory in case it is needed
there in future).

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/license.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - July 9, 2012, 5:06 p.m.
On 07/05/2012 07:48 AM, Paul Eggleton wrote:
> Prepend the license manifest creation call to ROOTFS_POSTPROCESS_COMMAND
> instead of appending to ROOTFS_POSTINSTALL_COMMAND. The latter is not
> implemented for the deb backend (and probably ought to just be removed
> completely), and by using _prepend we can still ensure it occurs before
> package info is removed (and before buildhistory in case it is needed
> there in future).
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>   meta/classes/license.bbclass |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index e6096a6..4e25cf8 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -382,7 +382,7 @@ do_populate_lic[sstate-name] = "populate-lic"
>   do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}"
>   do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/"
>
> -ROOTFS_POSTINSTALL_COMMAND += "license_create_manifest; "
> +ROOTFS_POSTPROCESS_COMMAND_prepend = "license_create_manifest; "
>
>   python do_populate_lic_setscene () {
>   	sstate_setscene(d)
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index e6096a6..4e25cf8 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -382,7 +382,7 @@  do_populate_lic[sstate-name] = "populate-lic"
 do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}"
 do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/"
 
-ROOTFS_POSTINSTALL_COMMAND += "license_create_manifest; "
+ROOTFS_POSTPROCESS_COMMAND_prepend = "license_create_manifest; "
 
 python do_populate_lic_setscene () {
 	sstate_setscene(d)