diff options
Diffstat (limited to 'meta')
-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 = "" | |||
26 | # | 26 | # |
27 | #IMAGE_LOCALES="en-gb" | 27 | #IMAGE_LOCALES="en-gb" |
28 | 28 | ||
29 | # | ||
30 | # Allow distributions to alter when [postponed] package install scripts are run | ||
31 | # | ||
32 | POSTINSTALL_INITPOSITION ?= "98" | ||
33 | |||
29 | rpmlibdir = "/var/lib/rpm" | 34 | rpmlibdir = "/var/lib/rpm" |
30 | opkglibdir = "${localstatedir}/lib/opkg" | 35 | opkglibdir = "${localstatedir}/lib/opkg" |
31 | 36 | ||
@@ -116,7 +121,7 @@ EOF | |||
116 | install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d | 121 | install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d |
117 | # Stop $i getting expanded below... | 122 | # Stop $i getting expanded below... |
118 | i=\$i | 123 | i=\$i |
119 | cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure << EOF | 124 | cat > ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure << EOF |
120 | #!/bin/sh | 125 | #!/bin/sh |
121 | for i in /etc/rpm-postinsts/*.sh; do | 126 | for i in /etc/rpm-postinsts/*.sh; do |
122 | echo "Running postinst $i..." | 127 | echo "Running postinst $i..." |
@@ -127,9 +132,9 @@ for i in /etc/rpm-postinsts/*.sh; do | |||
127 | echo "ERROR: postinst $i failed." | 132 | echo "ERROR: postinst $i failed." |
128 | fi | 133 | fi |
129 | done | 134 | done |
130 | rm -f ${sysconfdir}/rcS.d/S98configure | 135 | rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
131 | EOF | 136 | EOF |
132 | chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S98configure | 137 | chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
133 | 138 | ||
134 | install -d ${IMAGE_ROOTFS}/${sysconfdir} | 139 | install -d ${IMAGE_ROOTFS}/${sysconfdir} |
135 | echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version | 140 | 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" | |||
34 | 34 | ||
35 | PKGSUFFIX = "" | 35 | PKGSUFFIX = "" |
36 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" | 36 | PKGSUFFIX_virtclass-nativesdk = "-nativesdk" |
37 | |||
38 | # Define a variable to allow distros to run configure earlier. | ||
39 | # (for example, to enable loading of ethernet kernel modules before networking starts) | ||
40 | 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 \ | |||
13 | file://headerfix.patch \ | 13 | file://headerfix.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | PR = "r3" | 16 | PR = "r4" |
17 | 17 | ||
18 | PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" | 18 | PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" |
19 | 19 | ||
@@ -26,11 +26,6 @@ do_install_append() { | |||
26 | install -d ${D}${localstatedir}/lib/opkg | 26 | install -d ${D}${localstatedir}/lib/opkg |
27 | } | 27 | } |
28 | 28 | ||
29 | # Define a variable to allow distros to run configure earlier. | ||
30 | # (for example, to enable loading of ethernet kernel modules before networking starts) | ||
31 | OPKG_INIT_POSITION = "98" | ||
32 | OPKG_INIT_POSITION_slugos = "41" | ||
33 | |||
34 | pkg_postinst_${PN} () { | 29 | pkg_postinst_${PN} () { |
35 | #!/bin/sh | 30 | #!/bin/sh |
36 | if [ "x$D" != "x" ]; then | 31 | if [ "x$D" != "x" ]; then |
@@ -38,9 +33,9 @@ if [ "x$D" != "x" ]; then | |||
38 | # this happens at S98 where our good 'ole packages script used to run | 33 | # this happens at S98 where our good 'ole packages script used to run |
39 | echo "#!/bin/sh | 34 | echo "#!/bin/sh |
40 | opkg-cl configure | 35 | opkg-cl configure |
41 | rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure | 36 | rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
42 | " > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure | 37 | " > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
43 | chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure | 38 | chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
44 | fi | 39 | fi |
45 | 40 | ||
46 | update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 | 41 | 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 \ | |||
16 | S = "${WORKDIR}/trunk" | 16 | S = "${WORKDIR}/trunk" |
17 | 17 | ||
18 | PV = "0.1.8+svnr${SRCPV}" | 18 | PV = "0.1.8+svnr${SRCPV}" |
19 | PR = "r1" | 19 | PR = "r2" |
20 | 20 | ||
21 | PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" | 21 | PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" |
22 | 22 | ||
@@ -29,11 +29,6 @@ do_install_append() { | |||
29 | install -d ${D}${localstatedir}/lib/opkg | 29 | install -d ${D}${localstatedir}/lib/opkg |
30 | } | 30 | } |
31 | 31 | ||
32 | # Define a variable to allow distros to run configure earlier. | ||
33 | # (for example, to enable loading of ethernet kernel modules before networking starts) | ||
34 | OPKG_INIT_POSITION = "98" | ||
35 | OPKG_INIT_POSITION_slugos = "41" | ||
36 | |||
37 | pkg_postinst_${PN} () { | 32 | pkg_postinst_${PN} () { |
38 | #!/bin/sh | 33 | #!/bin/sh |
39 | if [ "x$D" != "x" ]; then | 34 | if [ "x$D" != "x" ]; then |
@@ -41,9 +36,9 @@ if [ "x$D" != "x" ]; then | |||
41 | # this happens at S98 where our good 'ole packages script used to run | 36 | # this happens at S98 where our good 'ole packages script used to run |
42 | echo "#!/bin/sh | 37 | echo "#!/bin/sh |
43 | opkg-cl configure | 38 | opkg-cl configure |
44 | rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure | 39 | rm -f /${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
45 | " > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure | 40 | " > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
46 | chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure | 41 | chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}configure |
47 | fi | 42 | fi |
48 | 43 | ||
49 | update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 | 44 | update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 |