Skip to contentSkip to conversation

classes/license: fix manifest to work with deb

PATCH Applied Paul Eggleton 2 participants 2 messages Jul 5, 2012 – Jul 9, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 classes/license: fix manifest to work with deb

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).

---
 meta/classes/license.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/license.bbclass +1 -1
index e6096a6..4e25cf8 100644
@@ -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)
Signature · 1 line
1.7.9.5
Applied
#1 lore raw
Quoted 18 lines · Paul Eggleton

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).

---
  meta/classes/license.bbclass |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/license.bbclass +0 -0
index e6096a6..4e25cf8 100644

meta/classes/license.bbclass do_populate_lic[sstate-name] = "populate-lic" · line 388

Quoted 8 lines
meta/classes/license.bbclass +1 -1
@@ -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!