* [Buildroot] [PATCH 1/2] iw: bump to 3.2
2011-11-09 14:57 [Buildroot] Updates for -next yegorslists at googlemail.com
@ 2011-11-09 14:57 ` yegorslists at googlemail.com
2011-11-09 15:26 ` Gustavo Zacarias
2011-11-11 20:39 ` Peter Korsgaard
2011-11-09 14:57 ` [Buildroot] [PATCH 2/2] usbmount: bump to 0.0.22 yegorslists at googlemail.com
1 sibling, 2 replies; 6+ messages in thread
From: yegorslists at googlemail.com @ 2011-11-09 14:57 UTC (permalink / raw)
To: buildroot
From: Yegor Yefremov <yegorslists@googlemail.com>
version 3.2 provides support for libnl 3.x, so remove the relevant patch
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
package/iw/iw-libnl-30-support.patch | 47 ----------------------------------
package/iw/iw.mk | 2 +-
2 files changed, 1 insertions(+), 48 deletions(-)
delete mode 100644 package/iw/iw-libnl-30-support.patch
diff --git a/package/iw/iw-libnl-30-support.patch b/package/iw/iw-libnl-30-support.patch
deleted file mode 100644
index 48a179f..0000000
--- a/package/iw/iw-libnl-30-support.patch
+++ /dev/null
@@ -1,47 +0,0 @@
----
- Makefile | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -24,6 +24,7 @@
-
- NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
- NL2FOUND := $(shell $(PKG_CONFIG) --atleast-version=2 libnl-2.0 && echo Y)
-+NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
-
- ifeq ($(NL1FOUND),Y)
- NLLIBNAME = libnl-1
-@@ -35,6 +36,12 @@
- NLLIBNAME = libnl-2.0
- endif
-
-+ifeq ($(NL3FOUND),Y)
-+CFLAGS += -DCONFIG_LIBNL20
-+LIBS += -lnl-genl
-+NLLIBNAME = libnl-3.0
-+endif
-+
- ifeq ($(NLLIBNAME),)
- $(error Cannot find development files for any supported version of libnl)
- endif
-@@ -53,6 +60,8 @@
- all: version_check $(ALL)
-
- version_check:
-+ifeq ($(NL3FOUND),Y)
-+else
- ifeq ($(NL2FOUND),Y)
- else
- ifeq ($(NL1FOUND),Y)
-@@ -60,6 +69,7 @@
- $(error No libnl found)
- endif
- endif
-+endif
-
-
- VERSION_OBJS := $(filter-out version.o, $(OBJS))
-
diff --git a/package/iw/iw.mk b/package/iw/iw.mk
index 9f1d65f..ab6c676 100644
--- a/package/iw/iw.mk
+++ b/package/iw/iw.mk
@@ -4,7 +4,7 @@
#
#############################################################
-IW_VERSION = 3.1
+IW_VERSION = 3.2
IW_SOURCE = iw-$(IW_VERSION).tar.bz2
IW_SITE = http://wireless.kernel.org/download/iw
IW_DEPENDENCIES = host-pkg-config libnl
--
1.7.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] usbmount: bump to 0.0.22
2011-11-09 14:57 [Buildroot] Updates for -next yegorslists at googlemail.com
2011-11-09 14:57 ` [Buildroot] [PATCH 1/2] iw: bump to 3.2 yegorslists at googlemail.com
@ 2011-11-09 14:57 ` yegorslists at googlemail.com
2011-11-11 20:39 ` Peter Korsgaard
1 sibling, 1 reply; 6+ messages in thread
From: yegorslists at googlemail.com @ 2011-11-09 14:57 UTC (permalink / raw)
To: buildroot
From: Yegor Yefremov <yegorslists@googlemail.com>
FSTYPE detection bug was fixed upstream, so delete relevant patch
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
.../usbmount/usbmount-fstype-detection-fix.patch | 25 --------------------
package/usbmount/usbmount.mk | 2 +-
2 files changed, 1 insertions(+), 26 deletions(-)
delete mode 100644 package/usbmount/usbmount-fstype-detection-fix.patch
diff --git a/package/usbmount/usbmount-fstype-detection-fix.patch b/package/usbmount/usbmount-fstype-detection-fix.patch
deleted file mode 100644
index a3686f1..0000000
--- a/package/usbmount/usbmount-fstype-detection-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-newer blkid version shows two parameter with TYPE within:
-
-/dev/sda1: VERSION="0.0" TYPE="ext2" USAGE="filesystem" PART_ENTRY_SCHEME="dos"
-PART_ENTRY_TYPE="0xc" PART_ENTRY_FLAGS="0x80" PART_ENTRY_NUMBER="1"
-
-change regular expression to take " TYPE" only
-
-Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
----
- usbmount | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/usbmount
-===================================================================
---- a/usbmount
-+++ b/usbmount
-@@ -88,7 +88,7 @@
- # FIXME: improvement: implement mounting by label (notice that labels
- # can contain spaces, which makes things a little bit less comfortable).
- DEVINFO=$(/sbin/blkid -p $DEVNAME)
-- FSTYPE=$(echo "$DEVINFO" | sed 's/.*TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-+ FSTYPE=$(echo "$DEVINFO" | sed 's/.* TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
- UUID=$(echo "$DEVINFO" | sed 's/.*UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
- USAGE=$(echo "$DEVINFO" | sed 's/.*USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;')
-
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index 8434570..a6b2d43 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -3,7 +3,7 @@
# usbmount
#
#############################################################
-USBMOUNT_VERSION = 0.0.21
+USBMOUNT_VERSION = 0.0.22
USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
USBMOUNT_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/u/usbmount
USBMOUNT_DEPENDENCIES = udev lockfile-progs util-linux
--
1.7.1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread