Merge pull request #18 from ericpaulbishop/master

Bring Lantis:master up to date

build.sh

@@ -29,7 +29,7 @@ set_version_variables()
 	# set precise commit in repo to use 
 	# you can set this to an alternate commit 
 	# or empty to checkout latest 
-	openwrt_commit="a03a846c49c067048cd225d476a7adf91ef8ff03"
+	openwrt_commit="64e116779c0f7da6d98068b8e7c50f528c8a91f2"
 	openwrt_abbrev_commit=$( echo "$openwrt_commit" | cut -b 1-7 )
 
 

package/gargoyle/files/www/basic.sh

@@ -60,6 +60,7 @@
 	fi
 
 	cdcif=$(egrep -Hi "(cdc ethernet control|rndis communications control)" /sys/class/net/*/device/interface 2>/dev/null | cut -f5 -d/)
+	[ -z "$cdcif" ] && cdcif=$(ls -l /sys/class/net/*/device/driver | grep cdc_ether | sed 's!.*/sys/class/net/\(.*\)/device/.*!\1!')
 	if [ -z "$cdcif" ]; then
 		echo "cdcif = \"\";"
 	else

patches-generic/004-fix_postinst_prerm_scripts.patch

@@ -1,30 +1,14 @@
---- a/include/package-ipkg.mk	2015-09-26 14:19:37.033770560 -0400
-+++ b/include/package-ipkg.mk	2015-09-28 13:24:46.531803517 -0400
-@@ -197,12 +197,12 @@
- 			echo "#!/bin/sh"; \
- 			echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \
- 			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
--			echo "default_postinst \$$$$0 \$$$$@"; \
-+			echo "default_postinst \"\$$$$0\" \$$$$@"; \
- 		) > postinst; \
- 		( \
- 			echo "#!/bin/sh"; \
- 			echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \
--			echo "default_prerm \$$$$0 \$$$$@"; \
-+			echo "default_prerm \"\$$$$0\" \$$$$@"; \
- 		) > prerm; \
- 		chmod 0755 postinst prerm; \
- 		$($(1)_COMMANDS) \
---- a/package/base-files/files/lib/functions.sh	2016-03-04 12:12:00.606479043 -0500
-+++ b/package/base-files/files/lib/functions.sh	2016-03-04 12:11:10.931304343 -0500
-@@ -164,19 +164,40 @@
+--- cc-src/package/base-files/files/lib/functions.sh	2016-04-26 16:36:20.837463952 -0400
++++ ar71xx-src/package/base-files/files/lib/functions.sh	2016-04-26 16:35:10.288889437 -0400
+@@ -164,20 +164,36 @@
  }
 
  default_prerm() {
 -	local name
 -	name=$(basename ${1%.*})
 -	[ -f /usr/lib/opkg/info/${name}.prerm-pkg ] && . /usr/lib/opkg/info/${name}.prerm-pkg
 -	for i in `cat /usr/lib/opkg/info/${name}.list | grep "^/etc/init.d/"`; do
++
 +	local pkg_prerm pkg_list
 +	pkg_prerm="${1}-pkg"
 +	pkg_list=$( echo "${1}" | sed 's/prerm$/list/g')
@@ -35,15 +19,10 @@
  	done
  }
 
-+
-+
-+
  default_postinst() {
--	local pkgname rusers
-+
-+	local pkgname pkg_postinst pkg_control pkg_list rusers
-+
-+
+-	local pkgname rusers ret
++	local pkgname pkg_postinst pkg_control pkg_list rusers ret
+ 	ret=0
  	pkgname=$(basename ${1%.*})
 -	rusers=$(grep "Require-User:" ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.control)
 +
@@ -58,22 +37,27 @@
 +	
 +	rusers=$(grep "Require-User:" "${pkg_control}")
 +	
-+	[ -f "$pkg_postinst" ] &&  . "$pkg_postinst" 
-+	
-+	
++
++
++
  	[ -n "$rusers" ] && {
  		local user group uid gid
  		for a in $(echo $rusers | sed "s/Require-User://g"); do
-@@ -215,10 +236,9 @@
+@@ -216,13 +232,14 @@
  		done
  	}
 
--	[ -f ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.postinst-pkg ] && ( . ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.postinst-pkg )
+-	if [ -f ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.postinst-pkg ]; then
+-		( . ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.postinst-pkg )
++	if [ -f "$pkg_postinst" ]; then
++		( . "$pkg_postinst" )
+ 		ret=$?
+ 	fi
++
  	[ -n "${IPKG_INSTROOT}" ] || rm -f /tmp/luci-indexcache 2>/dev/null
 
 -	[ "$PKG_UPGRADE" = "1" ] || for i in `cat ${IPKG_INSTROOT}/usr/lib/opkg/info/${pkgname}.list | grep "^/etc/init.d/"`; do
 +	[ "$PKG_UPGRADE" = "1" ] || for i in `cat "$pkg_list" | grep "^/etc/init.d/"`; do
  		[ -n "${IPKG_INSTROOT}" ] && $(which bash) ${IPKG_INSTROOT}/etc/rc.common ${IPKG_INSTROOT}$i enable; \
  		[ -n "${IPKG_INSTROOT}" ] || {
  			$i enable
-