# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1526925753 -7200
# Node ID 564f7f9745bd1e229a10b7fc269d5dd90c9aa28c
# Parent  c1a747d0e7781f2e2d18ef0634a38277511a6f50
linux: aufs source comes from linux-aufs

diff -r c1a747d0e778 -r 564f7f9745bd broadcom-wl/receipt
--- a/broadcom-wl/receipt	Mon May 21 13:39:00 2018 -0400
+++ b/broadcom-wl/receipt	Mon May 21 20:02:33 2018 +0200
@@ -20,7 +20,8 @@
 	sed -i 's|ndo_set_multicast_list|ndo_set_rx_mode|' src/wl/sys/wl_linux.c
 	sed -i 's|linux/autoconf.h|generated/autoconf.h|' src/include/linuxver.h
 	for i in semaphore 3.4.0 3.6.0 3.8.0 3.9.0 3.14.0 ; do
-		patch -Np1 -i $stuff/$i.patch
+		echo "patch $i ..."
+		patch -Np2 -i $stuff/$i.patch
 	done
 	KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`
 	xz wl.ko
diff -r c1a747d0e778 -r 564f7f9745bd broadcom-wl/stuff/3.14.0.patch
--- a/broadcom-wl/stuff/3.14.0.patch	Mon May 21 13:39:00 2018 -0400
+++ b/broadcom-wl/stuff/3.14.0.patch	Mon May 21 20:02:33 2018 +0200
@@ -1,5 +1,5 @@
---- src/wl/sys/wl_linux.c
-+++ src/wl/sys/wl_linux.c
+--- a/amd64/src/wl/sys/wl_linux.c
++++ a/amd64/src/wl/sys/wl_linux.c
 @@ -3180,6 +3180,7 @@
  {
  	char tmp[32];
@@ -26,32 +26,17 @@
 +#endif
  	return 0;
  }
---- src/wl/sys/wl_cfg80211.c
-+++ src/wl/sys/wl_cfg80211.c
+--- a/amd64/src/wl/sys/wl_cfg80211.c
++++ a/amd64/src/wl/sys/wl_cfg80211.c
 @@ -1892,7 +1892,11 @@
-                        wl_get_assoc_ies(wl);
-                        memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
-                        wl_update_bss_info(wl);
+ 			wl_get_assoc_ies(wl);
+ 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 			wl_update_bss_info(wl);
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
-                        cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL
-);
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
 +#else
-+                       cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, G
-FP_KERNEL);
++			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
 +#endif
-                        set_bit(WL_STATUS_CONNECTED, &wl->status);
-                        wl->profile->active = true;
-                }
-@@ -2112,7 +2116,11 @@
-                rcu_read_unlock();
- #endif
-                beacon_interval = bss->beacon_interval;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
-                cfg80211_put_bss(bss);
-+#else
-+               cfg80211_put_bss(wl_to_wiphy(wl), bss);
-+#endif
-        }
- 
-        tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
-
+ 			set_bit(WL_STATUS_CONNECTED, &wl->status);
+ 			wl->profile->active = true;
+ 		}
diff -r c1a747d0e778 -r 564f7f9745bd broadcom-wl/stuff/3.8.0.patch
--- a/broadcom-wl/stuff/3.8.0.patch	Mon May 21 13:39:00 2018 -0400
+++ b/broadcom-wl/stuff/3.8.0.patch	Mon May 21 20:02:33 2018 +0200
@@ -31,7 +31,7 @@
  
  	err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
  	if (err) {
-@@ -2057,9 +2061,14 @@
+@@ -2054,9 +2058,14 @@
  	struct bcm_tlv *tim;
  	u16 beacon_interval;
  	s32 dtim_period;
@@ -48,7 +48,7 @@
  
  	ssid = &wl->profile->ssid;
  	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
-@@ -2089,8 +2098,22 @@
+@@ -2086,8 +2095,22 @@
  		beacon_interval = cpu_to_le16(bi->beacon_period);
  	} else {
  		WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
diff -r c1a747d0e778 -r 564f7f9745bd broadcom-wl/stuff/3.9.0.patch
--- a/broadcom-wl/stuff/3.9.0.patch	Mon May 21 13:39:00 2018 -0400
+++ b/broadcom-wl/stuff/3.9.0.patch	Mon May 21 20:02:33 2018 +0200
@@ -3,7 +3,7 @@
 
 --- a/amd64/src/wl/sys/wl_cfg80211.c
 +++ b/amd64/src/wl/sys/wl_cfg80211.c
-@@ -2115,7 +2115,11 @@
+@@ -2112,7 +2112,11 @@
  		rcu_read_unlock();
  #endif
  		beacon_interval = bss->beacon_interval;
diff -r c1a747d0e778 -r 564f7f9745bd broadcom-wl/stuff/semaphore.patch
--- a/broadcom-wl/stuff/semaphore.patch	Mon May 21 13:39:00 2018 -0400
+++ b/broadcom-wl/stuff/semaphore.patch	Mon May 21 20:02:33 2018 +0200
@@ -1,6 +1,6 @@
 diff -aur bla/src/wl/sys/wl_iw.h bla.new/src/wl/sys/wl_iw.h
---- bla/src/wl/sys/wl_iw.h	2010-02-06 02:59:15.000000000 +0100
-+++ bla.new/src/wl/sys/wl_iw.h	2010-08-07 23:17:35.368641722 +0200
+--- a/amd64/src/wl/sys/wl_iw.h	2010-02-06 02:59:15.000000000 +0100
++++ b/amd64/src/wl/sys/wl_iw.h	2010-08-07 23:17:35.368641722 +0200
 @@ -15,6 +15,7 @@
  #ifndef _wl_iw_h_
  #define _wl_iw_h_
diff -r c1a747d0e778 -r 564f7f9745bd linux-aufs/receipt
--- a/linux-aufs/receipt	Mon May 21 13:39:00 2018 -0400
+++ b/linux-aufs/receipt	Mon May 21 20:02:33 2018 +0200
@@ -18,6 +18,10 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	if [ ! -d fs ]; then
+		kver=$(. ../linux/receipt ; echo $VERSION)
+		git checkout origin/aufs${kver%.*}
+	fi
 	sed -i \
 		-e 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \
 		-e 's|#CONFIG_AUFS_BRANCH_MAX_32767 =.*|CONFIG_AUFS_BRANCH_MAX_32767 = y|' \
diff -r c1a747d0e778 -r 564f7f9745bd linux/receipt
--- a/linux/receipt	Mon May 21 13:39:00 2018 -0400
+++ b/linux/receipt	Mon May 21 20:02:33 2018 +0200
@@ -179,13 +179,15 @@
 
 	# Check for Aufs and get source/patches if needed
 	echo "Checking for Aufs packages..."
-	AUFSVER=$(grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g')
-	AUFSDIR="$WOK/aufs/source/aufs-${AUFSVER}"
+	AUFSVER=$(grep ^VERSION= $WOK/linux-aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g')
+	AUFSSRCDIR="$WOK/linux-aufs/source"
+	AUFSDIR="$AUFSSRCDIR/linux-aufs-${AUFSVER}"
 	if [ ! -d "$AUFSDIR" ]; then
 		[ ! -f "$SRC/aufs-${AUFSVER}.tar.bz2" ] && cook aufs --getsrc
-		mkdir -p $WOK/aufs/source/
+		mkdir -p $AUFSSRCDIR
 		echo "Extracting: aufs-${AUFSVER}.tar.bz2"
-		tar xjf $SRC/aufs-${AUFSVER}.tar.bz2 -C $WOK/aufs/source/
+		tar xjf $SRC/aufs-${AUFSVER}.tar.bz2 -C $AUFSSRCDIR/
+		( cd $AUFSDIR ; [ -d fs ] || git checkout origin/aufs${VERSION%.*} )
 	fi
 	
 	echo "cook:linux" > $command