Patchwork [meta-oe,3/4] dropbear: bump epoch to ensure an upgrade path and cleanup packaging

login
register
mail settings
Submitter Otavio Salvador
Date Dec. 13, 2011, 10:43 a.m.
Message ID <dd9bd4910b7278f024c9602b8d0cc162efc485fa.1323772987.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/16807/
State Superseded, archived
Headers show

Comments

Otavio Salvador - Dec. 13, 2011, 10:43 a.m.
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 <otavio@ossystems.com.br>
---
 .../dropbear/dropbear_2011.54.bbappend             |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
Koen Kooi - Dec. 13, 2011, 6:45 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-12-11 10:43, Otavio Salvador schreef:
> 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 <otavio@ossystems.com.br> --- 
> .../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"

I'd really like to avoid PE in bbappends for obvious reasons. Can we get
this into OE-core instead?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7nnT8ACgkQMkyGM64RGpFQvwCgnk3I8913J+gJDNvLyseDcPvo
a94Anji8g64EOfO/dGvomaPUybz0O412
=iKue
-----END PGP SIGNATURE-----
Otavio Salvador - Dec. 13, 2011, 6:51 p.m.
On Tue, Dec 13, 2011 at 16:45, Koen Kooi <koen@dominion.thruhere.net> wrote:

> I'd really like to avoid PE in bbappends for obvious reasons. Can we get
> this into OE-core instead?
>

I can send a patch to them for this but in meanwhile this ought to be
merged as currently dropbear is at broken state.
Koen Kooi - Dec. 15, 2011, 8:28 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 13-12-11 19:51, Otavio Salvador schreef:
> On Tue, Dec 13, 2011 at 16:45, Koen Kooi <koen@dominion.thruhere.net>
> wrote:
> 
>> I'd really like to avoid PE in bbappends for obvious reasons. Can we
>> get this into OE-core instead?
>> 
> 
> I can send a patch to them for this but in meanwhile this ought to be 
> merged as currently dropbear is at broken state.

No, a PE should only get added once and with care.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7pr6IACgkQMkyGM64RGpHgjwCfZeKt8oSrufiyWEMlWOTnp6D3
lIAAn0MKN4wpytvMSiyfbg0dkYnN2O5V
=86zF
-----END PGP SIGNATURE-----

Patch

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
-}