diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2014-03-06 14:15:42 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-07 15:05:08 +0000 |
commit | cd1195b6fede2005506600bd431a66d4c454d4b9 (patch) | |
tree | e63527b2f01f96f881ee59dc6ec64c4e717bdda5 /meta/recipes-devtools/dpkg/dpkg.inc | |
parent | 5159ddcb62682e1b7e63a20a9218ea96e3fe10a2 (diff) | |
download | poky-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/recipes-devtools/dpkg/dpkg.inc')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 24 |
1 files changed, 1 insertions, 23 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 | ||