[oe-core v2] rpm: split out run-postinsts

[oe-core v2] rpm: split out run-postinsts

[Zhenhua Luo]

Split out run-postinsts script into separated package, sometimes only the postinsts script is required to run all postinsts scripts in /etc/rpm-postinsts/ instead of the whole rpm package.

Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
---
 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 6286771..cfdc390 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
-PR = "r61"
+PR = "r62"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...
@@ -199,7 +199,7 @@ CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE"
 
 LDFLAGS_append_libc-uclibc = "-lrt -lpthread"
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale ${PN}-postinsts"
 
 SOLIBS = "5.4.so"
 
@@ -223,9 +223,11 @@ FILES_${PN} =  "${bindir}/rpm \
 		${libdir}/rpm/bin/wget \
 		/var/lib/rpm \
 		/var/cache/rpm \
-		${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
 		"
 
+FILES_${PN}-postinsts = "${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
+                "
+
 FILES_${PN}-dbg += "${libdir}/rpm/.debug \
 		${libdir}/rpm/bin/.debug \
 		"
-- 
1.7.9.5

Re: [oe-core v2] rpm: split out run-postinsts

[Richard Purdie]

On Thu, 2013-03-21 at 10:05 +0800, Zhenhua Luo wrote:
> Split out run-postinsts script into separated package, sometimes only the postinsts script is required to run all postinsts scripts in /etc/rpm-postinsts/ instead of the whole rpm package.
> 
> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
> ---
>  meta/recipes-devtools/rpm/rpm_5.4.9.bb |    8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
> index 6286771..cfdc390 100644
> --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
> +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
> @@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
>  LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
>  
>  DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
> -PR = "r61"
> +PR = "r62"
>  
>  # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
>  # in order to extract the distribution SRPM into a format we can extract...
> @@ -199,7 +199,7 @@ CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE"
>  
>  LDFLAGS_append_libc-uclibc = "-lrt -lpthread"
>  
> -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
> +PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale ${PN}-postinsts"
>  
>  SOLIBS = "5.4.so"
>  
> @@ -223,9 +223,11 @@ FILES_${PN} =  "${bindir}/rpm \
>  		${libdir}/rpm/bin/wget \
>  		/var/lib/rpm \
>  		/var/cache/rpm \
> -		${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
>  		"
>  
> +FILES_${PN}-postinsts = "${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
> +                "
> +
>  FILES_${PN}-dbg += "${libdir}/rpm/.debug \
>  		${libdir}/rpm/bin/.debug \
>  		"

Don't we need to depend on this package somewhere so that it gets
installed?

Cheers,

Richard

Re: [oe-core v2] rpm: split out run-postinsts

[Mark Hatle]

On 3/22/13 11:29 AM, Richard Purdie wrote:
> On Thu, 2013-03-21 at 10:05 +0800, Zhenhua Luo wrote:
>> Split out run-postinsts script into separated package, sometimes only the postinsts script is required to run all postinsts scripts in /etc/rpm-postinsts/ instead of the whole rpm package.
>>
>> Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
>> ---
>>   meta/recipes-devtools/rpm/rpm_5.4.9.bb |    8 +++++---
>>   1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
>> index 6286771..cfdc390 100644
>> --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
>> +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
>> @@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
>>   LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
>>
>>   DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
>> -PR = "r61"
>> +PR = "r62"
>>
>>   # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
>>   # in order to extract the distribution SRPM into a format we can extract...
>> @@ -199,7 +199,7 @@ CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY -DRPM_VENDOR_OE"
>>
>>   LDFLAGS_append_libc-uclibc = "-lrt -lpthread"
>>
>> -PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale"
>> +PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-staticdev ${PN}-common ${PN}-build python-rpm-dbg python-rpm-staticdev python-rpm-dev python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale ${PN}-postinsts"
>>
>>   SOLIBS = "5.4.so"
>>
>> @@ -223,9 +223,11 @@ FILES_${PN} =  "${bindir}/rpm \
>>   		${libdir}/rpm/bin/wget \
>>   		/var/lib/rpm \
>>   		/var/cache/rpm \
>> -		${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
>>   		"
>>
>> +FILES_${PN}-postinsts = "${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
>> +                "
>> +
>>   FILES_${PN}-dbg += "${libdir}/rpm/.debug \
>>   		${libdir}/rpm/bin/.debug \
>>   		"
>
> Don't we need to depend on this package somewhere so that it gets
> installed?

