Patchwork [meta-oe,meta-systemd] dhcp: Sync bbappend version with the one from oe-core

login
register
mail settings
Submitter Andrei Gherzan
Date Nov. 26, 2012, 4:24 p.m.
Message ID <1353947056-2799-1-git-send-email-andrei.gherzan@windriver.com>
Download mbox | patch
Permalink /patch/39627/
State Rejected, archived
Headers show

Comments

Andrei Gherzan - Nov. 26, 2012, 4:24 p.m.
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 .../dhcp/dhcp_4.2.4-P1.bbappend                    |   13 -------------
 .../dhcp/dhcp_4.2.4-P2.bbappend                    |   13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P1.bbappend
 create mode 100644 meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P2.bbappend
Martin Jansa - Nov. 27, 2012, 11:04 a.m.
On Mon, Nov 26, 2012 at 06:24:16PM +0200, Andrei Gherzan wrote:
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>  .../dhcp/dhcp_4.2.4-P1.bbappend                    |   13 -------------
>  .../dhcp/dhcp_4.2.4-P2.bbappend                    |   13 +++++++++++++
>  2 files changed, 13 insertions(+), 13 deletions(-)
>  delete mode 100644 meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P1.bbappend
>  create mode 100644 meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P2.bbappend

Looks the same as:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2012-November/042448.html

except sent without -M and not moving to oe-core prefix like mine does.

Cheers,
Andrei Gherzan - Nov. 27, 2012, 10:02 p.m.
Great. Waiting for merge.

Patch

diff --git a/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P1.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P1.bbappend
deleted file mode 100644
index a18fda8..0000000
--- a/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P1.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@ 
-# look for files in the layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-inherit systemd
-
-PRINC := "${@int(PRINC) + 1}"
-
-SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd"
-SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
-SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service"
-
-SRC_URI += "file://dhcpd.service \
-            file://dhcrelay.service"
diff --git a/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P2.bbappend b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P2.bbappend
new file mode 100644
index 0000000..a18fda8
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-connectivity/dhcp/dhcp_4.2.4-P2.bbappend
@@ -0,0 +1,13 @@ 
+# look for files in the layer first
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+SYSTEMD_PACKAGES = "dhcp-server-systemd dhcp-relay-systemd"
+SYSTEMD_SERVICE_dhcp-server-systemd = "dhcpd.service"
+SYSTEMD_SERVICE_dhcp-relay-systemd = "dhcrelay.service"
+
+SRC_URI += "file://dhcpd.service \
+            file://dhcrelay.service"