wok-6.x rev 20324

linux: aufs source comes from linux-aufs
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon May 21 20:02:33 2018 +0200 (2018-05-21)
parents c1a747d0e778
children d957f3570bd6
files broadcom-wl/receipt broadcom-wl/stuff/3.14.0.patch broadcom-wl/stuff/3.8.0.patch broadcom-wl/stuff/3.9.0.patch broadcom-wl/stuff/semaphore.patch linux-aufs/receipt linux/receipt
line diff
     1.1 --- a/broadcom-wl/receipt	Mon May 21 13:39:00 2018 -0400
     1.2 +++ b/broadcom-wl/receipt	Mon May 21 20:02:33 2018 +0200
     1.3 @@ -20,7 +20,8 @@
     1.4  	sed -i 's|ndo_set_multicast_list|ndo_set_rx_mode|' src/wl/sys/wl_linux.c
     1.5  	sed -i 's|linux/autoconf.h|generated/autoconf.h|' src/include/linuxver.h
     1.6  	for i in semaphore 3.4.0 3.6.0 3.8.0 3.9.0 3.14.0 ; do
     1.7 -		patch -Np1 -i $stuff/$i.patch
     1.8 +		echo "patch $i ..."
     1.9 +		patch -Np2 -i $stuff/$i.patch
    1.10  	done
    1.11  	KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`
    1.12  	xz wl.ko
     2.1 --- a/broadcom-wl/stuff/3.14.0.patch	Mon May 21 13:39:00 2018 -0400
     2.2 +++ b/broadcom-wl/stuff/3.14.0.patch	Mon May 21 20:02:33 2018 +0200
     2.3 @@ -1,5 +1,5 @@
     2.4 ---- src/wl/sys/wl_linux.c
     2.5 -+++ src/wl/sys/wl_linux.c
     2.6 +--- a/amd64/src/wl/sys/wl_linux.c
     2.7 ++++ a/amd64/src/wl/sys/wl_linux.c
     2.8  @@ -3180,6 +3180,7 @@
     2.9   {
    2.10   	char tmp[32];
    2.11 @@ -26,32 +26,17 @@
    2.12  +#endif
    2.13   	return 0;
    2.14   }
    2.15 ---- src/wl/sys/wl_cfg80211.c
    2.16 -+++ src/wl/sys/wl_cfg80211.c
    2.17 +--- a/amd64/src/wl/sys/wl_cfg80211.c
    2.18 ++++ a/amd64/src/wl/sys/wl_cfg80211.c
    2.19  @@ -1892,7 +1892,11 @@
    2.20 -                        wl_get_assoc_ies(wl);
    2.21 -                        memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
    2.22 -                        wl_update_bss_info(wl);
    2.23 + 			wl_get_assoc_ies(wl);
    2.24 + 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
    2.25 + 			wl_update_bss_info(wl);
    2.26  +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
    2.27 -                        cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL
    2.28 -);
    2.29 + 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
    2.30  +#else
    2.31 -+                       cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, G
    2.32 -FP_KERNEL);
    2.33 ++			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
    2.34  +#endif
    2.35 -                        set_bit(WL_STATUS_CONNECTED, &wl->status);
    2.36 -                        wl->profile->active = true;
    2.37 -                }
    2.38 -@@ -2112,7 +2116,11 @@
    2.39 -                rcu_read_unlock();
    2.40 - #endif
    2.41 -                beacon_interval = bss->beacon_interval;
    2.42 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
    2.43 -                cfg80211_put_bss(bss);
    2.44 -+#else
    2.45 -+               cfg80211_put_bss(wl_to_wiphy(wl), bss);
    2.46 -+#endif
    2.47 -        }
    2.48 - 
    2.49 -        tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
    2.50 -
    2.51 + 			set_bit(WL_STATUS_CONNECTED, &wl->status);
    2.52 + 			wl->profile->active = true;
    2.53 + 		}
     3.1 --- a/broadcom-wl/stuff/3.8.0.patch	Mon May 21 13:39:00 2018 -0400
     3.2 +++ b/broadcom-wl/stuff/3.8.0.patch	Mon May 21 20:02:33 2018 +0200
     3.3 @@ -31,7 +31,7 @@
     3.4   
     3.5   	err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size);
     3.6   	if (err) {
     3.7 -@@ -2057,9 +2061,14 @@
     3.8 +@@ -2054,9 +2058,14 @@
     3.9   	struct bcm_tlv *tim;
    3.10   	u16 beacon_interval;
    3.11   	s32 dtim_period;
    3.12 @@ -48,7 +48,7 @@
    3.13   
    3.14   	ssid = &wl->profile->ssid;
    3.15   	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
    3.16 -@@ -2089,8 +2098,22 @@
    3.17 +@@ -2086,8 +2095,22 @@
    3.18   		beacon_interval = cpu_to_le16(bi->beacon_period);
    3.19   	} else {
    3.20   		WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
     4.1 --- a/broadcom-wl/stuff/3.9.0.patch	Mon May 21 13:39:00 2018 -0400
     4.2 +++ b/broadcom-wl/stuff/3.9.0.patch	Mon May 21 20:02:33 2018 +0200
     4.3 @@ -3,7 +3,7 @@
     4.4  
     4.5  --- a/amd64/src/wl/sys/wl_cfg80211.c
     4.6  +++ b/amd64/src/wl/sys/wl_cfg80211.c
     4.7 -@@ -2115,7 +2115,11 @@
     4.8 +@@ -2112,7 +2112,11 @@
     4.9   		rcu_read_unlock();
    4.10   #endif
    4.11   		beacon_interval = bss->beacon_interval;
     5.1 --- a/broadcom-wl/stuff/semaphore.patch	Mon May 21 13:39:00 2018 -0400
     5.2 +++ b/broadcom-wl/stuff/semaphore.patch	Mon May 21 20:02:33 2018 +0200
     5.3 @@ -1,6 +1,6 @@
     5.4  diff -aur bla/src/wl/sys/wl_iw.h bla.new/src/wl/sys/wl_iw.h
     5.5 ---- bla/src/wl/sys/wl_iw.h	2010-02-06 02:59:15.000000000 +0100
     5.6 -+++ bla.new/src/wl/sys/wl_iw.h	2010-08-07 23:17:35.368641722 +0200
     5.7 +--- a/amd64/src/wl/sys/wl_iw.h	2010-02-06 02:59:15.000000000 +0100
     5.8 ++++ b/amd64/src/wl/sys/wl_iw.h	2010-08-07 23:17:35.368641722 +0200
     5.9  @@ -15,6 +15,7 @@
    5.10   #ifndef _wl_iw_h_
    5.11   #define _wl_iw_h_
     6.1 --- a/linux-aufs/receipt	Mon May 21 13:39:00 2018 -0400
     6.2 +++ b/linux-aufs/receipt	Mon May 21 20:02:33 2018 +0200
     6.3 @@ -18,6 +18,10 @@
     6.4  # Rules to configure and make the package.
     6.5  compile_rules()
     6.6  {
     6.7 +	if [ ! -d fs ]; then
     6.8 +		kver=$(. ../linux/receipt ; echo $VERSION)
     6.9 +		git checkout origin/aufs${kver%.*}
    6.10 +	fi
    6.11  	sed -i \
    6.12  		-e 's|CONFIG_AUFS_BRANCH_MAX_127 =.*|CONFIG_AUFS_BRANCH_MAX_127 =|' \
    6.13  		-e 's|#CONFIG_AUFS_BRANCH_MAX_32767 =.*|CONFIG_AUFS_BRANCH_MAX_32767 = y|' \
     7.1 --- a/linux/receipt	Mon May 21 13:39:00 2018 -0400
     7.2 +++ b/linux/receipt	Mon May 21 20:02:33 2018 +0200
     7.3 @@ -179,13 +179,15 @@
     7.4  
     7.5  	# Check for Aufs and get source/patches if needed
     7.6  	echo "Checking for Aufs packages..."
     7.7 -	AUFSVER=$(grep ^VERSION= $WOK/aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g')
     7.8 -	AUFSDIR="$WOK/aufs/source/aufs-${AUFSVER}"
     7.9 +	AUFSVER=$(grep ^VERSION= $WOK/linux-aufs/receipt | cut -d "=" -f2 | sed -e 's/"//g')
    7.10 +	AUFSSRCDIR="$WOK/linux-aufs/source"
    7.11 +	AUFSDIR="$AUFSSRCDIR/linux-aufs-${AUFSVER}"
    7.12  	if [ ! -d "$AUFSDIR" ]; then
    7.13  		[ ! -f "$SRC/aufs-${AUFSVER}.tar.bz2" ] && cook aufs --getsrc
    7.14 -		mkdir -p $WOK/aufs/source/
    7.15 +		mkdir -p $AUFSSRCDIR
    7.16  		echo "Extracting: aufs-${AUFSVER}.tar.bz2"
    7.17 -		tar xjf $SRC/aufs-${AUFSVER}.tar.bz2 -C $WOK/aufs/source/
    7.18 +		tar xjf $SRC/aufs-${AUFSVER}.tar.bz2 -C $AUFSSRCDIR/
    7.19 +		( cd $AUFSDIR ; [ -d fs ] || git checkout origin/aufs${VERSION%.*} )
    7.20  	fi
    7.21  	
    7.22  	echo "cook:linux" > $command