Skip to contentSkip to conversation

dhcp: Rename .bbappend to match any version from oe-core

PATCH New Martin Jansa 1 participant 2 messages Mar 14, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dhcp: Rename .bbappend to match any version from oe-core

---
 .../recipes-connectivity/dhcp/{dhcp_4.2.5-P1.bbappend => dhcp_%.bbappend} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/oe-core/recipes-connectivity/dhcp/{dhcp_4.2.5-P1.bbappend => dhcp_%.bbappend} (100%)
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend renamed from meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend +0 -0
similarity index 100%
rename from meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_4.2.5-P1.bbappend
rename to meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend
Signature · 1 line
1.9.0
#1 lore raw

PATCH 2/2 util-linux: Rename .bbappend to match any version from oe-core and remove uuidd.socket

* oe-core recipe has uuidd.service in ${PN}-uuidd
SYSTEMD_PACKAGES = "${PN}-uuidd"
SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.service"

---
 .../oe-core/recipes-core/util-linux/util-linux_%.bbappend      |  3 +++
 .../oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend | 10 ----------
 2 files changed, 3 insertions(+), 10 deletions(-)
 create mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend
 delete mode 100644 meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend
meta-systemd/oe-core/recipes-core/util-linux/util-linux_%.bbappend new file +3 -0
new file mode 100644
index 0000000..f006b3f
@@ -0,0 +1,3 @@
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
meta-systemd/oe-core/recipes-core/util-linux/util-linux_2.23.2.bbappend deleted +0 -10
deleted file mode 100644
index c6a97ca..0000000
@@ -1,10 +0,0 @@
-inherit systemd
-
-SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
-EXTRA_OECONF += "--enable-socket-activation --with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-
-SYSTEMD_SERVICE_${PN} = "uuidd.socket"
Signature · 1 line
1.9.0