diff options
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 24 | ||||
| -rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 28 |
2 files changed, 2 insertions, 50 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 471151ed3b..eef7ce9d40 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
| @@ -7,7 +7,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \ | |||
| 7 | 7 | ||
| 8 | DEPENDS = "zlib bzip2 perl ncurses" | 8 | DEPENDS = "zlib bzip2 perl ncurses" |
| 9 | DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" | 9 | DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" |
| 10 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz" | 10 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts" |
| 11 | RDEPENDS_${PN}_class-native = "xz-native" | 11 | RDEPENDS_${PN}_class-native = "xz-native" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/${BPN}-${PV}" | 13 | S = "${WORKDIR}/${BPN}-${PV}" |
| @@ -43,8 +43,6 @@ do_configure () { | |||
| 43 | autotools_do_configure | 43 | autotools_do_configure |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | DPKG_INIT_POSITION ?= "98" | ||
| 47 | |||
| 48 | do_install_append () { | 46 | do_install_append () { |
| 49 | if [ "${PN}" = "dpkg-native" ]; then | 47 | if [ "${PN}" = "dpkg-native" ]; then |
| 50 | # update-alternatives doesn't have an offline mode | 48 | # update-alternatives doesn't have an offline mode |
| @@ -66,26 +64,6 @@ do_install_append () { | |||
| 66 | fi | 64 | fi |
| 67 | } | 65 | } |
| 68 | 66 | ||
| 69 | pkg_postinst_${PN} () { | ||
| 70 | #!/bin/sh | ||
| 71 | if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)} && \ | ||
| 72 | [ "x$D" != "x" ] && [ -f $D/var/lib/dpkg/status ]; then | ||
| 73 | install -d $D${sysconfdir}/rcS.d | ||
| 74 | |||
| 75 | # this happens at S98 where our good 'ole packages script used to run | ||
| 76 | echo "#!/bin/sh | ||
| 77 | [ -e ${sysconfdir}/default/postinst ] && . ${sysconfdir}/default/postinst | ||
| 78 | if [ \"\$POSTINST_LOGGING\" = \"1\" ]; then | ||
| 79 | dpkg --configure -a >\$LOGFILE 2>&1 | ||
| 80 | else | ||
| 81 | dpkg --configure -a | ||
| 82 | fi | ||
| 83 | rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts | ||
| 84 | " > $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts | ||
| 85 | chmod 0755 $D${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}run-postinsts | ||
| 86 | fi | ||
| 87 | } | ||
| 88 | |||
| 89 | PROV = "virtual/update-alternatives" | 67 | PROV = "virtual/update-alternatives" |
| 90 | PROV_class-native = "" | 68 | PROV_class-native = "" |
| 91 | 69 | ||
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index 7bea26d42c..9f87df551e 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc | |||
| @@ -38,7 +38,7 @@ EXTRA_OECONF = "\ | |||
| 38 | --with-opkglibdir=${OPKGLIBDIR} \ | 38 | --with-opkglibdir=${OPKGLIBDIR} \ |
| 39 | " | 39 | " |
| 40 | 40 | ||
| 41 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" | 41 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base run-postinsts" |
| 42 | RDEPENDS_${PN}_class-native = "" | 42 | RDEPENDS_${PN}_class-native = "" |
| 43 | RDEPENDS_${PN}_class-nativesdk = "" | 43 | RDEPENDS_${PN}_class-nativesdk = "" |
| 44 | RREPLACES_${PN} = "opkg-nogpg" | 44 | RREPLACES_${PN} = "opkg-nogpg" |
| @@ -73,30 +73,4 @@ do_install_append() { | |||
| 73 | rm ${D}${bindir}/update-alternatives | 73 | rm ${D}${bindir}/update-alternatives |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | pkg_postinst_${PN} () { | ||
| 77 | #!/bin/sh | ||
| 78 | if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)} && \ | ||
| 79 | [ "x$D" != "x" ] && [ -f $D${OPKGLIBDIR}/opkg/status ]; then | ||
| 80 | install -d $D${sysconfdir}/rcS.d | ||
| 81 | |||
| 82 | # this happens at S98 where our good 'ole packages script used to run | ||
| 83 | echo "#!/bin/sh | ||
| 84 | [ -e ${sysconfdir}/default/postinst ] && . ${sysconfdir}/default/postinst | ||
| 85 | if [ \"\$POSTINST_LOGGING\" = \"1\" ]; then | ||
| 86 | opkg-cl configure >\$LOGFILE 2>&1 | ||
| 87 | else | ||
| 88 | opkg-cl configure | ||
| 89 | fi | ||
| 90 | rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts | ||
| 91 | " > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts | ||
| 92 | chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts | ||
| 93 | fi | ||
| 94 | } | ||
| 95 | |||
| 96 | BBCLASSEXTEND = "native nativesdk" | 76 | BBCLASSEXTEND = "native nativesdk" |
| 97 | |||
| 98 | # Define a variable to allow distros to run configure earlier. | ||
| 99 | # (for example, to enable loading of ethernet kernel modules before networking starts) | ||
| 100 | # note: modifying name or default value for POSTINSTALL_INITPOSITION requires | ||
| 101 | # changes in systemd-compat-units.bb | ||
| 102 | POSTINSTALL_INITPOSITION ?= "98" | ||
