sync 8.09 branch with fixes from trunk

SVN-Revision: 12826

diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index aef4285d2807b7e792ad1e7035429ddb79fd02f1..05e0169b9e54f3892f9dce6e1d07753835573a2c 100644 (file)
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables
 PKG_VERSION:=2.0.8-2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
@@ -28,6 +28,11 @@ define Package/ebtables
   URL:=http://ebtables.sourceforge.net/
 endef
 
+define Package/ebtables-utils
+  $(call Package/ebtables)
+  TITLE:=ebtables save/restore utilities
+endef
+
 define Package/ebtables/description
        The ebtables program is a filtering tool for a bridging firewall. The
        filtering is focussed on the Link Layer Ethernet frame fields. Apart
@@ -35,6 +40,10 @@ define Package/ebtables/description
        addresses and implement a brouter.
 endef
 
+define Package/ebtables-utils/description
+       $(call Package/ebtables/description)
+endef
+
 MAKE_FLAGS += \
        CFLAGS="$(TARGET_CFLAGS)" \
        LIBDIR="/usr/lib/ebtables"
@@ -47,8 +56,12 @@ define Package/ebtables/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/extensions/*.so $(1)/usr/lib/ebtables/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/
+endef
+
+define Package/ebtables-utils/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-save $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-restore $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,ebtables))
+$(eval $(call BuildPackage,ebtables-utils))

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index e9d8a5c2cc15d6c47f4624360f5dd624e20c65bb..8f8af96b1ea8cf53d405a4cd074021716ab1fae9 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_MD5SUM:=62876f2179f316db0621cc33adf04c19
-PKG_BUILD_DEPENDS:=madwifi mac80211 libnl openssl
+PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi PACKAGE_kmod-mac80211:mac80211 PACKAGE_kmod-mac80211:libnl
 
 include $(INCLUDE_DIR)/package.mk
 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-mac80211 CONFIG_PACKAGE_kmod-madwifi CONFIG_PACKAGE_hostapd CONFIG_PACKAGE_hostapd-mini)
@@ -33,7 +33,7 @@ endef
 define Package/hostapd
 $(call Package/hostapd/Default)
   TITLE+= (full)
-  DEPENDS+= +libopenssl
+  DEPENDS+= +PACKAGE_hostapd:libopenssl
 endef
 
 #define Package/hostapd/conffiles

diff --git a/package/mtd/src/mtd.c b/package/mtd/src/mtd.c
index b180aecfb9433d452e8adb5b9e70489f4f780c06..3e84fd696e35b89c869d2f6bd27201686c73d7cf 100644 (file)
--- a/package/mtd/src/mtd.c
+++ b/package/mtd/src/mtd.c
@@ -138,7 +138,7 @@ int mtd_write_buffer(int fd, const char *buf, int offset, int length)
 static int
 image_check(int imagefd, const char *mtd)
 {
-       int ret = 0;
+       int ret = 1;
 #ifdef target_brcm
        ret = trx_check(imagefd, mtd, buf, &buflen);
 #endif

diff --git a/scripts/feeds b/scripts/feeds
index ab765b1ea38e20c8638bf6e3e35e87ff480cb9dc..8ec0799f70f6872cfcd85e7e37ec263c475e62ec 100755 (executable)
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -290,6 +290,7 @@ sub install_package {
        foreach my $vpkg (@{$srcpackage{$src}}, $pkg) {
                foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}) {
                        next if $dep =~ /@/;
+                       next if $dep =~ /:/;
                        $dep =~ s/^\+//;
                        install_package($feed, $dep) == 0 or $ret = 1;
                }

diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index bee30201217b09302c24f5c74bfdded29ae30b2f..e05cc92c426652e3bc344026a4e9cd408e1e102e 100755 (executable)
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -223,6 +223,7 @@ EOF
                        $flags = $1;
                        $name = $2;
 
+                       next if $name =~ /:/;
                        $flags =~ /-/ and $mode = "deselect";
                        $flags =~ /\+/ and $mode = "select";
                        $flags =~ /@/ and $confstr .= "\t$mode $name\n";
@@ -374,8 +375,13 @@ sub mconf_depends($$) {
                my $m = "depends";
                $depend =~ s/^([@\+]+)//;
                my $flags = $1;
+               my $condition;
                my $vdep;
 
+               if ($depend =~ /^(.+):(.+)$/) {
+                       $condition = $1;
+                       $depend = $2;
+               }
                if ($vdep = $package{$depend}->{vdepends}) {
                        $depend = join("||", map { "PACKAGE_".$_ } @$vdep);
                } else {
@@ -390,6 +396,7 @@ sub mconf_depends($$) {
                                next if $only_dep;
                        };
                        $flags =~ /@/ or $depend = "PACKAGE_$depend";
+                       $condition and $depend = "$depend if $condition";
                }
                $dep->{$depend} =~ /select/ or $dep->{$depend} = $m;
        }
@@ -535,6 +542,13 @@ sub gen_package_mk() {
                my $depline = "";
                foreach my $deps (@srcdeps) {
                        my $idx;
+                       my $condition;
+
+                       if ($deps =~ /^(.+):(.+)/) {
+                               $condition = $1;
+                               $deps = $2;
+                       }
+
                        my $pkg_dep = $package{$deps};
                        my @deps;
 
@@ -556,13 +570,20 @@ sub gen_package_mk() {
                                        next if $pkg->{src} eq $pkg_dep->{src};
                                        next if $dep{$pkg->{src}."->".$idx};
                                        next if $dep{$pkg->{src}."->($dep)".$idx};
+                                       my $depstr;
+
                                        if ($pkg_dep->{vdepends}) {
-                                               $depline .= " \$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
+                                               $depstr = "\$(if \$(CONFIG_PACKAGE_$dep),\$(curdir)/$idx/compile)";
                                                $dep{$pkg->{src}."->($dep)".$idx} = 1;
                                        } else {
-                                               $depline .= " \$(curdir)/$idx/compile";
+                                               $depstr = "\$(curdir)/$idx/compile";
                                                $dep{$pkg->{src}."->".$idx} = 1;
                                        }
+                                       if ($condition) {
+                                               $depline .= " \$(if \$(CONFIG_$condition),$depstr)";
+                                       } else {
+                                               $depline .= " $depstr";
+                                       }
                                }
                        }
                }