From bf6a924c262c59f08228229652e5d4c5cfe167d5 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 27 Dec 2013 13:50:20 +0100 Subject: [PATCH] meta-digi-dey: remove overlayed recipes crda, stunnel: meta-networking iw: meta-oe Signed-off-by: Javier Viguera --- .../recipes-connectivity/crda/crda_1.1.3.bb | 40 ------------------- .../files/0001-Make-crypto-optional.patch | 23 ----------- ...on-t-use-git-describe-for-versioning.patch | 40 ------------------- .../recipes-connectivity/iw/iw_3.8.bb | 27 ------------- .../recipes-connectivity/stunnel/files/init | 34 ---------------- .../stunnel/files/stunnel.conf | 6 --- .../stunnel/stunnel-4.56/automake.patch | 12 ------ .../recipes-connectivity/stunnel/stunnel.inc | 30 -------------- .../stunnel/stunnel_4.56.bb | 11 ----- 9 files changed, 223 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/crda/crda_1.1.3.bb delete mode 100644 meta-digi-dey/recipes-connectivity/crda/files/0001-Make-crypto-optional.patch delete mode 100644 meta-digi-dey/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch delete mode 100644 meta-digi-dey/recipes-connectivity/iw/iw_3.8.bb delete mode 100644 meta-digi-dey/recipes-connectivity/stunnel/files/init delete mode 100644 meta-digi-dey/recipes-connectivity/stunnel/files/stunnel.conf delete mode 100644 meta-digi-dey/recipes-connectivity/stunnel/stunnel-4.56/automake.patch delete mode 100644 meta-digi-dey/recipes-connectivity/stunnel/stunnel.inc delete mode 100644 meta-digi-dey/recipes-connectivity/stunnel/stunnel_4.56.bb diff --git a/meta-digi-dey/recipes-connectivity/crda/crda_1.1.3.bb b/meta-digi-dey/recipes-connectivity/crda/crda_1.1.3.bb deleted file mode 100644 index c1c62ef95..000000000 --- a/meta-digi-dey/recipes-connectivity/crda/crda_1.1.3.bb +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2013 Digi International. - -SUMMARY = "Wireless Central Regulatory Domain Agent" -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" -SECTION = "base" -PRIORITY = "optional" -LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" -LICENSE = "ISC" - -PR = "${DISTRO}.r0" - -DEPENDS = "libnl" - -REG_RELEASE_DATE = "2013.01.11" -SRC_URI = " \ - http://wireless.kernel.org/download/crda/${PN}-${PV}.tar.bz2;name=crda \ - http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/${REG_RELEASE_DATE}-regulatory.bin;name=reg \ - file://0001-Make-crypto-optional.patch \ -" - -SRC_URI[crda.md5sum] = "29579185e06a75675507527243d28e5c" -SRC_URI[crda.sha256sum] = "aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0" -SRC_URI[reg.md5sum] = "e0c8a5ca63fb8bf803213f9a0c90b50b" -SRC_URI[reg.sha256sum] = "b1ee0b20c123c612dfdb6851ab42c01666f66fb583e0e590942f19bb54cf84be" - -EXTRA_OEMAKE = "" -do_compile() { - oe_runmake all_noverify -} - -do_install() { - oe_runmake DESTDIR=${D} install - install -d ${D}${libdir}/crda - install -m 0644 ${WORKDIR}/${REG_RELEASE_DATE}-regulatory.bin ${D}${libdir}/crda/regulatory.bin -} - -FILES_${PN} += "\ - /lib/udev/rules.d/85-regulatory.rules \ - ${libdir}/crda/regulatory.bin \ - " diff --git a/meta-digi-dey/recipes-connectivity/crda/files/0001-Make-crypto-optional.patch b/meta-digi-dey/recipes-connectivity/crda/files/0001-Make-crypto-optional.patch deleted file mode 100644 index 1293e6532..000000000 --- a/meta-digi-dey/recipes-connectivity/crda/files/0001-Make-crypto-optional.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Alex Gonzalez -Date: Thu, 13 Dec 2012 11:34:01 +0100 -Subject: [PATCH] Make crypto optional. - -Signed-off-by: Alex Gonzalez ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index b8bc7d3..208ebbd 100644 ---- a/Makefile -+++ b/Makefile -@@ -35,7 +35,8 @@ LDLIBS += `pkg-config --libs openssl` - - reglib.o: keys-ssl.c - --else -+endif -+ifeq ($(USE_GCRYPT),1) - CFLAGS += -DUSE_GCRYPT - LDLIBS += -lgcrypt - diff --git a/meta-digi-dey/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta-digi-dey/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch deleted file mode 100644 index eaf72c0b9..000000000 --- a/meta-digi-dey/recipes-connectivity/iw/iw-3.8/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Koen Kooi -Date: Tue, 29 Nov 2011 17:03:27 +0100 -Subject: [PATCH] iw: version.sh: don't use git describe for versioning - -It will detect top-level git repositories like the Angstrom setup-scripts and break. - -Upstream-status: Unknown - -Signed-off-by: Koen Kooi ---- - version.sh | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/version.sh b/version.sh -index db02f0d..336ce2b 100755 ---- a/version.sh -+++ b/version.sh -@@ -3,21 +3,7 @@ - VERSION="3.8" - OUT="$1" - --if head=`git rev-parse --verify HEAD 2>/dev/null`; then -- git update-index --refresh --unmerged > /dev/null -- descr=$(git describe) -- -- # on git builds check that the version number above -- # is correct... -- [ "${descr%%-*}" = "v$VERSION" ] || exit 2 -- -- v="${descr#v}" -- if git diff-index --name-only HEAD | read dummy ; then -- v="$v"-dirty -- fi --else -- v="$VERSION" --fi -+v="$VERSION" - - echo '#include "iw.h"' > "$OUT" - echo "const char iw_version[] = \"$v\";" >> "$OUT" diff --git a/meta-digi-dey/recipes-connectivity/iw/iw_3.8.bb b/meta-digi-dey/recipes-connectivity/iw/iw_3.8.bb deleted file mode 100644 index 29dbcd07b..000000000 --- a/meta-digi-dey/recipes-connectivity/iw/iw_3.8.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2013 Digi International. - -SUMMARY = "nl80211 based CLI configuration utility for wireless devices" -DESCRIPTION = "iw is a new nl80211 based CLI configuration utility for \ -wireless devices. It supports almost all new drivers that have been added \ -to the kernel recently. " -HOMEPAGE = "http://linuxwireless.org/en/users/Documentation/iw" -SECTION = "base" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774" - -DEPENDS = "libnl pkgconfig" - -PR = "${DISTRO}.r0" - -SRC_URI = "http://www.kernel.org/pub/software/network/iw/iw-${PV}.tar.bz2 \ - file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \ - " - -SRC_URI[md5sum] = "618ad1106a196fb1c3d827de96da437c" -SRC_URI[sha256sum] = "3dae92ca5989cbc21155941fa01907a5536da3c5f6898642440c61484fc7e0f9" - -EXTRA_OEMAKE = "" - -do_install() { - oe_runmake DESTDIR=${D} install -} diff --git a/meta-digi-dey/recipes-connectivity/stunnel/files/init b/meta-digi-dey/recipes-connectivity/stunnel/files/init deleted file mode 100644 index 8f0a0139b..000000000 --- a/meta-digi-dey/recipes-connectivity/stunnel/files/init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -DAEMON=/usr/sbin/stunnel -NAME=stunnel -DESC="SSH Tunneling" -ARGS="" - -test -f $DAEMON || exit 0 - -set -e - -case "$1" in - start) - echo -n "* starting $DESC: $NAME... " - start-stop-daemon -S -x $DAEMON -- $ARGS - echo "done." - ;; - stop) - echo -n "* stopping $DESC: $NAME... " - start-stop-daemon -K -x $DAEMON - echo "done." - ;; - restart) - echo "* restarting $DESC: $NAME... " - $0 stop - $0 start - echo "done." - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-digi-dey/recipes-connectivity/stunnel/files/stunnel.conf b/meta-digi-dey/recipes-connectivity/stunnel/files/stunnel.conf deleted file mode 100644 index 0deb1a0f4..000000000 --- a/meta-digi-dey/recipes-connectivity/stunnel/files/stunnel.conf +++ /dev/null @@ -1,6 +0,0 @@ -key=/etc/certs/mtx.key -cert=/etc/certs/mtx.crt - -[https] -accept=443 -connect=80 diff --git a/meta-digi-dey/recipes-connectivity/stunnel/stunnel-4.56/automake.patch b/meta-digi-dey/recipes-connectivity/stunnel/stunnel-4.56/automake.patch deleted file mode 100644 index ea93933ab..000000000 --- a/meta-digi-dey/recipes-connectivity/stunnel/stunnel-4.56/automake.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: stunnel-4.09/Makefile.am -=================================================================== ---- stunnel-4.09.orig/Makefile.am 2004-10-10 01:37:15.000000000 -0400 -+++ stunnel-4.09/Makefile.am 2005-04-01 22:09:06.819735144 -0500 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = src doc tools -+SUBDIRS = src doc - - # extra_src = src/gui.c src/resources.rc src/stunnel.ico src/stunnel.exe - # extra_doc = doc/stunnel.pod doc/stunnel.8 doc/stunnel.html doc/en doc/pl diff --git a/meta-digi-dey/recipes-connectivity/stunnel/stunnel.inc b/meta-digi-dey/recipes-connectivity/stunnel/stunnel.inc deleted file mode 100644 index a71ea0476..000000000 --- a/meta-digi-dey/recipes-connectivity/stunnel/stunnel.inc +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2013 Digi International. - -DESCRIPTION = "Stunnel is a program that allows you to encrypt \ -arbitrary TCP connections inside SSL" -SECTION = "console/network" -DEPENDS = "openssl" -HOMEPAGE = "http://www.stunnel.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f41ebed8571077706fee0b860c4d6666" - -INC_PR = "r0" - -S = "${WORKDIR}/stunnel-${PV}" - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "stunnel" -INITSCRIPT_PARAMS = "defaults" - -EXTRA_OECONF = "--with-ssl=${STAGING_LIBDIR}/.. \ - --with-random=/dev/urandom \ - --with-ptmx \ - --without-ptc" - -do_install() { - autotools_do_install - install -d ${D}${sysconfdir}/stunnel ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/stunnel - install -m 644 ${WORKDIR}/stunnel.conf ${D}${sysconfdir}/stunnel -} diff --git a/meta-digi-dey/recipes-connectivity/stunnel/stunnel_4.56.bb b/meta-digi-dey/recipes-connectivity/stunnel/stunnel_4.56.bb deleted file mode 100644 index f4013b0df..000000000 --- a/meta-digi-dey/recipes-connectivity/stunnel/stunnel_4.56.bb +++ /dev/null @@ -1,11 +0,0 @@ -require stunnel.inc - -PR = "${DISTRO}.${INC_PR}.0" - -SRC_URI = "http://www.stunnel.org/downloads/stunnel-${PV}.tar.gz \ - file://automake.patch \ - file://init \ - file://stunnel.conf" - -SRC_URI[md5sum] = "ac4c4a30bd7a55b6687cbd62d864054c" -SRC_URI[sha256sum] = "9cae2cfbe26d87443398ce50d7d5db54e5ea363889d5d2ec8d2778a01c871293"