Skip to contentSkip to conversation

Pending patches from O.S. Systems tree

PATCH In review Otavio Salvador 2 participants 4 messages Feb 6, 2012 – Feb 8, 2012

lore
Share & tools
lore

Otavio Salvador

author
#0 lore raw

v2 cover Pending patches from O.S. Systems tree

v2 changes:

dhcp: fix error in case rmdir tries to remove a non-empty directory

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      |   25 ++++++++++++++++++++++++-
 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, 27 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.2.5
author
#1 lore raw

PATCH v2 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      |   25 ++++++++++++++++++++++++-
 meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb |    2 +-
 2 files changed, 25 insertions(+), 2 deletions(-)
meta/recipes-connectivity/dhcp/dhcp.inc +24 -1
index be256ce..f66dfba 100644
@@ -66,12 +66,35 @@ 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
+
+    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
+        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
+    fi
+}
+
+pkg_postrm_dhcp-client() {
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
+    rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
+
+    if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
+        echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
+    fi
+}
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
author
#2 lore raw

PATCH v2 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
#3 lore raw
In reply to Otavio Salvador
Quoted 16 lines · Otavio Salvador

v2 changes:

dhcp: fix error in case rmdir tries to remove a non-empty directory

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

Quoted 6 lines
  meta/recipes-connectivity/dhcp/dhcp.inc      |   25 ++++++++++++++++++++++++-
  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, 27 insertions(+), 4 deletions(-)

Merged these 2 patches into OE-core, I know you have more pending.

Thanks
Sau!