I think it should be required from the rootfs_rpm.bbclass in some way.

--Mark

> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [oe-core v2] rpm: split out run-postinsts

[Luo Zhenhua-B19537]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> Mark Hatle
> Sent: Saturday, March 23, 2013 1:05 AM
> 
> On 3/22/13 11:29 AM, Richard Purdie wrote:
> > On Thu, 2013-03-21 at 10:05 +0800, Zhenhua Luo wrote:
> >> Split out run-postinsts script into separated package, sometimes only
> the postinsts script is required to run all postinsts scripts in
> /etc/rpm-postinsts/ instead of the whole rpm package.
> >>
> >> @@ -223,9 +223,11 @@ FILES_${PN} =  "${bindir}/rpm \
> >>   		${libdir}/rpm/bin/wget \
> >>   		/var/lib/rpm \
> >>   		/var/cache/rpm \
> >> -		${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
> \
> >>   		"
> >>
> >> +FILES_${PN}-postinsts =
> "${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts \
> >> +                "
> >> +
> >>   FILES_${PN}-dbg += "${libdir}/rpm/.debug \
> >>   		${libdir}/rpm/bin/.debug \
> >>   		"
> >
> > Don't we need to depend on this package somewhere so that it gets
> > installed?
> 
> I think it should be required from the rootfs_rpm.bbclass in some way.
[Luo Zhenhua-B19537] Is following the right way to include the rpm-postinsts into rootfs or any better idea? Below patch is verified to be working. 

--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -35,6 +35,8 @@ opkglibdir = "${localstatedir}/lib/opkg"
 RPMOPTS="--dbpath ${rpmlibdir}"
 RPM="rpm ${RPMOPTS}"
 
+IMAGE_INSTALL += "rpm-postinsts"
+
 # RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files 
 # in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently
 do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"


Best Regards,

Zhenhua

Re: [oe-core v2] rpm: split out run-postinsts

[Richard Purdie]

On Mon, 2013-03-25 at 10:38 +0000, Luo Zhenhua-B19537 wrote:
> > > Don't we need to depend on this package somewhere so that it gets
> > > installed?
> > 
> > I think it should be required from the rootfs_rpm.bbclass in some way.
> [Luo Zhenhua-B19537] Is following the right way to include the rpm-postinsts into rootfs or any better idea? Below patch is verified to be working. 
> 
> --- a/meta/classes/rootfs_rpm.bbclass
> +++ b/meta/classes/rootfs_rpm.bbclass
> @@ -35,6 +35,8 @@ opkglibdir = "${localstatedir}/lib/opkg"
>  RPMOPTS="--dbpath ${rpmlibdir}"
>  RPM="rpm ${RPMOPTS}"
>  
> +IMAGE_INSTALL += "rpm-postinsts"
> +
>  # RPM doesn't work with multiple rootfs generation at once due to collisions in the use of files 
>  # in ${DEPLOY_DIR_RPM}. This can be removed if package_update_index_rpm can be called concurrently
>  do_rootfs[lockfiles] += "${DEPLOY_DIR_RPM}/rpm.lock"

Looking at rootfs_ipk:

ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}"
ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"

seems to be a pretty good setup to copy, particularly given the rpm
counterpart:

# Postinstalls on device are handled within this class at present
ROOTFS_PKGMANAGE_BOOTSTRAP = ""

which is no longer true.

Cheers,

Richard