mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 13:49:49 +00:00
Code Issues Projects Releases Wiki Activity

Control over when package init scripts are run

Browse Source 
When a package is built, some installation scripts must be
performed on the target.  In the case of a complete image,
these scripts are run by a separate step at init time, but
only during the first boot (other package install scripts
can just be run when the package is installed on the target).

This patch lets the distribution (or user) decide when these
postponed install scripts should run.  The default is normally
near the end of init, but there may be times when it's beneficial
to run them earlier so the "when" can be overridden.

(From OE-Core rev: a46466893407d44dd16ab37ae70e1bee14bdde0a)

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Gary Thomas
2011-04-18 08:23:27 -06:00
committed by Richard Purdie
parent 46197c431d
commit 8e7f1b444e
4 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/rootfs_rpm.bbclass
+8 -3
View File
@@ -26,6 +26,11 @@ RPM_POSTPROCESS_COMMANDS = ""
# #
#IMAGE_LOCALES="en-gb" #IMAGE_LOCALES="en-gb"
#
# Allow distributions to alter when [postponed] package install scripts are run
#
POSTINSTALL_INITPOSITION ?= "98"
rpmlibdir = "/var/lib/rpm" rpmlibdir = "/var/lib/rpm"
opkglibdir = "${localstatedir}/lib/opkg" opkglibdir = "${localstatedir}/lib/opkg"
@@ -116,7 +121,7 @@ EOF
install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
# Stop $i getting expanded below... # Stop $i getting expanded below...
i=\$i i=\$i
cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure << EOF cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF
#!/bin/sh #!/bin/sh
for i in /etc/rpm-postinsts/*.sh; do for i in /etc/rpm-postinsts/*.sh; do
echo "Running postinst $i..." echo "Running postinst $i..."
@@ -127,9 +132,9 @@ for i in /etc/rpm-postinsts/*.sh; do
echo "ERROR: postinst $i failed." echo "ERROR: postinst $i failed."
fi fi
done done
rm -f ${sysconfdir}/rcS.d/S98configure rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
EOF 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} install -d ${IMAGE_ROOTFS}/${sysconfdir}
echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
meta/recipes-devtools/opkg/opkg.inc
+4
View File
@@ -34,3 +34,7 @@ BBCLASSEXTEND = "native nativesdk"
PKGSUFFIX = "" PKGSUFFIX = ""
PKGSUFFIX_virtclass-nativesdk = "-nativesdk" 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"
meta/recipes-devtools/opkg/opkg_0.1.8.bb
+4 -9
View File
@@ -13,7 +13,7 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \
file://headerfix.patch \ file://headerfix.patch \
" "
PR = "r3" PR = "r4"
PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
@@ -26,11 +26,6 @@ do_install_append() {
install -d ${D}${localstatedir}/lib/opkg 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} () { pkg_postinst_${PN} () {
#!/bin/sh #!/bin/sh
if [ "x$D" != "x" ]; then 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 # this happens at S98 where our good 'ole packages script used to run
echo "#!/bin/sh echo "#!/bin/sh
opkg-cl configure opkg-cl configure
rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure " > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
fi fi
update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100
meta/recipes-devtools/opkg/opkg_svn.bb
+4 -9
View File
@@ -16,7 +16,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
S = "${WORKDIR}/trunk" S = "${WORKDIR}/trunk"
PV = "0.1.8+svnr${SRCPV}" PV = "0.1.8+svnr${SRCPV}"
PR = "r1" PR = "r2"
PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
@@ -29,11 +29,6 @@ do_install_append() {
install -d ${D}${localstatedir}/lib/opkg 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} () { pkg_postinst_${PN} () {
#!/bin/sh #!/bin/sh
if [ "x$D" != "x" ]; then 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 # this happens at S98 where our good 'ole packages script used to run
echo "#!/bin/sh echo "#!/bin/sh
opkg-cl configure opkg-cl configure
rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure " > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure
fi fi
update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100