From patchwork Tue Dec 13 10:43:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-oe, 3/4] dropbear: bump epoch to ensure an upgrade path and cleanup packaging Date: Tue, 13 Dec 2011 10:43:45 -0000 From: Otavio Salvador X-Patchwork-Id: 16807 Message-Id: To: openembedded-devel@lists.openembedded.org An old package called dropbear-systemd, at version v1, might be available on the feed and thus our binary package won't be used. To fix this the epoch has been bumped to 1. The symbolic link required to disable the sysvinit init script is now done during the do_install task so making the recipe simple. Signed-off-by: Otavio Salvador --- .../dropbear/dropbear_2011.54.bbappend | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend index 874a7d4..3f2fa29 100644 --- a/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend +++ b/meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend @@ -1,5 +1,7 @@ inherit systemd +PE = "1" + PRINC := "${@int(PRINC) + 1}" # look for files in the layer first @@ -17,17 +19,10 @@ do_install_append() { install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${base_libdir}/systemd/system/ install -m 0644 ${WORKDIR}/dropbear@.service ${D}${base_libdir}/systemd/system/ install -m 0644 ${WORKDIR}/dropbear.socket ${D}${base_libdir}/systemd/system/ + ln -sf /dev/null ${D}${base_libdir}/systemd/system/dropbear.service } PACKAGES += "${PN}-systemd" RDEPENDS_${PN}-systemd += "dropbear" FILES_${PN}-systemd = "${base_libdir}/systemd" - -pkg_postinst_${PN}-systemd_append() { -ln -sf /dev/null $D${base_libdir}/systemd/system/dropbear.service -} - -pkg_postrm_${PN}-systemd_append() { -rm -f ${base_libdir}/systemd/system/dropbear.service -}