Tidy up for recent OE-Core changes
cover Tidy up for recent OE-Core changes
The following changes since commit 28e26a9b0ad37d0c92ba42b2727215eef1edf5a2:
tcpslice: add recipe under tcpdump (2014-09-09 10:32:51 -0400)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib paule/cleanup5
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/cleanup5
Paul Eggleton (4):
libunwind: remove as recipe is now in OE-Core
dhcp: remove parts now merged into OE-Core recipe
portmap: systemd support now in OE-Core
keymaps: systemd support now in OE-Core
meta-oe/recipes-support/libunwind/libunwind.inc | 30 ---------------------- meta-oe/recipes-support/libunwind/libunwind_1.1.bb | 4 --- .../recipes-bsp/keymaps/keymaps/keymaps.service | 9 ------- .../recipes-bsp/keymaps/keymaps_1.0.bbappend | 11 -------- .../recipes-connectivity/dhcp/dhcp/dhcpd.service | 12 --------- .../dhcp/dhcp/dhcrelay.service | 10 -------- .../recipes-connectivity/dhcp/dhcp_%.bbappend | 23 +++-------------- .../portmap/portmap/portmap.service | 10 -------- .../portmap/portmap_6.0.bbappend | 11 -------- 9 files changed, 3 insertions(+), 117 deletions(-) delete mode 100644 meta-oe/recipes-support/libunwind/libunwind.inc delete mode 100644 meta-oe/recipes-support/libunwind/libunwind_1.1.bb delete mode 100644 meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service delete mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service delete mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service delete mode 100644 meta-systemd/oe-core/recipes-connectivity/portmap/portmap/portmap.service
Signature · 1 line
1.9.3
PATCH 1/4 libunwind: remove as recipe is now in OE-Core
--- meta-oe/recipes-support/libunwind/libunwind.inc | 30 ---------------------- meta-oe/recipes-support/libunwind/libunwind_1.1.bb | 4 --- 2 files changed, 34 deletions(-) delete mode 100644 meta-oe/recipes-support/libunwind/libunwind.inc delete mode 100644 meta-oe/recipes-support/libunwind/libunwind_1.1.bb
meta-oe/recipes-support/libunwind/libunwind.inc deleted +0 -30
@@ -1,30 +0,0 @@ -DESCRIPTION = "a portable and efficient C programming interface (API) to determine the call-chain of a program" -HOMEPAGE = "http://www.nongnu.org/libunwind" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3fced11d6df719b47505837a51c16ae5" - -SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" - -inherit autotools - -PACKAGECONFIG ??= "" -PACKAGECONFIG[lzma] = "--enable-minidebuginfo,--disable-minidebuginfo,lzma" - -EXTRA_OECONF_arm = "--enable-debug-frame" - -CFLAGS += "${ATOMICOPS}" -ATOMICOPS_armv5 = "-DAO_USE_PTHREAD_DEFS=1" -ATOMICOPS_armv4 = "-DAO_USE_PTHREAD_DEFS=1" -ATOMICOPS ?= "" - -LDFLAGS += "${LIBATOMICS}" -LIBATOMICS_armv5 = "-latomic_ops" -LIBATOMICS_armv4 = "-latomic_ops" -LIBATOMICS ?= "" - -DEPENDS += "${DEPLIBATOMICS}" -DEPLIBATOMICS_armv5 = "libatomics-ops" -DEPLIBATOMICS_armv4 = "libatomics-ops" -DEPLIBATOMICS ?= "" - -BBCLASSEXTEND = "native"
meta-oe/recipes-support/libunwind/libunwind_1.1.bb deleted +0 -4
@@ -1,4 +0,0 @@ -require libunwind.inc - -SRC_URI[md5sum] = "fb4ea2f6fbbe45bf032cd36e586883ce" -SRC_URI[sha256sum] = "9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a"
Signature · 1 line
1.9.3
PATCH 2/4 dhcp: remove parts now merged into OE-Core recipe
In reply to Paul Eggleton--- .../recipes-connectivity/dhcp/dhcp/dhcpd.service | 12 ----------- .../dhcp/dhcp/dhcrelay.service | 10 ---------- .../recipes-connectivity/dhcp/dhcp_%.bbappend | 23 +++------------------- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service delete mode 100644 meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcpd.service deleted +0 -12
@@ -1,12 +0,0 @@ -[Unit] -Description=Dynamic Host Configuration Protocol (DHCP) -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/dhcpd.pid -EnvironmentFile=-/etc/default/dhcp-server -ExecStart=/usr/sbin/dhcpd -cf /etc/dhcp/dhcpd.conf -q $INTERFACES - -[Install] -WantedBy=multi-user.target
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp/dhcrelay.service deleted +0 -10
@@ -1,10 +0,0 @@ -[Unit] -Description=DHCP Relay Agent Daemon -After=syslog.target network.target - -[Service] -EnvironmentFile=/etc/default/dhcp-relay -ExecStart=/usr/sbin/dhcrelay -d $DHCRELAYARGS - -[Install] -WantedBy=multi-user.target
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend +3 -20
@@ -1,35 +1,18 @@ # look for files in the layer first FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -inherit systemd - -SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" -SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" -SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" +SYSTEMD_PACKAGES += "dhcp-client" SYSTEMD_SERVICE_dhcp-client = "dhclient.service" SYSTEMD_AUTO_ENABLE_dhcp-client = "disable" -FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service" -FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service" FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service" -RPROVIDES_dhcp-server += "dhcp-server-systemd" -RREPLACES_dhcp-server += "dhcp-server-systemd" -RCONFLICTS_dhcp-server += "dhcp-server-systemd" -RPROVIDES_dhcp-relay += "dhcp-relay-systemd" -RREPLACES_dhcp-relay += "dhcp-relay-systemd" -RCONFLICTS_dhcp-relay += "dhcp-relay-systemd" RPROVIDES_dhcp-client += "dhcp-client-systemd" RREPLACES_dhcp-client += "dhcp-client-systemd" RCONFLICTS_dhcp-client += "dhcp-client-systemd" -SRC_URI += "file://dhcpd.service \ - file://dhclient.service \ - file://dhcrelay.service \ -" +SRC_URI += "file://dhclient.service" + do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcpd.service ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/dhclient.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/dhcrelay.service ${D}${systemd_unitdir}/system }
Signature · 1 line
1.9.3
PATCH 3/4 portmap: systemd support now in OE-Core
In reply to Paul Eggleton--- .../recipes-connectivity/portmap/portmap/portmap.service | 10 ---------- .../oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend | 11 ----------- 2 files changed, 21 deletions(-) delete mode 100644 meta-systemd/oe-core/recipes-connectivity/portmap/portmap/portmap.service
meta-systemd/oe-core/recipes-connectivity/portmap/portmap/portmap.service deleted +0 -10
@@ -1,10 +0,0 @@ -[Unit] -Description=Portmap - -[Service] -Type=oneshot -ExecStart=/sbin/portmap -l -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target
meta-systemd/oe-core/recipes-connectivity/portmap/portmap_6.0.bbappend +0 -11
@@ -1,16 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -inherit systemd - RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "portmap.service" SYSTEMD_AUTO_ENABLE = "disable" -SRC_URI_append = " file://portmap.service" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/portmap.service ${D}${systemd_unitdir}/system -}
Signature · 1 line
1.9.3
PATCH 4/4 keymaps: systemd support now in OE-Core
In reply to Paul Eggleton--- .../oe-core/recipes-bsp/keymaps/keymaps/keymaps.service | 9 --------- meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend | 11 ----------- 2 files changed, 20 deletions(-) delete mode 100644 meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service
meta-systemd/oe-core/recipes-bsp/keymaps/keymaps/keymaps.service deleted +0 -9
@@ -1,9 +0,0 @@ -[Unit] -Description=Loads custom keymap if available -ConditionPathExists=/etc/keymap-2.6.map - -[Service] -ExecStart=/usr/bin/loadkeys /etc/keymap-2.6.map - -[Install] -WantedBy=multi-user.target
meta-systemd/oe-core/recipes-bsp/keymaps/keymaps_1.0.bbappend +0 -11
@@ -1,15 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " file://keymaps.service" - -inherit systemd RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${PN}.service" - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/${PN}.service ${D}${systemd_unitdir}/system -}
Signature · 1 line
1.9.3
Re: [meta-systemd][PATCH 2/4] dhcp: remove parts now merged into OE-Core recipe
In reply to Paul EggletonQuoted 14 lines · On Wednesday 17 September 2014 15:41:24 Paul Eggleton wrote:
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend +1
-5@@ -1,35 +1,18 @@ # look for files in the layer first FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -inherit systemd - -SYSTEMD_PACKAGES = "dhcp-server dhcp-relay dhcp-client" -SYSTEMD_SERVICE_dhcp-server = "dhcpd.service" -SYSTEMD_SERVICE_dhcp-relay = "dhcrelay.service" +SYSTEMD_PACKAGES += "dhcp-client" SYSTEMD_SERVICE_dhcp-client = "dhclient.service" SYSTEMD_AUTO_ENABLE_dhcp-client = "disable"
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend line 20
Quoted 10 lines
meta-systemd/oe-core/recipes-connectivity/dhcp/dhcp_%.bbappend +0
-8-FILES_dhcp-server += "${systemd_unitdir}/system/dhcpd.service" -FILES_dhcp-relay += "${systemd_unitdir}/system/dhrelay.service" FILES_dhcp-client += "${systemd_unitdir}/system/dhclient.service" -RPROVIDES_dhcp-server += "dhcp-server-systemd" -RREPLACES_dhcp-server += "dhcp-server-systemd" -RCONFLICTS_dhcp-server += "dhcp-server-systemd" -RPROVIDES_dhcp-relay += "dhcp-relay-systemd" -RREPLACES_dhcp-relay += "dhcp-relay-systemd" -RCONFLICTS_dhcp-relay += "dhcp-relay-systemd"
Oops, I got a bit carried away, the RPROVIDES/RREPLACES/RCONFLICTS lines should not be removed. I have updated this commit on the branch to leave them in.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre