summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-03-06 14:15:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 15:05:08 +0000
commitcd1195b6fede2005506600bd431a66d4c454d4b9 (patch)
treee63527b2f01f96f881ee59dc6ec64c4e717bdda5 /meta
parent5159ddcb62682e1b7e63a20a9218ea96e3fe10a2 (diff)
downloadpoky-cd1195b6fede2005506600bd431a66d4c454d4b9.tar.gz
opkg/dpkg: remove the postinstalls
Just use the run-postinsts recipe for running first boot postinstalls. [YOCTO #5666] (From OE-Core rev: 2dadf775f619571c273ea20eb8d3fdd7ba656052) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc24
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc28
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
8DEPENDS = "zlib bzip2 perl ncurses" 8DEPENDS = "zlib bzip2 perl ncurses"
9DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" 9DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native"
10RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz" 10RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts"
11RDEPENDS_${PN}_class-native = "xz-native" 11RDEPENDS_${PN}_class-native = "xz-native"
12 12
13S = "${WORKDIR}/${BPN}-${PV}" 13S = "${WORKDIR}/${BPN}-${PV}"
@@ -43,8 +43,6 @@ do_configure () {
43 autotools_do_configure 43 autotools_do_configure
44} 44}
45 45
46DPKG_INIT_POSITION ?= "98"
47
48do_install_append () { 46do_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
69pkg_postinst_${PN} () {
70#!/bin/sh
71if ${@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
78if [ \"\$POSTINST_LOGGING\" = \"1\" ]; then
79 dpkg --configure -a >\$LOGFILE 2>&1
80else
81 dpkg --configure -a
82fi
83rm -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
86fi
87}
88
89PROV = "virtual/update-alternatives" 67PROV = "virtual/update-alternatives"
90PROV_class-native = "" 68PROV_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
41RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" 41RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base run-postinsts"
42RDEPENDS_${PN}_class-native = "" 42RDEPENDS_${PN}_class-native = ""
43RDEPENDS_${PN}_class-nativesdk = "" 43RDEPENDS_${PN}_class-nativesdk = ""
44RREPLACES_${PN} = "opkg-nogpg" 44RREPLACES_${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
76pkg_postinst_${PN} () {
77#!/bin/sh
78if ${@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
85if [ \"\$POSTINST_LOGGING\" = \"1\" ]; then
86 opkg-cl configure >\$LOGFILE 2>&1
87else
88 opkg-cl configure
89fi
90rm -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
93fi
94}
95
96BBCLASSEXTEND = "native nativesdk" 76BBCLASSEXTEND = "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
102POSTINSTALL_INITPOSITION ?= "98"