Move networking recipes to meta-networking
cover Move networking recipes to meta-networking
This moves most of the remaining networking recipes in meta-oe to meta-networking, with some additional tidying up.
The following changes since commit a45830a39bb47a9eab27980d52966226c9504ea4:
recipes: Unify indentation (2013-04-15 16:23:17 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib paule/meta-networking-moves2
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/meta-networking-moves2
Paul Eggleton (9):
vsftpd: move from meta-oe to meta-networking and tweak
iw: move to meta-networking and update
openvpn: move to meta-networking and tweak
bridge-utils: move to meta-networking and tweak
rp-pppoe: move from meta-oe to meta-networking and tweak
dnsmasq: move to meta-networking and tweak
ipsec-tools: move to meta-networking and tweak
strongswan: move to meta-networking
atftp: move to meta-networking and tweak
.../recipes-daemons}/atftp/atftp/atftpd.service | 0
.../recipes-daemons}/atftp/atftp_git.bb | 4 ++--
...tpd-0.7_circumvent_tftp_size_restrictions.patch | 5 ++++
.../atftpd-0.7_unprotected_assignments_crash.patch | 7 ++++++
.../recipes-daemons}/atftp/files/atftpd.init | 0
.../recipes-daemons}/vsftpd/files/init | 0
.../recipes-daemons}/vsftpd/files/vsftpd.conf | 0
.../vsftpd/vsftpd-2.3.5/makefile-destdir.patch | 25 +++++++++-----------
.../vsftpd/vsftpd-2.3.5/makefile-libs.patch | 21 ++++++++++++++++
.../vsftpd/vsftpd-2.3.5/makefile-strip.patch | 17 +++++++++++++
.../vsftpd/vsftpd-2.3.5/nopam.patch | 4 ++++
.../recipes-daemons}/vsftpd/vsftpd_2.3.5.bb | 17 +++++++------
.../rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch | 0
.../discard-use-of-dnl-in-Makefile.am.patch | 0
.../rp-pppoe-3.8/dont-swallow-errors.patch | 0
.../rp-pppoe/rp-pppoe-3.8/pppoe-server.default | 0
.../rp-pppoe/rp-pppoe-3.8/pppoe-server.init | 0
.../rp-pppoe-3.8/pppoe-src-restrictions.patch | 0
.../rp-pppoe/rp-pppoe-3.8/top-autoconf.patch | 0
.../rp-pppoe/rp-pppoe-3.8/update-config.patch | 0
.../rp-pppoe/rp-pppoe-3.8/use-ldflags.patch | 0
.../recipes-protocols}/rp-pppoe/rp-pppoe_3.8.bb | 14 ++++++-----
.../recipes-support}/bridge-utils/bridge-utils.inc | 7 +++---
.../bridge-utils/bridge-utils/kernel-headers.patch | 0
.../bridge-utils/bridge-utils_1.5.bb | 0
.../recipes-support}/dnsmasq/dnsmasq.inc | 13 ++++++++--
.../recipes-support}/dnsmasq/dnsmasq_2.55.bb | 0
.../recipes-support}/dnsmasq/files/dnsmasq.conf | 0
.../recipes-support}/dnsmasq/files/dnsmasq.service | 0
.../recipes-support}/dnsmasq/files/init | 0
.../ipsec-tools/files/ipsec-tools-install.patch | 4 ++++
.../recipes-support/ipsec-tools/ipsec-tools.inc | 0
.../ipsec-tools/ipsec-tools_0.7.2.bb | 0
....sh-don-t-use-git-describe-for-versioning.patch | 0
.../recipes-support/iw/iw_3.8.bb | 6 ++---
.../recipes-support}/openvpn/openvpn/openvpn | 0
.../recipes-support}/openvpn/openvpn_2.1.3.bb | 9 +++----
.../recipes-support/strongswan/strongswan_5.0.0.bb | 0
.../dnsmasq/dnsmasq-dbus_2.55.bb | 13 ----------
meta-oe/recipes-connectivity/openvpn/openvpn.inc | 22 -----------------
40 files changed, 112 insertions(+), 76 deletions(-)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/atftp/atftpd.service (100%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/atftp_git.bb (95%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch (98%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch (95%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/files/atftpd.init (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/files/init (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/files/vsftpd.conf (100%)
rename meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/makefile.patch => meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-destdir.patch (75%)
create mode 100644 meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-libs.patch
create mode 100644 meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-strip.patch
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/vsftpd-2.3.5/nopam.patch (87%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/vsftpd_2.3.5.bb (83%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/pppoe-server.default (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/pppoe-server.init (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/update-config.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe_3.8.bb (97%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/bridge-utils/bridge-utils.inc (84%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/bridge-utils/bridge-utils/kernel-headers.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/bridge-utils/bridge-utils_1.5.bb (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/dnsmasq.inc (76%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/dnsmasq_2.55.bb (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/dnsmasq.conf (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/dnsmasq.service (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/init (100%)
rename {meta-oe => meta-networking}/recipes-support/ipsec-tools/files/ipsec-tools-install.patch (90%)
rename {meta-oe => meta-networking}/recipes-support/ipsec-tools/ipsec-tools.inc (100%)
rename {meta-oe => meta-networking}/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch (100%)
rename meta-oe/recipes-connectivity/iw/iw_3.6.bb => meta-networking/recipes-support/iw/iw_3.8.bb (74%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn/openvpn (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn_2.1.3.bb (92%)
rename {meta-oe => meta-networking}/recipes-support/strongswan/strongswan_5.0.0.bb (100%)
delete mode 100644 meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb
delete mode 100644 meta-oe/recipes-connectivity/openvpn/openvpn.incSignature · 1 line
1.7.10.4
PATCH 1/9 vsftpd: move from meta-oe to meta-networking and tweak
* Fix stripped file QA warning
* Add proper headers to patches (and split makefile.patch into two parts, one of which may be upstreamable)
* Use PV in SRC_URI instead of hardcoded version
* Move SRC_URI checksums up next to SRC_URI
* Set SUMMARY instead of DESCRIPTION
---
.../recipes-daemons}/vsftpd/files/init | 0
.../recipes-daemons}/vsftpd/files/vsftpd.conf | 0
.../vsftpd/vsftpd-2.3.5/makefile-destdir.patch | 25 +++++++++-----------
.../vsftpd/vsftpd-2.3.5/makefile-libs.patch | 21 ++++++++++++++++
.../vsftpd/vsftpd-2.3.5/makefile-strip.patch | 17 +++++++++++++
.../vsftpd/vsftpd-2.3.5/nopam.patch | 4 ++++
.../recipes-daemons}/vsftpd/vsftpd_2.3.5.bb | 17 +++++++------
7 files changed, 63 insertions(+), 21 deletions(-)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/files/init (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/files/vsftpd.conf (100%)
rename meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/makefile.patch => meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-destdir.patch (75%)
create mode 100644 meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-libs.patch
create mode 100644 meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-strip.patch
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/vsftpd-2.3.5/nopam.patch (87%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-daemons}/vsftpd/vsftpd_2.3.5.bb (83%)meta-networking/recipes-daemons/vsftpd/files/init renamed from meta-oe/recipes-connectivity/vsftpd/files/init +0 -0
meta-networking/recipes-daemons/vsftpd/files/vsftpd.conf renamed from meta-oe/recipes-connectivity/vsftpd/files/vsftpd.conf +0 -0
meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-destdir.patch renamed from meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/makefile.patch +11 -14
@@ -1,17 +1,14 @@ -diff -ur vsftpd-2.0.1_org/Makefile vsftpd-2.0.1_patch/Makefile ---- vsftpd-2.0.1_org/Makefile 2004-06-06 18:21:27.000000000 +0200 -+++ vsftpd-2.0.1_patch/Makefile 2004-07-21 09:50:25.245576352 +0200 -@@ -5,7 +5,7 @@ - #CFLAGS = -g - CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion - --LIBS = `./vsf_findlibs.sh` -+LIBS = -lssl -lcrypto -lnsl -lresolv - LINK = -Wl,-s - - OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ -@@ -24,21 +24,21 @@ - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) +Use DESTDIR within install to allow installing under a prefix + +Upstream-Status: Pending + +Signed-off-by: Paul Eggleton <[email protected]> + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -24,21 +24,21 @@ vsftpd: $(OBJS) + $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS) install: - if [ -x /usr/local/sbin ]; then \
meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-libs.patch new file +21 -0
@@ -0,0 +1,21 @@ +Hardcode LIBS instead of using a script to determine available libs + +We want to avoid this dynamic detection so we have a deterministic +build. + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton <[email protected]> + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,7 @@ IFLAGS = -idirafter dummyinc + #CFLAGS = -g + CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion + +-LIBS = `./vsf_findlibs.sh` ++LIBS = -lssl -lcrypto -lnsl -lresolv + LINK = -Wl,-s + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/makefile-strip.patch new file +17 -0
@@ -0,0 +1,17 @@ +Disable stripping at link time + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton <[email protected]> + +diff --git a/Makefile b/Makefile +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,6 @@ IFLAGS = -idirafter dummyinc + CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion + + LIBS = -lssl -lcrypto -lnsl -lresolv +-LINK = -Wl,-s + + OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ + tunables.o ftpdataio.o secbuf.o ls.o \
meta-networking/recipes-daemons/vsftpd/vsftpd-2.3.5/nopam.patch renamed from meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/nopam.patch +4 -0
@@ -1,3 +1,7 @@ +Disable PAM + +Upstream-Status: Inappropriate [config] + diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h --- vsftpd-2.0.1_org/builddefs.h 2004-07-02 16:36:59.000000000 +0200 +++ vsftpd-2.0.1_patch/builddefs.h 2004-07-21 09:34:49.044900488 +0200
meta-networking/recipes-daemons/vsftpd/vsftpd_2.3.5.bb renamed from meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb +10 -7
@@ -1,17 +1,22 @@ -DESCRIPTION = "Secure ftp server" -HOMEPAGE="https://security.appspot.com/vsftpd.html" +SUMMARY = "Very Secure FTP server" +HOMEPAGE = "https://security.appspot.com/vsftpd.html" SECTION = "network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271" DEPENDS = "libcap" -SRC_URI = "https://security.appspot.com/downloads/vsftpd-2.3.5.tar.gz \ - file://makefile.patch \ +SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ + file://makefile-destdir.patch \ + file://makefile-libs.patch \ + file://makefile-strip.patch \ file://nopam.patch \ file://init \ file://vsftpd.conf" +SRC_URI[md5sum] = "01398a5bef8e85b6cf2c213a4b011eca" +SRC_URI[sha256sum] = "d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1" + inherit update-rc.d useradd CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf"
@@ -43,6 +48,4 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \ --shell /bin/false ftp " GROUPADD_PARAM_${PN} = "-r ftp" - -SRC_URI[md5sum] = "01398a5bef8e85b6cf2c213a4b011eca" -SRC_URI[sha256sum] = "d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1" +
Signature · 1 line
1.7.10.4
PATCH 2/9 iw: move to meta-networking and update
In reply to Paul Eggleton* Update to 3.8
* Use working SRC_URI
---
...001-iw-version.sh-don-t-use-git-describe-for-versioning.patch | 0
.../iw/iw_3.6.bb => meta-networking/recipes-support/iw/iw_3.8.bb | 6 +++---
2 files changed, 3 insertions(+), 3 deletions(-)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch (100%)
rename meta-oe/recipes-connectivity/iw/iw_3.6.bb => meta-networking/recipes-support/iw/iw_3.8.bb (74%)meta-networking/recipes-support/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch renamed from meta-oe/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch +0 -0
meta-networking/recipes-support/iw/iw_3.8.bb renamed from meta-oe/recipes-connectivity/iw/iw_3.6.bb +3 -3
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774" DEPENDS = "libnl pkgconfig" -SRC_URI = "http://wireless.kernel.org/download/iw/${P}.tar.bz2 \ +SRC_URI = "http://kernel.org/pub/software/network/iw/${P}.tar.gz \ file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ " -SRC_URI[md5sum] = "1c18bfbbc8773629e5e8ac733a39540c" -SRC_URI[sha256sum] = "df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857" +SRC_URI[md5sum] = "fff10217a0b0ca088a1eba6413394280" +SRC_URI[sha256sum] = "a73b81e6fb1a9a7cad7aae584bee16f1029ddb6a1c3c08e8b7f22e301690cbfc" EXTRA_OEMAKE = ""
Signature · 1 line
1.7.10.4
PATCH 3/9 openvpn: move to meta-networking and tweak
In reply to Paul Eggleton* Move SRC_URI checksums next to SRC_URI
* Move packaging definitions to the end
* Set SUMMARY instead of DESCRIPTION
* Drop unused inc file
---
.../recipes-support}/openvpn/openvpn/openvpn | 0
.../recipes-support}/openvpn/openvpn_2.1.3.bb | 9 ++++----
meta-oe/recipes-connectivity/openvpn/openvpn.inc | 22 --------------------
3 files changed, 5 insertions(+), 26 deletions(-)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn/openvpn (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn_2.1.3.bb (92%)
delete mode 100644 meta-oe/recipes-connectivity/openvpn/openvpn.incmeta-networking/recipes-support/openvpn/openvpn/openvpn renamed from meta-oe/recipes-connectivity/openvpn/openvpn/openvpn +0 -0
meta-networking/recipes-support/openvpn/openvpn_2.1.3.bb renamed from meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb +5 -4
@@ -1,16 +1,18 @@ -DESCRIPTION = "A full-featured SSL VPN solution via tun device." +SUMMARY = "A full-featured SSL VPN solution via tun device." HOMEPAGE = "http://openvpn.sourceforge.net" SECTION = "console/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" DEPENDS = "lzo openssl" -RRECOMMENDS_${PN} = "kernel-module-tun" inherit autotools SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ file://openvpn" +SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" +SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36" + CFLAGS += "-fno-inline" # I want openvpn to be able to read password from file (hrw)
@@ -22,5 +24,4 @@ do_install_append() { install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d } -SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" -SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36" +RRECOMMENDS_${PN} = "kernel-module-tun"
meta-oe/recipes-connectivity/openvpn/openvpn.inc deleted +0 -22
@@ -1,22 +0,0 @@ -DESCRIPTION = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "http://openvpn.sourceforge.net" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "lzo openssl" -RRECOMMENDS_${PN} = "kernel-module-tun" - -INC_PR = "r2" - -SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ - file://openvpn" -S = "${WORKDIR}/openvpn-${PV}" - -CFLAGS += "-fno-inline" - -inherit autotools - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}/${sysconfdir}/openvpn - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d -}
Signature · 1 line
1.7.10.4
PATCH 4/9 bridge-utils: move to meta-networking and tweak
In reply to Paul Eggleton* Update HOMEPAGE
* Set SUMMARY instead of DESCRIPTION
* Move DEPENDS up towards the top
---
.../recipes-support}/bridge-utils/bridge-utils.inc | 7 ++++---
.../bridge-utils/bridge-utils/kernel-headers.patch | 0
.../recipes-support}/bridge-utils/bridge-utils_1.5.bb | 0
3 files changed, 4 insertions(+), 3 deletions(-)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/bridge-utils/bridge-utils.inc (84%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/bridge-utils/bridge-utils/kernel-headers.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/bridge-utils/bridge-utils_1.5.bb (100%)meta-networking/recipes-support/bridge-utils/bridge-utils.inc renamed from meta-oe/recipes-connectivity/bridge-utils/bridge-utils.inc +4 -3
@@ -1,8 +1,10 @@ -DESCRIPTION = "Tools for ethernet bridging." -HOMEPAGE = "http://bridge.sourceforge.net/" +SUMMARY = "Tools for ethernet bridging" +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge" SECTION = "console/network" LICENSE = "GPLv2" +DEPENDS = "sysfsutils" + SRC_URI = "${SOURCEFORGE_MIRROR}/bridge/bridge-utils-${PV}.tar.gz" inherit autotools
@@ -16,7 +18,6 @@ do_install_append () { install -d ${D}/${sysconfdir}/network/if-post-down.d } -DEPENDS = "sysfsutils" RRECOMMENDS_${PN} = "kernel-module-bridge" pkg_postinst_${PN} () {
meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch renamed from meta-oe/recipes-connectivity/bridge-utils/bridge-utils/kernel-headers.patch +0 -0
meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb renamed from meta-oe/recipes-connectivity/bridge-utils/bridge-utils_1.5.bb +0 -0
Signature · 1 line
1.7.10.4
PATCH 5/9 rp-pppoe: move from meta-oe to meta-networking and tweak
In reply to Paul Eggleton* Move packaging definitions to the end
* Move SRC_URI checksums next to SRC_URI
* Set SUMMARY instead of DESCRIPTION
---
.../rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch | 0
.../rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch | 0
.../rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch | 0
.../rp-pppoe/rp-pppoe-3.8/pppoe-server.default | 0
.../rp-pppoe/rp-pppoe-3.8/pppoe-server.init | 0
.../rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch | 0
.../rp-pppoe/rp-pppoe-3.8/top-autoconf.patch | 0
.../rp-pppoe/rp-pppoe-3.8/update-config.patch | 0
.../rp-pppoe/rp-pppoe-3.8/use-ldflags.patch | 0
.../recipes-protocols}/rp-pppoe/rp-pppoe_3.8.bb | 14 ++++++++------
10 files changed, 8 insertions(+), 6 deletions(-)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/pppoe-server.default (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/pppoe-server.init (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/update-config.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-protocols}/rp-pppoe/rp-pppoe_3.8.bb (97%)meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/discard-use-of-dnl-in-Makefile.am.patch +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/pppoe-server.default renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/pppoe-server.default +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/pppoe-server.init renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/pppoe-server.init +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/update-config.patch renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/update-config.patch +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch +0 -0
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb renamed from meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb +8 -6
@@ -1,11 +1,9 @@ -DESCRIPTION = "A user-mode PPPoE client and server suite for Linux" +SUMMARY = "A user-mode PPPoE client and server suite for Linux" HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe" SECTION = "console/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" -RDEPENDS_${PN} = "ppp" -RDEPENDS_${PN}-server = "${PN}" -RRECOMMENDS_${PN} = "ppp-oe" + PR = "r9" SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
@@ -19,6 +17,9 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ file://pppoe-server.default \ file://pppoe-server.init" +SRC_URI[md5sum] = "0e32760f498f9cde44081ee6aafc823b" +SRC_URI[sha256sum] = "d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479" + inherit autotools update-rc.d do_install() {
@@ -57,6 +58,7 @@ INITSCRIPT_PACKAGES = "${PN}-server" INITSCRIPT_NAME_${PN}-server = "pppoe-server" INITSCRIPT_PARAMS_${PN}-server = "defaults 92 8" +RDEPENDS_${PN} = "ppp" +RDEPENDS_${PN}-server = "${PN}" +RRECOMMENDS_${PN} = "ppp-oe" -SRC_URI[md5sum] = "0e32760f498f9cde44081ee6aafc823b" -SRC_URI[sha256sum] = "d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479"
Signature · 1 line
1.7.10.4
PATCH 6/9 dnsmasq: move to meta-networking and tweak
In reply to Paul Eggleton* Make dbus a PACKAGECONFIG option and remove dnsmasq-dbus recipe
* Set LICENSE to correctly indicate choice of licenses
* Set SUMMARY instead of DESCRIPTION
---
.../recipes-support}/dnsmasq/dnsmasq.inc | 13 +++++++++++--
.../recipes-support}/dnsmasq/dnsmasq_2.55.bb | 0
.../recipes-support}/dnsmasq/files/dnsmasq.conf | 0
.../recipes-support}/dnsmasq/files/dnsmasq.service | 0
.../recipes-support}/dnsmasq/files/init | 0
meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb | 13 -------------
6 files changed, 11 insertions(+), 15 deletions(-)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/dnsmasq.inc (76%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/dnsmasq_2.55.bb (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/dnsmasq.conf (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/dnsmasq.service (100%)
rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/dnsmasq/files/init (100%)
delete mode 100644 meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bbmeta-networking/recipes-support/dnsmasq/dnsmasq.inc renamed from meta-oe/recipes-connectivity/dnsmasq/dnsmasq.inc +11 -2
@@ -1,8 +1,8 @@ -DESCRIPTION = "Dnsmasq is a lightweight, easy to configure DNS forwarder and DHCP server." +SUMMARY = "Lightweight, easy to configure DNS forwarder and DHCP server" HOMEPAGE = "http://www.thekelleys.org.uk/dnsmasq/doc.html" SECTION = "console/network" # GPLv3 was added in version 2.41 as license option -LICENSE = "GPLv2 GPLv3" +LICENSE = "GPLv2 | GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504"
@@ -18,6 +18,10 @@ inherit update-rc.d systemd INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" +PACKAGECONFIG ??= "" +PACKAGECONFIG[dbus] = "COPTS=-DHAVE_DBUS,,dbus" +EXTRA_OEMAKE = "${EXTRA_OECONF}" + do_install () { oe_runmake "PREFIX=${D}${prefix}" \ "BINDIR=${D}${bindir}" \
@@ -29,6 +33,11 @@ do_install () { install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/dnsmasq.service ${D}${systemd_unitdir}/system + + if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then + install -d ${D}${sysconfdir}/dbus-1/system.d + install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ + fi } CONFFILES_${PN} = "${sysconfdir}/dnsmasq.conf"
meta-networking/recipes-support/dnsmasq/dnsmasq_2.55.bb renamed from meta-oe/recipes-connectivity/dnsmasq/dnsmasq_2.55.bb +0 -0
meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf renamed from meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.conf +0 -0
meta-networking/recipes-support/dnsmasq/files/dnsmasq.service renamed from meta-oe/recipes-connectivity/dnsmasq/files/dnsmasq.service +0 -0
meta-networking/recipes-support/dnsmasq/files/init renamed from meta-oe/recipes-connectivity/dnsmasq/files/init +0 -0
meta-oe/recipes-connectivity/dnsmasq/dnsmasq-dbus_2.55.bb deleted +0 -13
@@ -1,13 +0,0 @@ -# dnsmasq with support for DBus interface - -require dnsmasq_${PV}.bb - -S = "${WORKDIR}/dnsmasq-${PV}" - -DEPENDS = "dbus" -EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS" - -do_install_append () { - install -d ${D}${sysconfdir}/dbus-1/system.d - install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ -}
Signature · 1 line
1.7.10.4
PATCH 7/9 ipsec-tools: move to meta-networking and tweak
In reply to Paul Eggleton* Add purpose and Upstream-Status to patch
---
.../recipes-support/ipsec-tools/files/ipsec-tools-install.patch | 4 ++++
.../recipes-support/ipsec-tools/ipsec-tools.inc | 0
.../recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb | 0
3 files changed, 4 insertions(+)
rename {meta-oe => meta-networking}/recipes-support/ipsec-tools/files/ipsec-tools-install.patch (90%)
rename {meta-oe => meta-networking}/recipes-support/ipsec-tools/ipsec-tools.inc (100%)
rename {meta-oe => meta-networking}/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb (100%)meta-networking/recipes-support/ipsec-tools/files/ipsec-tools-install.patch renamed from meta-oe/recipes-support/ipsec-tools/files/ipsec-tools-install.patch +4 -0
@@ -1,3 +1,7 @@ +Avoid attempting to install vmbuf.h twice + +Upstream-Status: Accepted + Taken from pld-linux.org: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipsec-tools/ipsec-tools-install.patch
meta-networking/recipes-support/ipsec-tools/ipsec-tools.inc renamed from meta-oe/recipes-support/ipsec-tools/ipsec-tools.inc +0 -0
meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb renamed from meta-oe/recipes-support/ipsec-tools/ipsec-tools_0.7.2.bb +0 -0
Signature · 1 line
1.7.10.4
PATCH 8/9 strongswan: move to meta-networking
In reply to Paul Eggleton---
.../recipes-support/strongswan/strongswan_5.0.0.bb | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename {meta-oe => meta-networking}/recipes-support/strongswan/strongswan_5.0.0.bb (100%)meta-networking/recipes-support/strongswan/strongswan_5.0.0.bb renamed from meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb +0 -0
Signature · 1 line
1.7.10.4
PATCH 9/9 atftp: move to meta-networking and tweak
In reply to Paul Eggleton* Add origin and Upstream-Status to patches
* Set SUMMARY instead of DESCRIPTION
* Add ${PN}d to PACKAGES instead of atftpd to be consistent with the rest of the recipe
---
.../recipes-daemons}/atftp/atftp/atftpd.service | 0
.../recipes-daemons}/atftp/atftp_git.bb | 4 ++--
.../files/atftpd-0.7_circumvent_tftp_size_restrictions.patch | 5 +++++
.../atftp/files/atftpd-0.7_unprotected_assignments_crash.patch | 7 +++++++
.../recipes-daemons}/atftp/files/atftpd.init | 0
5 files changed, 14 insertions(+), 2 deletions(-)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/atftp/atftpd.service (100%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/atftp_git.bb (95%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch (98%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch (95%)
rename {meta-oe/recipes-extended => meta-networking/recipes-daemons}/atftp/files/atftpd.init (100%)meta-networking/recipes-daemons/atftp/atftp/atftpd.service renamed from meta-oe/recipes-extended/atftp/atftp/atftpd.service +0 -0
meta-networking/recipes-daemons/atftp/atftp_git.bb renamed from meta-oe/recipes-extended/atftp/atftp_git.bb +2 -2
@@ -1,4 +1,4 @@ -DESCRIPTION = "Advanced TFTP server and client" +SUMMARY = "Advanced TFTP server and client" SECTION = "network" HOMEPAGE = "http://packages.debian.org/atftp" LICENSE = "GPLv2"
@@ -38,7 +38,7 @@ do_install_append() { install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system } -PACKAGES =+ "atftpd" +PACKAGES =+ "${PN}d" FILES_${PN} = "${bindir}/*"
meta-networking/recipes-daemons/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch renamed from meta-oe/recipes-extended/atftp/files/atftpd-0.7_circumvent_tftp_size_restrictions.patch +5 -0
@@ -8,6 +8,11 @@ hardwared BLOCKSIZE setting of 1432). block rollover http://www.compuphase.com/tftp.htm +Patch originally from OpenSUSE: +https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2 + +Upstream-Status: Pending + Index: git/tftp_def.h =================================================================== --- git.orig/tftp_def.h 2012-11-19 16:28:50.221027144 -0800
meta-networking/recipes-daemons/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch renamed from meta-oe/recipes-extended/atftp/files/atftpd-0.7_unprotected_assignments_crash.patch +7 -0
@@ -1,3 +1,10 @@ +Avoid assigning thread data outside of mutex lock + +Patch originally from OpenSUSE: +https://build.opensuse.org/package/show?package=atftp&project=openSUSE%3A12.2 + +Upstream-Status: Pending + Index: git/tftpd_list.c =================================================================== --- git.orig/tftpd_list.c 2012-10-24 21:48:47.000000000 -0700
meta-networking/recipes-daemons/atftp/files/atftpd.init renamed from meta-oe/recipes-extended/atftp/files/atftpd.init +0 -0
Signature · 1 line
1.7.10.4
Quoted 3 lines · Paul Eggleton
This moves most of the remaining networking recipes in meta-oe to meta-networking, with some additional tidying up.
Could we possibly get net-snmp in with this move?
Cheers,
Signature · 5 lines
Jack Mitchell ([email protected]) Embedded Systems Engineer http://www.embed.me.uk --
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 16-04-13 12:53, Paul Eggleton schreef:
Quoted 15 lines
This moves most of the remaining networking recipes in meta-oe to meta-networking, with some additional tidying up.
The following changes since commit
a45830a39bb47a9eab27980d52966226c9504ea4:recipes: Unify indentation (2013-04-15 16:23:17 +0200)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib
paule/meta-networking-moves2
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/meta-networking-moves2
Quoted 6 lines
Paul Eggleton (9): vsftpd: move from meta-oe to meta-networking and
tweak openvpn: move to meta-networking and tweak bridge-utils: move to meta-networking and tweak rp-pppoe: move from meta-oe to meta-networking and tweak dnsmasq: move to meta-networking and tweak ipsec-tools: move to meta-networking and tweak strongswan: move to meta-networking atftp: move to meta-networking and tweak
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \
With the 'meta-oe shall only depend on oe-core' rule, iw can't get moved to meta-networking. Since iw is replacing wireless-tools I think it should move to OE-core instead.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFRbTF6MkyGM64RGpERApLoAJ9VE1iFJzYL0mXye+f+VQnukWJIqgCgtDzn jRT3AEDi+XnA5L15qYPqkrw=
=kUrm
-----END PGP SIGNATURE-----
Quoted 11 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
Quoted 2 lines
iw can't get moved to meta-networking. Since iw is replacing wireless-tools I think it should move to OE-core instead.
Maybe; we can look at that for 1.5. I'd argue that package group shouldn't really be in meta-oe though; some time ought to be spent getting us to a state where we don't need another package group named "packagegroup*-base". Your help would be appreciated there.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton <[email protected]> het volgende geschreven:
Quoted 7 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 6 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
Quoted 8 lines
Quoted 5 lines
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
regards,
Koen
Re: [meta-networking, meta-oe][PATCH 3/9] openvpn: move to meta-networking and tweak
In reply to Paul EggletonQuoted 10 lines · Paul Eggleton
* Move
SRC_URIchecksums next toSRC_URI
* Move packaging definitions to the end
* Set SUMMARY instead of DESCRIPTION
* Drop unused inc fileSigned-off-by Paul Eggleton <[email protected]>--- .../recipes-support}/openvpn/openvpn/openvpn | 0 .../recipes-support}/openvpn/openvpn_2.1.3.bb | 9 ++++---- meta-oe/recipes-connectivity/openvpn/openvpn.inc | 22 --------------------
This assumes that there isn't any layer with different openvpn version using openvpn.inc, but as we weren't using it I guess it's OK to remove it. (it looks like I've accidentally included it commit importing openvpn from OE-classic after merging .inc to .bb).
Quoted 80 lines
3 files changed, 5 insertions(+), 26 deletions(-) rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn/openvpn (100%) rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn_2.1.3.bb (92%) delete mode 100644 meta-oe/recipes-connectivity/openvpn/openvpn.incmeta-networking/recipes-support/openvpn/openvpn/openvpn renamed from meta-oe/recipes-connectivity/openvpn/openvpn/openvpn +0
-0meta-networking/recipes-support/openvpn/openvpn_2.1.3.bb renamed from meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb +5
-4@@ -1,16 +1,18 @@ -DESCRIPTION = "A full-featured SSL VPN solution via tun device." +SUMMARY = "A full-featured SSL VPN solution via tun device." HOMEPAGE = "http://openvpn.sourceforge.net" SECTION = "console/network" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" DEPENDS = "lzo openssl" -RRECOMMENDS_${PN} = "kernel-module-tun" inherit autotools SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ file://openvpn" +SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" +SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36" + CFLAGS += "-fno-inline" # I want openvpn to be able to read password from file (hrw)@@ -22,5 +24,4 @@ do_install_append() { install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d } -SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" -SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36" +RRECOMMENDS_${PN} = "kernel-module-tun"meta-oe/recipes-connectivity/openvpn/openvpn.inc deleted +0
-22@@ -1,22 +0,0 @@ -DESCRIPTION = "A full-featured SSL VPN solution via tun device." -HOMEPAGE = "http://openvpn.sourceforge.net" -SECTION = "console/network" -LICENSE = "GPLv2" -DEPENDS = "lzo openssl" -RRECOMMENDS_${PN} = "kernel-module-tun" - -INC_PR = "r2" - -SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ - file://openvpn" -S = "${WORKDIR}/openvpn-${PV}" - -CFLAGS += "-fno-inline" - -inherit autotools - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -d ${D}/${sysconfdir}/openvpn - install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d -}Signature · 7 lines
1.7.10.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 14 lines · Koen Kooi
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton <[email protected]> het volgende geschreven:
Quoted 11 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 10 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
There were some issues few months ago and hrw send some patches to move recipes in right layers, since then I don't know about any dependency.
But it's true that all my builds have more layers included so I don't test this scenario directly.
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 5 lines · On Tuesday 16 April 2013 12:01:09 Jack Mitchell wrote:
Quoted 2 lines · Paul Eggleton
This moves most of the remaining networking recipes in meta-oe to meta-networking, with some additional tidying up.
Could we possibly get net-snmp in with this move?
Whoops, I meant to move that one. However I just tried to build it after doing so and it fails during do_compile:
| ../arm-poky-linux-gnueabi-libtool --mode=link arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/home/paul/poky/poky/build/tmp/sysroots/qemuarm -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -Ulinux -Dlinux=linux -o snmpd snmpd.lo -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed libnetsnmpagent.la libnetsnmpmibs.la ../snmplib/libnetsnmp.la -lm | arm-poky-linux-gnueabi-libtool: link: arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/home/paul/poky/poky/build/tmp/sysroots/qemuarm -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -Ulinux -Dlinux=linux -o .libs/snmpd .libs/snmpd.o -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed ./.libs/libnetsnmpagent.so ./.libs/libnetsnmpmibs.so /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/agent/.libs/libnetsnmpagent.so /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/snmplib/.libs/libnetsnmp.so -lpci -ldl ../snmplib/.libs/libnetsnmp.so -lcrypto -lm | .libs/snmpd.o: In function `main': | /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/agent/snmpd.c:459: undefined reference to `netsnmp_sd_listen_fds' | collect2: error: ld returned 1 exit status | make[1]: *** [snmpd] Error 1 | make[1]: Leaving directory `/home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/agent' | make: *** [subdirs] Error 1 | ERROR: oe_runmake failed | ERROR: Function failed: do_compile (see /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/temp/log.do_compile.21614 for further information)
Not sure why this is failing, I doubt the move has anything to do with it though.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 19 lines · Paul Eggleton
Quoted 4 lines · On Tuesday 16 April 2013 12:01:09 Jack Mitchell wrote:
Quoted 2 lines · Paul Eggleton
This moves most of the remaining networking recipes in meta-oe to meta-networking, with some additional tidying up.
Could we possibly get net-snmp in with this move?
Whoops, I meant to move that one. However I just tried to build it after doing so and it fails during
do_compile:| ../arm-poky-linux-gnueabi-libtool --mode=link arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/home/paul/poky/poky/build/tmp/sysroots/qemuarm -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -Ulinux -Dlinux=linux -o snmpd snmpd.lo -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed libnetsnmpagent.la libnetsnmpmibs.la ../snmplib/libnetsnmp.la -lm | arm-poky-linux-gnueabi-libtool: link: arm-poky-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/home/paul/poky/poky/build/tmp/sysroots/qemuarm -fno-strict-aliasing -O2 -pipe -g -feliminate-unused-debug-types -Ulinux -Dlinux=linux -o .libs/snmpd .libs/snmpd.o -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed ./.libs/libnetsnmpagent.so ./.libs/libnetsnmpmibs.so /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/agent/.libs/libnetsnmpagent.so /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/snmplib/.libs/libnetsnmp.so -lpci -ldl ../snmplib/.libs/libnetsnmp.so -lcrypto -lm | .libs/snmpd.o: In function `main': | /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/agent/snmpd.c:459: undefined reference to `netsnmp_sd_listen_fds' | collect2: error: ld returned 1 exit status | make[1]: *** [snmpd] Error 1 | make[1]: Leaving directory `/home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/net-snmp-5.7.1/agent' | make: *** [subdirs] Error 1 | ERROR: oe_runmake failed | ERROR: Function failed: do_compile (see /home/paul/poky/poky/build/tmp/work/armv5te-poky-linux-gnueabi/net-snmp/5.7.1-r6.4/temp/log.do_compile.21614 for further information)
Quoted 6 lines
Not sure why this is failing, I doubt the move has anything to do with it though.
Cheers,
Paul
Hmmmm, maybe it's something armv5te related as it builds fine on my armv7a here...maybe one for another day, although it might get a bit more love if it's not hidden away in recipes-extended.
Signature · 5 lines
Jack Mitchell ([email protected]) Embedded Systems Engineer http://www.embed.me.uk --
Quoted 1 line · On Tuesday 16 April 2013 13:30:29 Koen Kooi wrote:
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton
<[email protected]> het volgende geschreven:
Quoted 11 lines
Quoted 11 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 10 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
At some point I don't think this is going to be realistic - what happens if you have something in meta-oe that's too generic to be put elsewhere and yet has a dependency on something in meta-multimedia or meta-networking? It will come up at some point fairly soon.
I can drop the iw patch from this set for the sake of the rest of the patches if you object to moving it, but we do need to do something about this in the near future.
For now, I did check and at the moment according to "bitbake-layers show- cross-depends" (thank you Robert) we have only vlc depending on fluidsynth which is in meta-multimedia, but vlc ought to be moved to meta-multimedia itself anyway.
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 19 lines · Paul Eggleton
Quoted 1 line · On Tuesday 16 April 2013 13:30:29 Koen Kooi wrote:
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton
<[email protected]> het volgende geschreven:
Quoted 16 lines
Quoted 15 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 11 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
Quoted 8 lines
Quoted 3 lines
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
At some point I don't think this is going to be realistic - what happens if you have something in meta-oe that's too generic to be put elsewhere and yet has a dependency on something in meta-multimedia or meta-networking? It will come up at some point fairly soon.
then it should be in meta-multimedia or meta-networking even when it's too generic or the required recipe in meta-multimedia or meta-networking has to be moved back to meta-oe.
Quoted 8 lines
I can drop the iw patch from this set for the sake of the rest of the patches if you object to moving it, but we do need to do something about this in the near future.
For now, I did check and at the moment according to "bitbake-layers show- cross-depends" (thank you Robert) we have only vlc depending on fluidsynth which is in meta-multimedia, but vlc ought to be moved to meta-multimedia itself anyway.
Ah, my fault I've added fluidsynth because it was autodetected, but maybe I should have disabled it explicitly or move vlc to meta-multimedia with it.
commit 0d1d39da74e6b73c5b070f551373d21e2a15f98a
Author: Martin Jansa <[email protected]> Date: Tue Dec 11 00:54:46 2012 +0100
vlc: add fluidsynth and alsa-lib to DEPENDS for reproducible builds
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 23 lines · [Re: [oe] [meta-networking, meta-oe][PATCH 0/9] Move networking recipes to…
Quoted 1 line · On Tuesday 16 April 2013 13:30:29 Koen Kooi wrote:
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton
<[email protected]> het volgende geschreven:
Quoted 11 lines
Quoted 11 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 10 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \Quoted 8 lines
Quoted 4 lines
Quoted 1 line
With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
Quoted 8 lines
At some point I don't think this is going to be realistic - what happens if you have something in meta-oe that's too generic to be put elsewhere and yet has a dependency on something in meta-multimedia or meta-networking? It will come up at some point fairly soon.
I can drop the iw patch from this set for the sake of the rest of the patches if you object to moving it, but we do need to do something about this in the near future.
I'm way behind on my meta-networking stuff but finally getting caught up and I was wondering if we had run this one to ground. Martin's already merged in most of the other moves and I'm also fine with relocating iw, but I can see the argument in favour of keeping it in meta-oe. For now I'm also planning on merging a couple that didn't get picked up already:
f501ecadb6 strongswan: move to meta-networking cdf2bf5654 vsftpd: move from meta-oe to meta-networking and tweak
I'll also pick up the iw one if there's a consensus that moving it is the right thing (or not a terrible thing) to do.
I think that addresses the full list of relocations from this thread.
-J.
Quoted 8 lines
For now, I did check and at the moment according to "bitbake-layers show- cross-depends" (thank you Robert) we have only vlc depending on fluidsynth which is in meta-multimedia, but vlc ought to be moved to meta-multimedia itself anyway.
Cheers,
Paul
Signature · 2 lines
-Joe MacDonald. :wq
Quoted 34 lines · [Re: [oe] [meta-networking, meta-oe][PATCH 0/9] Move networking recipes to…
Quoted 23 lines · [Re: [oe] [meta-networking, meta-oe][PATCH 0/9] Move networking recipes to…
Quoted 1 line · On Tuesday 16 April 2013 13:30:29 Koen Kooi wrote:
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton
<[email protected]> het volgende geschreven:
Quoted 11 lines
Quoted 11 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 10 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \Quoted 8 lines
Quoted 4 lines
Quoted 1 line
With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
Quoted 8 lines
At some point I don't think this is going to be realistic - what happens if you have something in meta-oe that's too generic to be put elsewhere and yet has a dependency on something in meta-multimedia or meta-networking? It will come up at some point fairly soon.
I can drop the iw patch from this set for the sake of the rest of the patches if you object to moving it, but we do need to do something about this in the near future.
Quoted 8 lines
I'm way behind on my meta-networking stuff but finally getting caught up and I was wondering if we had run this one to ground. Martin's already merged in most of the other moves and I'm also fine with relocating iw, but I can see the argument in favour of keeping it in meta-oe. For now I'm also planning on merging a couple that didn't get picked up already:
f501ecadb6strongswan: move to meta-networkingcdf2bf5654vsftpd: move from meta-oe to meta-networking and tweak
Scratch the vsftpd one, it already appears to be merged as well. I'm not sure why I didn't see that on my initial scan.
-J.
Quoted 16 lines
I'll also pick up the iw one if there's a consensus that moving it is the right thing (or not a terrible thing) to do.
I think that addresses the full list of relocations from this thread.
-J.
Quoted 8 lines
For now, I did check and at the moment according to "bitbake-layers show- cross-depends" (thank you Robert) we have only vlc depending on fluidsynth which is in meta-multimedia, but vlc ought to be moved to meta-multimedia itself anyway.
Cheers,
Paul
Signature · 2 lines
-Joe MacDonald. :wq
Quoted 30 lines · Joe MacDonald
Quoted 28 lines · [Re: [oe] [meta-networking, meta-oe][PATCH 0/9] Move networking recipes to…
Quoted 1 line · On Tuesday 16 April 2013 13:30:29 Koen Kooi wrote:
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton
<[email protected]> het volgende geschreven:
Quoted 11 lines
Quoted 11 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 10 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \Quoted 8 lines
Quoted 4 lines
Quoted 1 line
With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
At some point I don't think this is going to be realistic - what happens if you have something in meta-oe that's too generic to be put elsewhere and yet has a dependency on something in meta-multimedia or meta-networking? It will come up at some point fairly soon.
Quoted 7 lines
Quoted 3 lines
I can drop the iw patch from this set for the sake of the rest of the patches if you object to moving it, but we do need to do something about this in the near future.
I'm way behind on my meta-networking stuff but finally getting caught up and I was wondering if we had run this one to ground. Martin's already merged in most of the other moves and I'm also fine with relocating iw,
I hope you don't mind I did merge them. I never merge changes which are only for layers with dedicated maintainer, but with this move overlapping both layers I took them as nice cleanup.
Quoted 8 lines
but I can see the argument in favour of keeping it in meta-oe. For now I'm also planning on merging a couple that didn't get picked up already:
f501ecadb6strongswan: move to meta-networkingcdf2bf5654vsftpd: move from meta-oe to meta-networking and tweakI'll also pick up the iw one if there's a consensus that moving it is the right thing (or not a terrible thing) to do.
I think the consensus is that iw needs to stay where it is unless stuff which references it is also moved or changed (that's why I haven't merged this one).
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 35 lines · [Re: [oe] [meta-networking, meta-oe][PATCH 0/9] Move networking recipes to…
Quoted 34 lines · Joe MacDonald
Quoted 31 lines · [Re: [oe] [meta-networking, meta-oe][PATCH 0/9] Move networking recipes to…
Quoted 1 line · On Tuesday 16 April 2013 13:30:29 Koen Kooi wrote:
Op 16 apr. 2013, om 13:19 heeft Paul Eggleton
<[email protected]> het volgende geschreven:
Quoted 11 lines
Quoted 11 lines · On Tuesday 16 April 2013 13:09:46 Koen Kooi wrote:
Quoted 10 lines
These look good to me, but
Quoted 1 line
iw: move to meta-networking and update
This is receferenced by a packagegroup in meta-oe:
meta-oe/recipes-core/packagegroups/packagegroup-basic.bb:
${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \Quoted 8 lines
Quoted 4 lines
Quoted 1 line
With the 'meta-oe shall only depend on oe-core' rule,
Are you sure nothing in meta-oe depends on anything in other layers within meta-openembedded already?
I can't say for certain, but Martin and I have been very strict about it in the past. If there are such external dependencies they should be looked at and fixed.
At some point I don't think this is going to be realistic - what happens if you have something in meta-oe that's too generic to be put elsewhere and yet has a dependency on something in meta-multimedia or meta-networking? It will come up at some point fairly soon.
I can drop the iw patch from this set for the sake of the rest of the patches if you object to moving it, but we do need to do something about this in the near future.
Quoted 7 lines
Quoted 3 lines
I'm way behind on my meta-networking stuff but finally getting caught up and I was wondering if we had run this one to ground. Martin's already merged in most of the other moves and I'm also fine with relocating iw,
I hope you don't mind I did merge them. I never merge changes which are only for layers with dedicated maintainer, but with this move overlapping both layers I took them as nice cleanup.
Not at all! I appreciated you picking them up for me.
Quoted 6 lines
Quoted 6 lines
but I can see the argument in favour of keeping it in meta-oe. For now I'm also planning on merging a couple that didn't get picked up already:
f501ecadb6strongswan: move to meta-networkingcdf2bf5654vsftpd: move from meta-oe to meta-networking and tweak
Quoted 6 lines
Quoted 2 lines
I'll also pick up the iw one if there's a consensus that moving it is the right thing (or not a terrible thing) to do.
I think the consensus is that iw needs to stay where it is unless stuff which references it is also moved or changed (that's why I haven't merged this one).
Sure, that makes sense. We'll leave iw where it is, then, and if it really makes sense to relocate it into meta-networking in the future, we'll take a wider view.
Thanks.
Signature · 2 lines
-Joe MacDonald. :wq