Pending patches from O.S. Systems tree

PATCH Superseded Otavio Salvador 2 participants 6 messages Feb 6, 2012

lore

Share & tools

lore

Otavio Salvador

author

2012-02-06 11:12 UTC #0 lore raw

cover Pending patches from O.S. Systems tree

The following changes since commit 18d9fcfc4bc4b01f73e89f3b988c9d3d543c7705:

libzypp: add missing runtime dependences on gzip and gnupg (2012-02-03 17:23:28 +0000)

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

Otavio Salvador (2):
dhcp: move dhcp leases files handling to postinst/postrm
udev: stop providing cache support by default

 meta/recipes-connectivity/dhcp/dhcp.inc      |   19 ++++++++++++++++++-
 meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |    2 +-
 meta/recipes-core/udev/udev.inc              |    2 +-
 meta/recipes-core/udev/udev_164.bb           |    2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2012-02-06 11:12 UTC #1 lore raw

PATCH 1/2 dhcp: move dhcp leases files handling to postinst/postrm

Both server and client needs access to leases files so its creation and removal are now handled by postinst/postrm scripts.

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-connectivity/dhcp/dhcp.inc      |   19 ++++++++++++++++++-
 meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |    2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

meta/recipes-connectivity/dhcp/dhcp.inc +18 -1

index be256ce..92e4d36 100644
@@ -66,12 +66,29 @@ FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp
 
 FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
 
-FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf ${localstatedir}/lib/dhcp/"
+FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
 RDEPENDS_dhcp-client = "bash"
 
 FILES_dhcp-omshell = "${bindir}/omshell"
 
 pkg_postinst_dhcp-server() {
+    mkdir -p $D/${localstatedir}/lib/dhcp
     touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
     touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
 }
+
+pkg_postinst_dhcp-client() {
+    mkdir -p $D/${localstatedir}/lib/dhcp
+}
+
+pkg_postrm_dhcp-server() {
+    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
+    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
+    rmdir $D/${localstatedir}/lib/dhcp
+}
+
+pkg_postrm_dhcp-client() {
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
+    rmdir $D/${localstatedir}/lib/dhcp
+}

meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb +1 -1

index a3a560b..3b1c0e2 100644
@@ -1,6 +1,6 @@
 require dhcp.inc
 
-PR = "r5"
+PR = "r7"
 
 SRC_URI += "file://fixincludes.patch \
             file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \

Signature · 1 line

1.7.2.5

Phil Blundell

2012-02-06 11:21 UTC #2 lore raw

Re: [PATCH 1/2] dhcp: move dhcp leases files handling to postinst/postrm

meta/recipes-connectivity/dhcp/dhcp.inc FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp · line 93

Quoted 10 lines · Otavio Salvador

meta/recipes-connectivity/dhcp/dhcp.inc +10 -0

+pkg_postrm_dhcp-server() {
+    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
+    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
+    rmdir $D/${localstatedir}/lib/dhcp
+}
+
+pkg_postrm_dhcp-client() {
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
+    rmdir $D/${localstatedir}/lib/dhcp

Are those rmdirs not going to fail if you try to remove one package with the other one still installed?

Otavio Salvador

author

2012-02-06 11:29 UTC #3 lore raw

Re: [PATCH 1/2] dhcp: move dhcp leases files handling to postinst/postrm

Quoted 15 lines · Phil Blundell

meta/recipes-connectivity/dhcp/dhcp.inc FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp · line 93
Quoted 10 lines · Otavio Salvador
meta/recipes-connectivity/dhcp/dhcp.inc +10 -0
+pkg_postrm_dhcp-server() {
+    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
+    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
+    rmdir $D/${localstatedir}/lib/dhcp
+}
+
+pkg_postrm_dhcp-client() {
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
+    rmdir $D/${localstatedir}/lib/dhcp
Are those rmdirs not going to fail if you try to remove one package with the other one still installed?

I think they will. I'll add an || true on it.

Signature · 3 lines

Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Phil Blundell

2012-02-06 11:35 UTC #4 lore raw

Re: [PATCH 1/2] dhcp: move dhcp leases files handling to postinst/postrm

Quoted 19 lines · Otavio Salvador

On Mon, Feb 6, 2012 at 09:13, Phil Blundell <[email protected]> wrote:

        On Mon, 2012-02-06 at 11:03 +0000, Otavio Salvador wrote:
        > +pkg_postrm_dhcp-server() {
        > +    rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
        > +    rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
        > +    rmdir $D/${localstatedir}/lib/dhcp
        > +}
        > +
        > +pkg_postrm_dhcp-client() {
        > +    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
        > +    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
        > +    rmdir $D/${localstatedir}/lib/dhcp
        
        
        Are those rmdirs not going to fail if you try to remove one
        package with
        the other one still installed?

Quoted 1 line

I think they will. I'll add an || true on it.

If you do that then you'd also need to redirect stderr to avoid getting error messages on the console. Might be better to wrap the rmdir calls in a check to see if the directory is empty.

Otavio Salvador

author

2012-02-06 11:12 UTC #5 lore raw

PATCH 2/2 udev: stop providing cache support by default

In reply to Otavio Salvador

The usefulness of cache nowadays has been reduced a lot and thus it's better to stop using it by default. Dropping the recommends allows for image to decide if they want or not to have cache enabled, instead of require a machine override.

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/recipes-core/udev/udev.inc    |    2 +-
 meta/recipes-core/udev/udev_164.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-core/udev/udev.inc +1 -1

index e5fbe40..7949f22 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
 
 DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native"
 RPROVIDES_${PN} = "hotplug"
-RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
+RRECOMMENDS_${PN} += "udev-extraconf usbutils-ids pciutils-ids"
 RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \

meta/recipes-core/udev/udev_164.bb +1 -1

index 6d71f4d..b993a13 100644
@@ -1,6 +1,6 @@
 include udev.inc
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI += "file://udev-166-v4l1-1.patch"

Signature · 1 line

1.7.2.5