diff options
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 11 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_0.1.8.bb | 13 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg_svn.bb | 13 |
4 files changed, 20 insertions, 21 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index aa1b339550..3a11858cd0 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -26,6 +26,11 @@ RPM_POSTPROCESS_COMMANDS = "" # #IMAGE_LOCALES="en-gb" +# +# Allow distributions to alter when [postponed] package install scripts are run +# +POSTINSTALL_INITPOSITION ?= "98" + rpmlibdir = "/var/lib/rpm" opkglibdir = "${localstatedir}/lib/opkg" @@ -116,7 +121,7 @@ EOF install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d # Stop $i getting expanded below... i=\$i - cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure << EOF + cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF #!/bin/sh for i in /etc/rpm-postinsts/*.sh; do echo "Running postinst $i..." @@ -127,9 +132,9 @@ for i in /etc/rpm-postinsts/*.sh; do echo "ERROR: postinst $i failed." fi done -rm -f ${sysconfdir}/rcS.d/S98configure +rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure EOF - chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure + chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index c3174917a5..50f1afc1fe 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -34,3 +34,7 @@ BBCLASSEXTEND = "native nativesdk" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk" + +# Define a variable to allow distros to run configure earlier. +# (for example, to enable loading of ethernet kernel modules before networking starts) +POSTINSTALL_INITPOSITION ?= "98" diff --git a/meta/recipes-devtools/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb index 6815474207..18cf0428ce 100644 --- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb +++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb @@ -13,7 +13,7 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \ file://headerfix.patch \ " -PR = "r3" +PR = "r4" PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" @@ -26,11 +26,6 @@ do_install_append() { install -d ${D}${localstatedir}/lib/opkg } -# Define a variable to allow distros to run configure earlier. -# (for example, to enable loading of ethernet kernel modules before networking starts) -OPKG_INIT_POSITION = "98" -OPKG_INIT_POSITION_slugos = "41" - pkg_postinst_${PN} () { #!/bin/sh if [ "x$D" != "x" ]; then @@ -38,9 +33,9 @@ if [ "x$D" != "x" ]; then # this happens at S98 where our good 'ole packages script used to run echo "#!/bin/sh opkg-cl configure -rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure -" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure - chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure +rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure +" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure + chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure fi update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index 76ec838875..d8af823c7c 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb @@ -16,7 +16,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ S = "${WORKDIR}/trunk" PV = "0.1.8+svnr${SRCPV}" -PR = "r1" +PR = "r2" PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" @@ -29,11 +29,6 @@ do_install_append() { install -d ${D}${localstatedir}/lib/opkg } -# Define a variable to allow distros to run configure earlier. -# (for example, to enable loading of ethernet kernel modules before networking starts) -OPKG_INIT_POSITION = "98" -OPKG_INIT_POSITION_slugos = "41" - pkg_postinst_${PN} () { #!/bin/sh if [ "x$D" != "x" ]; then @@ -41,9 +36,9 @@ if [ "x$D" != "x" ]; then # this happens at S98 where our good 'ole packages script used to run echo "#!/bin/sh opkg-cl configure -rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure -" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure - chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure +rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure +" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure + chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure fi update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 |