Skip to contentSkip to conversation

Misc fixes

PATCH New Otavio Salvador 1 participant 6 messages Dec 15, 2011

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

cover Misc fixes

The following changes since commit 6f36625d072054737e0aa797fb791c35d999addc:

florence: clean up recipe (2011-12-15 09:42:59 +0100)

are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master

Otavio Salvador (5):
setxkbmap: fix checksum
xrdb: fix checksum
twm: fix checksum
sessreg: fix checksum
dropbear: cleanup packaging

 .../dropbear/dropbear_2011.54.bbappend             |   11 ++---------
 meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb |    4 ++--
 .../recipes-graphics/xorg-app/setxkbmap_1.2.0.bb   |    4 ++--
 meta-oe/recipes-graphics/xorg-app/twm_1.0.6.bb     |    4 ++--
 meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb    |    4 ++--
 5 files changed, 10 insertions(+), 17 deletions(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH 1/5 setxkbmap: fix checksum

Signed-off-by Otavio Salvador <[email protected]>
---
 .../recipes-graphics/xorg-app/setxkbmap_1.2.0.bb   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/xorg-app/setxkbmap_1.2.0.bb +2 -2
index 22df1f1..127b0f6 100644
@@ -4,5 +4,5 @@ DEPENDS += " libxkbfile"
 PE = "1"
 PR = "r6"
 
-SRC_URI[archive.md5sum] = "2f6df89201eb9a2cbfb905d6b82a191e"
-SRC_URI[archive.sha256sum] = "999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39"
+SRC_URI[md5sum] = "2f6df89201eb9a2cbfb905d6b82a191e"
+SRC_URI[sha256sum] = "999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39"
Signature · 1 line
1.7.2.5
author
#2 lore raw

PATCH 2/5 xrdb: fix checksum

In reply to Otavio Salvador
Signed-off-by Otavio Salvador <[email protected]>
---
 meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/xorg-app/xrdb_1.0.9.bb +2 -2
index 82b530e..1cc8534 100644
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69"
 DEPENDS += "libxmu"
 PR = "r6"
 
-SRC_URI[archive.md5sum] = "ed2e48cf33584455d74615ad4bbe4246"
-SRC_URI[archive.sha256sum] = "642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7"
+SRC_URI[md5sum] = "ed2e48cf33584455d74615ad4bbe4246"
+SRC_URI[sha256sum] = "642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7"
Signature · 1 line
1.7.2.5
author
#3 lore raw

PATCH 3/5 twm: fix checksum

In reply to Otavio Salvador
Signed-off-by Otavio Salvador <[email protected]>
---
 meta-oe/recipes-graphics/xorg-app/twm_1.0.6.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/xorg-app/twm_1.0.6.bb +2 -2
index af27632..a0a0eaf 100644
@@ -6,8 +6,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4c6d42ef60e8166aa26606524c0b9586"
 
 
-SRC_URI[archive.md5sum] = "952d06a0c2ec34687b536c7b619fc671"
-SRC_URI[archive.sha256sum] = "e7dccad7879a7570442f0cd9df0b9064e926466b5a52b710fca8cfb167f294e9"
+SRC_URI[md5sum] = "952d06a0c2ec34687b536c7b619fc671"
+SRC_URI[sha256sum] = "e7dccad7879a7570442f0cd9df0b9064e926466b5a52b710fca8cfb167f294e9"
 
 FILES_${PN} += "${datadir}/X11/twm/system.twmrc"
 ALTERNATIVE_NAME = "x-window-manager"
Signature · 1 line
1.7.2.5
author
#4 lore raw

PATCH 4/5 sessreg: fix checksum

In reply to Otavio Salvador
Signed-off-by Otavio Salvador <[email protected]>
---
 meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-graphics/xorg-app/sessreg_1.0.6.bb +2 -2
index 05d701d..702bac7 100644
@@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=07e6423e8815e6b372cd45da76faacd0"
 
 PR = "r6"
 
-SRC_URI[archive.md5sum] = "8c8fcda19f4cffe573d43ec9b8255f8e"
-SRC_URI[archive.sha256sum] = "73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190"
+SRC_URI[md5sum] = "8c8fcda19f4cffe573d43ec9b8255f8e"
+SRC_URI[sha256sum] = "73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190"
Signature · 1 line
1.7.2.5
author
#5 lore raw

PATCH 5/5 dropbear: cleanup packaging

In reply to Otavio Salvador

* the symbolic link required to disable the sysvinit init script is now done during the do_install task so making the recipe simple

* convert to use PRINC to bump PR on bbappend

Signed-off-by Otavio Salvador <[email protected]>
---
 .../dropbear/dropbear_2011.54.bbappend             |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)
meta-oe/recipes-core/dropbear/dropbear_2011.54.bbappend +2 -9
index a642235..899e1fc 100644
@@ -1,6 +1,6 @@
 inherit systemd
 
-PRINC = "1"
+PRINC := "${@int(PRINC) + 1}"
 
 # look for files in the layer first
 FILESEXTRAPATHS := "${THISDIR}/${PN}"

@@ -17,17 +17,10 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/dropbearkey.service ${D}${base_libdir}/systemd/system/
 	install -m 0644 ${WORKDIR}/[email protected] ${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
-}
Signature · 1 line
1.7.2.5