wok-6.x rev 20321
Fix busybox, etherboot & mgetty
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun May 20 21:26:43 2018 +0200 (2018-05-20) |
parents | 9502f43f5f21 |
children | 7754bc3d70de |
files | broadcom-wl/receipt broadcom-wl/stuff/3.14.0.patch busybox/stuff/busybox-1.27-diet.u busybox/stuff/busybox-1.28-diet.u etherboot/receipt mgetty/receipt |
line diff
1.1 --- a/broadcom-wl/receipt Sun May 20 13:29:24 2018 +0200 1.2 +++ b/broadcom-wl/receipt Sun May 20 21:26:43 2018 +0200 1.3 @@ -19,7 +19,7 @@ 1.4 { 1.5 sed -i 's|ndo_set_multicast_list|ndo_set_rx_mode|' src/wl/sys/wl_linux.c 1.6 sed -i 's|linux/autoconf.h|generated/autoconf.h|' src/include/linuxver.h 1.7 - for i in semaphore 3.4.0 3.6.0 3.8.0 3.9.0 ; do 1.8 + for i in semaphore 3.4.0 3.6.0 3.8.0 3.9.0 3.14.0 ; do 1.9 patch -Np1 -i $stuff/$i.patch 1.10 done 1.11 KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/broadcom-wl/stuff/3.14.0.patch Sun May 20 21:26:43 2018 +0200 2.3 @@ -0,0 +1,57 @@ 2.4 +--- src/wl/sys/wl_linux.c 2.5 ++++ src/wl/sys/wl_linux.c 2.6 +@@ -3180,6 +3180,7 @@ 2.7 + { 2.8 + char tmp[32]; 2.9 + sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit); 2.10 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) 2.11 + if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { 2.12 + WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); 2.13 + ASSERT(0); 2.14 +@@ -3188,5 +3189,17 @@ 2.15 + wl->proc_entry->read_proc = wl_proc_read; 2.16 + wl->proc_entry->write_proc = wl_proc_write; 2.17 + wl->proc_entry->data = wl; 2.18 ++#else 2.19 ++ static const struct file_operations wl_proc_fops = { 2.20 ++ .owner = THIS_MODULE, 2.21 ++ .read = wl_proc_read, 2.22 ++ .write = wl_proc_write, 2.23 ++ }; 2.24 ++ if ((wl->proc_entry = proc_create(tmp, 0644, NULL,&wl_proc_fops)) == NULL) { 2.25 ++ WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); 2.26 ++ ASSERT(0); 2.27 ++ return -1; 2.28 ++ } 2.29 ++#endif 2.30 + return 0; 2.31 + } 2.32 +--- src/wl/sys/wl_cfg80211.c 2.33 ++++ src/wl/sys/wl_cfg80211.c 2.34 +@@ -1892,7 +1892,11 @@ 2.35 + wl_get_assoc_ies(wl); 2.36 + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); 2.37 + wl_update_bss_info(wl); 2.38 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) 2.39 + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL 2.40 +); 2.41 ++#else 2.42 ++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, G 2.43 +FP_KERNEL); 2.44 ++#endif 2.45 + set_bit(WL_STATUS_CONNECTED, &wl->status); 2.46 + wl->profile->active = true; 2.47 + } 2.48 +@@ -2112,7 +2116,11 @@ 2.49 + rcu_read_unlock(); 2.50 + #endif 2.51 + beacon_interval = bss->beacon_interval; 2.52 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) 2.53 + cfg80211_put_bss(bss); 2.54 ++#else 2.55 ++ cfg80211_put_bss(wl_to_wiphy(wl), bss); 2.56 ++#endif 2.57 + } 2.58 + 2.59 + tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM); 2.60 +
3.1 --- a/busybox/stuff/busybox-1.27-diet.u Sun May 20 13:29:24 2018 +0200 3.2 +++ b/busybox/stuff/busybox-1.27-diet.u Sun May 20 21:26:43 2018 +0200 3.3 @@ -1,6 +1,6 @@ 3.4 --- busybox-1.25/include/platform.h 3.5 +++ busybox-1.25/include/platform.h 3.6 -@@ -506,6 +506,20 @@ 3.7 +@@ -506,6 +506,21 @@ 3.8 # undef HAVE_NET_ETHERNET_H 3.9 #endif 3.10 3.11 @@ -8,6 +8,7 @@ 3.12 +# define __aligned_u64 __u64 __attribute__((aligned(8))) 3.13 +# define LOOP_SET_STATUS64 0x4C04 3.14 +# define LOOP_GET_STATUS64 0x4C05 3.15 ++# define O_CLOEXEC 02000000 3.16 +# define MAXSYMLINKS 20 3.17 +# define S_TYPEISMQ(x) 0 3.18 +# define S_TYPEISSEM(x) 0
4.1 --- a/busybox/stuff/busybox-1.28-diet.u Sun May 20 13:29:24 2018 +0200 4.2 +++ b/busybox/stuff/busybox-1.28-diet.u Sun May 20 21:26:43 2018 +0200 4.3 @@ -1,6 +1,6 @@ 4.4 --- busybox-1.28/include/platform.h 4.5 +++ busybox-1.28/include/platform.h 4.6 -@@ -528,6 +528,20 @@ 4.7 +@@ -528,6 +528,21 @@ 4.8 # undef HAVE_PRINTF_PERCENTM 4.9 #endif 4.10 4.11 @@ -8,6 +8,7 @@ 4.12 +# define __aligned_u64 __u64 __attribute__((aligned(8))) 4.13 +# define LOOP_SET_STATUS64 0x4C04 4.14 +# define LOOP_GET_STATUS64 0x4C05 4.15 ++# define O_CLOEXEC 02000000 4.16 +# define MAXSYMLINKS 20 4.17 +# define S_TYPEISMQ(x) 0 4.18 +# define S_TYPEISSEM(x) 0
5.1 --- a/etherboot/receipt Sun May 20 13:29:24 2018 +0200 5.2 +++ b/etherboot/receipt Sun May 20 21:26:43 2018 +0200 5.3 @@ -25,7 +25,7 @@ 5.4 etherboot-net.u 5.5 etherboot-prefix.u 5.6 EOT 5.7 - make bin/etherboot-net.bzImage 5.8 + make EXTRA_CFLAGS="-Wno-error=unused-but-set-variable" bin/etherboot-net.bzImage 5.9 } 5.10 5.11
6.1 --- a/mgetty/receipt Sun May 20 13:29:24 2018 +0200 6.2 +++ b/mgetty/receipt Sun May 20 21:26:43 2018 +0200 6.3 @@ -31,12 +31,12 @@ 6.4 -e 's|/man/|/share&|' \ 6.5 -e 's|^INSTALL=install .*|INSTALL=install -c -o root -g root|' \ 6.6 Makefile.install 6.7 - make bin-all vgetty 6.8 + make -j 1 bin-all vgetty 6.9 mkdir -p $DESTDIR/var/spool $DESTDIR/usr/share/man/man1 \ 6.10 $DESTDIR/usr/share/man/man8 6.11 mv -f Makefile.install Makefile 6.12 sed -i 's|chown|echo chown|' Makefile fax/Makefile 6.13 - make -k install.bin vgetty-install 6.14 + make -k -j 1 install.bin vgetty-install 6.15 } 6.16 6.17 # Rules to gen a SliTaz package suitable for Tazpkg.