* [PATCH 1/5] iw: add recipe from meta-networking
2015-08-27 18:48 [PATCH 0/5] Add 'iw' recipe and include in packagegroup-base Christopher Larson
@ 2015-08-27 18:48 ` Christopher Larson
2015-08-27 18:48 ` [PATCH 2/5] iw: inherit pkgconfig Christopher Larson
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Christopher Larson @ 2015-08-27 18:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
iw uses cfg80211/nl80211, which is the way of the future. wireless-tools uses
WEXT, which uses ioctl, which is in deep maintenance mode. See
http://wireless.kernel.org/en/developers/Documentation/Wireless-Extensions.
Also https://wireless.wiki.kernel.org/en/users/Documentation/iw indicates "The
old tool iwconfing, which uses Wireless Extensions interface, is deprecated
and it's strongly recommended to switch to iw and nl80211."
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
....sh-don-t-use-git-describe-for-versioning.patch | 43 ++++++++++++++++++++++
meta/recipes-connectivity/iw/iw_4.1.bb | 23 ++++++++++++
2 files changed, 66 insertions(+)
create mode 100644 meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
create mode 100644 meta/recipes-connectivity/iw/iw_4.1.bb
diff --git a/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch b/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
new file mode 100644
index 0000000..e64dd0a
--- /dev/null
+++ b/meta/recipes-connectivity/iw/iw/0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch
@@ -0,0 +1,43 @@
+From 5310abba864cfe3a8b65af130729447604190b29 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+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 <koen@dominion.thruhere.net>
+---
+ version.sh | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/version.sh b/version.sh
+index 11d124b..5d423c4 100755
+--- a/version.sh
++++ b/version.sh
+@@ -3,21 +3,7 @@
+ VERSION="3.15"
+ OUT="$1"
+
+-if [ -d .git ] && 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"
+--
+1.7.7.3
diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb b/meta/recipes-connectivity/iw/iw_4.1.bb
new file mode 100644
index 0000000..e1e7c12e
--- /dev/null
+++ b/meta/recipes-connectivity/iw/iw_4.1.bb
@@ -0,0 +1,23 @@
+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://wireless.kernel.org/en/users/Documentation/iw"
+SECTION = "base"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
+
+DEPENDS = "libnl pkgconfig"
+
+SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
+ file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
+"
+
+SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7"
+SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9c8f33d"
+
+EXTRA_OEMAKE = ""
+
+do_install() {
+ oe_runmake DESTDIR=${D} install
+}
--
2.2.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/5] iw: inherit pkgconfig
2015-08-27 18:48 [PATCH 0/5] Add 'iw' recipe and include in packagegroup-base Christopher Larson
2015-08-27 18:48 ` [PATCH 1/5] iw: add recipe from meta-networking Christopher Larson
@ 2015-08-27 18:48 ` Christopher Larson
2015-08-27 18:48 ` [PATCH 3/5] iw: obey our target path variables Christopher Larson
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Christopher Larson @ 2015-08-27 18:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
We want the dep on pkgconfig-native, not pkgconfig, and the convention is to
inherit pkgconfig when running pkg-config at build time.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-connectivity/iw/iw_4.1.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb b/meta/recipes-connectivity/iw/iw_4.1.bb
index e1e7c12e..556af2b 100644
--- a/meta/recipes-connectivity/iw/iw_4.1.bb
+++ b/meta/recipes-connectivity/iw/iw_4.1.bb
@@ -7,7 +7,7 @@ SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
-DEPENDS = "libnl pkgconfig"
+DEPENDS = "libnl"
SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
@@ -16,6 +16,8 @@ SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7"
SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9c8f33d"
+inherit pkgconfig
+
EXTRA_OEMAKE = ""
do_install() {
--
2.2.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/5] iw: obey our target path variables
2015-08-27 18:48 [PATCH 0/5] Add 'iw' recipe and include in packagegroup-base Christopher Larson
2015-08-27 18:48 ` [PATCH 1/5] iw: add recipe from meta-networking Christopher Larson
2015-08-27 18:48 ` [PATCH 2/5] iw: inherit pkgconfig Christopher Larson
@ 2015-08-27 18:48 ` Christopher Larson
2015-08-27 18:48 ` [PATCH 4/5] iw: support and enable separate build dir Christopher Larson
2015-08-27 18:48 ` [PATCH 5/5] packagegroup-base: pull in iw as well as wireless-tools Christopher Larson
4 siblings, 0 replies; 10+ messages in thread
From: Christopher Larson @ 2015-08-27 18:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-connectivity/iw/iw_4.1.bb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb b/meta/recipes-connectivity/iw/iw_4.1.bb
index 556af2b..8e27862 100644
--- a/meta/recipes-connectivity/iw/iw_4.1.bb
+++ b/meta/recipes-connectivity/iw/iw_4.1.bb
@@ -18,8 +18,12 @@ SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9
inherit pkgconfig
-EXTRA_OEMAKE = ""
+EXTRA_OEMAKE = "\
+ 'PREFIX=${prefix}' \
+ 'SBINDIR=${sbindir}' \
+ 'MANDIR=${mandir}' \
+"
do_install() {
- oe_runmake DESTDIR=${D} install
+ oe_runmake 'DESTDIR=${D}' install
}
--
2.2.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/5] iw: support and enable separate build dir
2015-08-27 18:48 [PATCH 0/5] Add 'iw' recipe and include in packagegroup-base Christopher Larson
` (2 preceding siblings ...)
2015-08-27 18:48 ` [PATCH 3/5] iw: obey our target path variables Christopher Larson
@ 2015-08-27 18:48 ` Christopher Larson
2015-08-28 7:38 ` Jussi Kukkonen
2015-08-27 18:48 ` [PATCH 5/5] packagegroup-base: pull in iw as well as wireless-tools Christopher Larson
4 siblings, 1 reply; 10+ messages in thread
From: Christopher Larson @ 2015-08-27 18:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
.../iw/iw/separate-objdir.patch | 55 ++++++++++++++++++++++
meta/recipes-connectivity/iw/iw_4.1.bb | 4 ++
2 files changed, 59 insertions(+)
create mode 100644 meta/recipes-connectivity/iw/iw/separate-objdir.patch
diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
new file mode 100644
index 0000000..e29e461
--- /dev/null
+++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
@@ -0,0 +1,55 @@
+From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001
+From: Christopher Larson <chris_larson@mentor.com>
+Date: Wed, 26 Aug 2015 17:23:48 -0700
+Subject: [PATCH] Support separation of SRCDIR and OBJDIR
+
+Typical use of VPATH to locate the sources.
+
+Signed-off-by: Christopher Larson <chris_larson@mentor.com>
+
+---
+ Makefile | 7 +++++--
+ version.sh | 2 +-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 548591a..da8d33a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,8 @@
+ MAKEFLAGS += --no-print-directory
+
++SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
++OBJDIR ?= $(PWD)
++VPATH = $(SRCDIR)
+ PREFIX ?= /usr
+ SBINDIR ?= $(PREFIX)/sbin
+ MANDIR ?= $(PREFIX)/share/man
+@@ -95,11 +98,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS))
+ version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefile \
+ $(wildcard .git/index .git/refs/tags)
+ @$(NQ) ' GEN ' $@
+- $(Q)./version.sh $@
++ $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@
+
+ %.o: %.c iw.h nl80211.h
+ @$(NQ) ' CC ' $@
+- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
++ $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) -c -o $@ $<
+
+ ifeq ($(IW_ANDROID_BUILD),)
+ iw: $(OBJS)
+diff --git a/version.sh b/version.sh
+index 5354383..fa954cf 100755
+--- a/version.sh
++++ b/version.sh
+@@ -5,5 +5,5 @@ OUT="$1"
+
+ v="$VERSION"
+
+-echo '#include "iw.h"' > "$OUT"
++echo '#include <iw.h>' > "$OUT"
+ echo "const char iw_version[] = \"$v\";" >> "$OUT"
+--
+2.2.1
+
diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb b/meta/recipes-connectivity/iw/iw_4.1.bb
index 8e27862..fafb0e3 100644
--- a/meta/recipes-connectivity/iw/iw_4.1.bb
+++ b/meta/recipes-connectivity/iw/iw_4.1.bb
@@ -11,6 +11,7 @@ DEPENDS = "libnl"
SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
+ file://separate-objdir.patch \
"
SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7"
@@ -19,10 +20,13 @@ SRC_URI[sha256sum] = "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9
inherit pkgconfig
EXTRA_OEMAKE = "\
+ -f '${S}/Makefile' \
+ \
'PREFIX=${prefix}' \
'SBINDIR=${sbindir}' \
'MANDIR=${mandir}' \
"
+B = "${WORKDIR}/build"
do_install() {
oe_runmake 'DESTDIR=${D}' install
--
2.2.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 4/5] iw: support and enable separate build dir
2015-08-27 18:48 ` [PATCH 4/5] iw: support and enable separate build dir Christopher Larson
@ 2015-08-28 7:38 ` Jussi Kukkonen
2015-08-28 15:43 ` Christopher Larson
0 siblings, 1 reply; 10+ messages in thread
From: Jussi Kukkonen @ 2015-08-28 7:38 UTC (permalink / raw)
To: Christopher Larson
Cc: Christopher Larson,
Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3641 bytes --]
On 27 August 2015 at 21:48, Christopher Larson <kergoth@gmail.com> wrote:
> From: Christopher Larson <chris_larson@mentor.com>
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
> .../iw/iw/separate-objdir.patch | 55
> ++++++++++++++++++++++
> meta/recipes-connectivity/iw/iw_4.1.bb | 4 ++
> 2 files changed, 59 insertions(+)
> create mode 100644 meta/recipes-connectivity/iw/iw/separate-objdir.patch
>
> diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch
> b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
> new file mode 100644
> index 0000000..e29e461
> --- /dev/null
> +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
> @@ -0,0 +1,55 @@
> +From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001
> +From: Christopher Larson <chris_larson@mentor.com>
> +Date: Wed, 26 Aug 2015 17:23:48 -0700
> +Subject: [PATCH] Support separation of SRCDIR and OBJDIR
> +
> +Typical use of VPATH to locate the sources.
> +
> +Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> +
>
Upstream-Status ?
- Jussi
+---
> + Makefile | 7 +++++--
> + version.sh | 2 +-
> + 2 files changed, 6 insertions(+), 3 deletions(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 548591a..da8d33a 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -1,5 +1,8 @@
> + MAKEFLAGS += --no-print-directory
> +
> ++SRCDIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
> ++OBJDIR ?= $(PWD)
> ++VPATH = $(SRCDIR)
> + PREFIX ?= /usr
> + SBINDIR ?= $(PREFIX)/sbin
> + MANDIR ?= $(PREFIX)/share/man
> +@@ -95,11 +98,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS))
> + version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h
> Makefile \
> + $(wildcard .git/index .git/refs/tags)
> + @$(NQ) ' GEN ' $@
> +- $(Q)./version.sh $@
> ++ $(Q)cd $(SRCDIR) && ./version.sh $(OBJDIR)/$@
> +
> + %.o: %.c iw.h nl80211.h
> + @$(NQ) ' CC ' $@
> +- $(Q)$(CC) $(CFLAGS) -c -o $@ $<
> ++ $(Q)$(CC) -I$(SRCDIR) $(CFLAGS) -c -o $@ $<
> +
> + ifeq ($(IW_ANDROID_BUILD),)
> + iw: $(OBJS)
> +diff --git a/version.sh b/version.sh
> +index 5354383..fa954cf 100755
> +--- a/version.sh
> ++++ b/version.sh
> +@@ -5,5 +5,5 @@ OUT="$1"
> +
> + v="$VERSION"
> +
> +-echo '#include "iw.h"' > "$OUT"
> ++echo '#include <iw.h>' > "$OUT"
> + echo "const char iw_version[] = \"$v\";" >> "$OUT"
> +--
> +2.2.1
> +
> diff --git a/meta/recipes-connectivity/iw/iw_4.1.bb
> b/meta/recipes-connectivity/iw/iw_4.1.bb
> index 8e27862..fafb0e3 100644
> --- a/meta/recipes-connectivity/iw/iw_4.1.bb
> +++ b/meta/recipes-connectivity/iw/iw_4.1.bb
> @@ -11,6 +11,7 @@ DEPENDS = "libnl"
>
> SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
>
> file://0001-iw-version.sh-don-t-use-git-describe-for-versioning.patch \
> + file://separate-objdir.patch \
> "
>
> SRC_URI[md5sum] = "68c282285c71c956069957e9ca10a6a7"
> @@ -19,10 +20,13 @@ SRC_URI[sha256sum] =
> "14bfc627b37f7f607e4ffa63a70ded15fa2ea85177f703cb17d7fe36f9
> inherit pkgconfig
>
> EXTRA_OEMAKE = "\
> + -f '${S}/Makefile' \
> + \
> 'PREFIX=${prefix}' \
> 'SBINDIR=${sbindir}' \
> 'MANDIR=${mandir}' \
> "
> +B = "${WORKDIR}/build"
>
> do_install() {
> oe_runmake 'DESTDIR=${D}' install
> --
> 2.2.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 5495 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 4/5] iw: support and enable separate build dir
2015-08-28 7:38 ` Jussi Kukkonen
@ 2015-08-28 15:43 ` Christopher Larson
0 siblings, 0 replies; 10+ messages in thread
From: Christopher Larson @ 2015-08-28 15:43 UTC (permalink / raw)
To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]
On Fri, Aug 28, 2015 at 12:38 AM, Jussi Kukkonen <jussi.kukkonen@intel.com>
wrote:
> On 27 August 2015 at 21:48, Christopher Larson <kergoth@gmail.com> wrote:
>
>> From: Christopher Larson <chris_larson@mentor.com>
>>
>> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>> ---
>> .../iw/iw/separate-objdir.patch | 55
>> ++++++++++++++++++++++
>> meta/recipes-connectivity/iw/iw_4.1.bb | 4 ++
>> 2 files changed, 59 insertions(+)
>> create mode 100644 meta/recipes-connectivity/iw/iw/separate-objdir.patch
>>
>> diff --git a/meta/recipes-connectivity/iw/iw/separate-objdir.patch
>> b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
>> new file mode 100644
>> index 0000000..e29e461
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/iw/iw/separate-objdir.patch
>> @@ -0,0 +1,55 @@
>> +From 9e27fc2e1b3dc8c36ef6a502edffc3a3d84d9dd9 Mon Sep 17 00:00:00 2001
>> +From: Christopher Larson <chris_larson@mentor.com>
>> +Date: Wed, 26 Aug 2015 17:23:48 -0700
>> +Subject: [PATCH] Support separation of SRCDIR and OBJDIR
>> +
>> +Typical use of VPATH to locate the sources.
>> +
>> +Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>> +
>>
>
> Upstream-Status ?
>
Ah, oops, thanks, will re-submit.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 2417 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 5/5] packagegroup-base: pull in iw as well as wireless-tools
2015-08-27 18:48 [PATCH 0/5] Add 'iw' recipe and include in packagegroup-base Christopher Larson
` (3 preceding siblings ...)
2015-08-27 18:48 ` [PATCH 4/5] iw: support and enable separate build dir Christopher Larson
@ 2015-08-27 18:48 ` Christopher Larson
2015-08-28 5:50 ` Khem Raj
4 siblings, 1 reply; 10+ messages in thread
From: Christopher Larson @ 2015-08-27 18:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Christopher Larson
From: Christopher Larson <chris_larson@mentor.com>
As was discussed in the commit which adds iw:
iw uses cfg80211/nl80211, which is the way of the future. wireless-tools uses
WEXT, which uses ioctl, which is in deep maintenance mode. See
http://wireless.kernel.org/en/developers/Documentation/Wireless-Extensions.
Also https://wireless.wiki.kernel.org/en/users/Documentation/iw indicates "The
old tool iwconfing, which uses Wireless Extensions interface, is deprecated
and it's strongly recommended to switch to iw and nl80211."
wireless-tools is kept as well for now for compatibility reasons, until we
have verified that all the network configuration mechanisms are using iw.
This adds VIRTUAL-RUNTIME_wireless-tools as a distro convenience.
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/conf/distro/include/default-providers.inc | 1 +
meta/recipes-core/packagegroups/packagegroup-base.bb | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 8d92c2e..9f84d5c 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
VIRTUAL-RUNTIME_apm ?= "apm"
VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
+VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools"
#
# Default recipe providers
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 262d65f..c5530aa 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -48,6 +48,10 @@ PACKAGES = ' \
# Override by distro if needed
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
+# Override by distro if needed. iw is the future, but wireless-tools is kept
+# for now as well for compatibility.
+VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools"
+
#
# packagegroup-base contain stuff needed for base system (machine related)
#
@@ -292,7 +296,7 @@ RRECOMMENDS_packagegroup-base-ipsec = "\
#
SUMMARY_packagegroup-base-wifi = "WiFi support"
RDEPENDS_packagegroup-base-wifi = "\
- wireless-tools \
+ ${VIRTUAL-RUNTIME_wireless-tools} \
${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
wpa-supplicant"
--
2.2.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 5/5] packagegroup-base: pull in iw as well as wireless-tools
2015-08-27 18:48 ` [PATCH 5/5] packagegroup-base: pull in iw as well as wireless-tools Christopher Larson
@ 2015-08-28 5:50 ` Khem Raj
2015-08-28 15:44 ` Christopher Larson
0 siblings, 1 reply; 10+ messages in thread
From: Khem Raj @ 2015-08-28 5:50 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3082 bytes --]
> On Aug 27, 2015, at 11:48 AM, Christopher Larson <kergoth@gmail.com> wrote:
>
> From: Christopher Larson <chris_larson@mentor.com>
>
> As was discussed in the commit which adds iw:
>
> iw uses cfg80211/nl80211, which is the way of the future. wireless-tools uses
> WEXT, which uses ioctl, which is in deep maintenance mode. See
> http://wireless.kernel.org/en/developers/Documentation/Wireless-Extensions.
> Also https://wireless.wiki.kernel.org/en/users/Documentation/iw indicates "The
> old tool iwconfing, which uses Wireless Extensions interface, is deprecated
> and it's strongly recommended to switch to iw and nl80211."
>
> wireless-tools is kept as well for now for compatibility reasons, until we
> have verified that all the network configuration mechanisms are using iw.
>
> This adds VIRTUAL-RUNTIME_wireless-tools as a distro convenience.
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
> meta/conf/distro/include/default-providers.inc | 1 +
> meta/recipes-core/packagegroups/packagegroup-base.bb | 6 +++++-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
> index 8d92c2e..9f84d5c 100644
> --- a/meta/conf/distro/include/default-providers.inc
> +++ b/meta/conf/distro/include/default-providers.inc
> @@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
> VIRTUAL-RUNTIME_apm ?= "apm"
> VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
> VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
> +VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools"
>
> #
> # Default recipe providers
> diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
> index 262d65f..c5530aa 100644
> --- a/meta/recipes-core/packagegroups/packagegroup-base.bb
> +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
> @@ -48,6 +48,10 @@ PACKAGES = ' \
> # Override by distro if needed
> VIRTUAL-RUNTIME_keymaps ?= "keymaps"
>
> +# Override by distro if needed. iw is the future, but wireless-tools is kept
> +# for now as well for compatibility.
> +VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools”
wouldn’t the define from default-providers.inc be enough ?
> +
> #
> # packagegroup-base contain stuff needed for base system (machine related)
> #
> @@ -292,7 +296,7 @@ RRECOMMENDS_packagegroup-base-ipsec = "\
> #
> SUMMARY_packagegroup-base-wifi = "WiFi support"
> RDEPENDS_packagegroup-base-wifi = "\
> - wireless-tools \
> + ${VIRTUAL-RUNTIME_wireless-tools} \
> ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
> ${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
> wpa-supplicant"
> --
> 2.2.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 5/5] packagegroup-base: pull in iw as well as wireless-tools
2015-08-28 5:50 ` Khem Raj
@ 2015-08-28 15:44 ` Christopher Larson
0 siblings, 0 replies; 10+ messages in thread
From: Christopher Larson @ 2015-08-28 15:44 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
On Thu, Aug 27, 2015 at 10:50 PM, Khem Raj <raj.khem@gmail.com> wrote:
> > +VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools”
>
> wouldn’t the define from default-providers.inc be enough ?
>
Yeah, I guess I'm just paranoid and like to avoid the implicit dependency,
but duplicating the value isn't ideal either. I'll remove the dupe when I
re-submit to fix the missing Upstream-Status. Thanks.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1006 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread