Merge branch 'master' of git://nbd.name/openwrt

dtaht · Jun 14, 2012 · 1c5faa1 · 1c5faa1
2 parents 49a63a5 + 69934f5
commit 1c5faa1
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 5 deletions.
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
@@ -144,6 +144,7 @@ ifeq ($(DUMP),)
 			fi; \
 		done; \
 	) | sort -u > $(PKG_INFO_DIR)/$(1).provides
+	$(if $(PROVIDES),@for pkg in $(PROVIDES); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$pkg.provides; done)
 	$(CheckDependencies)
 
 	$(RSTRIP) $$(IDIR_$(1))

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
@@ -80,9 +80,10 @@ define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 endef
 
-define Build/Compile
+define Build/Compile/Default
 
 endef
+Build/Compile = $(Build/Compile/Default)
 
 define Package/base-files/install
 	$(CP) ./files/* $(1)/

diff --git a/package/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 
 . $IPKG_INSTROOT/lib/functions.sh
 . $IPKG_INSTROOT/lib/functions/service.sh
@@ -75,6 +75,8 @@ $EXTRA_HELP
 EOF
 }
 
+${INIT_TRACE:+set -x}
+
 . "$initscript"
 
 ALL_COMMANDS="start stop reload restart boot shutdown enable disable enabled depends ${EXTRA_COMMANDS}"

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
@@ -107,7 +107,7 @@ endef
 
 define Package/ppp-mod-pptp
 $(call Package/ppp/Default)
-  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pptp +kmod-mppe
+  DEPENDS:=@(PACKAGE_ppp||PACKAGE_ppp-multilink) +kmod-pptp +kmod-mppe +resolveip
   TITLE:=PPtP plugin
 endef
 

diff --git a/scripts/gen-dependencies.sh b/scripts/gen-dependencies.sh
@@ -20,5 +20,5 @@ XARGS="${XARGS:-xargs -r}"
 find $TARGETS -type f -a -exec file {} \; | \
   sed -n -e 's/^\(.*\):.*ELF.*\(executable\|shared object\).*,.* stripped/\1/p' | \
   $XARGS -n1 readelf -d | \
-  awk '$2 ~ /NEEDED/ && $NF !~ /interpreter/ { gsub(/[\[\]]/, "", $NF); print $NF }' | \
+  awk '$2 ~ /NEEDED/ && $NF !~ /interpreter/ && $NF ~ /^\[?lib.*\.so/ { gsub(/[\[\]]/, "", $NF); print $NF }' | \
   sort -u
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
@@ -84,6 +84,8 @@ static void __init tl_mr11u_setup(void)
 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
 	u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
 
+	ath79_setup_ar933x_phy4_switch(false, true);
+
 	ath79_register_m25p80(&tl_mr11u_flash_data);
 	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr11u_leds_gpio),
 				 tl_mr11u_leds_gpio);
@@ -99,6 +101,7 @@ static void __init tl_mr11u_setup(void)
 
 	ath79_register_mdio(0, 0x0);
 	ath79_register_eth(0);
+	ath79_eth0_data.phy_mask = BIT(0);
 
 	ath79_register_wmac(ee, mac);
 }

diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/leds b/target/linux/kirkwood/base-files/etc/uci-defaults/leds
@@ -3,7 +3,7 @@
 # Copyright (C) 2012 OpenWrt.org
 #
 
-. /lib/fuctions/uci-defaults.sh
+. /lib/functions/uci-defaults.sh
 . /lib/kirkwood.sh
 
 hardware=$(kirkwood_hardware_name)