# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1526844403 -7200
# Node ID 10a263b71ff002f1956e768ce99ded6e6f76946c
# Parent  9502f43f5f21951dc10695ab57bb41270e4e9bf7
Fix busybox, etherboot & mgetty

diff -r 9502f43f5f21 -r 10a263b71ff0 broadcom-wl/receipt
--- a/broadcom-wl/receipt	Sun May 20 13:29:24 2018 +0200
+++ b/broadcom-wl/receipt	Sun May 20 21:26:43 2018 +0200
@@ -19,7 +19,7 @@
 {
 	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 ; do
+	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
 	done
 	KBUILD_NOPEDANTIC=1 make -C /usr/src/linux M=`pwd`
diff -r 9502f43f5f21 -r 10a263b71ff0 broadcom-wl/stuff/3.14.0.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/broadcom-wl/stuff/3.14.0.patch	Sun May 20 21:26:43 2018 +0200
@@ -0,0 +1,57 @@
+--- src/wl/sys/wl_linux.c
++++ src/wl/sys/wl_linux.c
+@@ -3180,6 +3180,7 @@
+ {
+ 	char tmp[32];
+ 	sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ 	if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
+ 		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
+ 		ASSERT(0);
+@@ -3188,5 +3189,17 @@
+ 	wl->proc_entry->read_proc = wl_proc_read;
+ 	wl->proc_entry->write_proc = wl_proc_write;
+ 	wl->proc_entry->data = wl;
++#else
++	static const struct file_operations wl_proc_fops = {
++		.owner = THIS_MODULE,
++		.read = wl_proc_read,
++		.write = wl_proc_write,
++	};
++	if ((wl->proc_entry = proc_create(tmp, 0644, NULL,&wl_proc_fops)) == NULL) {
++		WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
++		ASSERT(0);
++		return -1;
++	}
++#endif
+ 	return 0;
+ }
+--- src/wl/sys/wl_cfg80211.c
++++ 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);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
+                        cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL
+);
++#else
++                       cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, G
+FP_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);
+
diff -r 9502f43f5f21 -r 10a263b71ff0 busybox/stuff/busybox-1.27-diet.u
--- a/busybox/stuff/busybox-1.27-diet.u	Sun May 20 13:29:24 2018 +0200
+++ b/busybox/stuff/busybox-1.27-diet.u	Sun May 20 21:26:43 2018 +0200
@@ -1,6 +1,6 @@
 --- busybox-1.25/include/platform.h
 +++ busybox-1.25/include/platform.h
-@@ -506,6 +506,20 @@
+@@ -506,6 +506,21 @@
  # undef HAVE_NET_ETHERNET_H
  #endif
  
@@ -8,6 +8,7 @@
 +# define __aligned_u64 __u64 __attribute__((aligned(8)))
 +# define LOOP_SET_STATUS64	0x4C04
 +# define LOOP_GET_STATUS64	0x4C05
++# define O_CLOEXEC    02000000
 +# define MAXSYMLINKS	20
 +# define S_TYPEISMQ(x)	0
 +# define S_TYPEISSEM(x)	0
diff -r 9502f43f5f21 -r 10a263b71ff0 busybox/stuff/busybox-1.28-diet.u
--- a/busybox/stuff/busybox-1.28-diet.u	Sun May 20 13:29:24 2018 +0200
+++ b/busybox/stuff/busybox-1.28-diet.u	Sun May 20 21:26:43 2018 +0200
@@ -1,6 +1,6 @@
 --- busybox-1.28/include/platform.h
 +++ busybox-1.28/include/platform.h
-@@ -528,6 +528,20 @@
+@@ -528,6 +528,21 @@
  # undef HAVE_PRINTF_PERCENTM
  #endif
  
@@ -8,6 +8,7 @@
 +# define __aligned_u64 __u64 __attribute__((aligned(8)))
 +# define LOOP_SET_STATUS64	0x4C04
 +# define LOOP_GET_STATUS64	0x4C05
++# define O_CLOEXEC    02000000
 +# define MAXSYMLINKS	20
 +# define S_TYPEISMQ(x)	0
 +# define S_TYPEISSEM(x)	0
diff -r 9502f43f5f21 -r 10a263b71ff0 etherboot/receipt
--- a/etherboot/receipt	Sun May 20 13:29:24 2018 +0200
+++ b/etherboot/receipt	Sun May 20 21:26:43 2018 +0200
@@ -25,7 +25,7 @@
 etherboot-net.u
 etherboot-prefix.u
 EOT
-	make bin/etherboot-net.bzImage
+	make EXTRA_CFLAGS="-Wno-error=unused-but-set-variable" bin/etherboot-net.bzImage
 }
 
 
diff -r 9502f43f5f21 -r 10a263b71ff0 mgetty/receipt
--- a/mgetty/receipt	Sun May 20 13:29:24 2018 +0200
+++ b/mgetty/receipt	Sun May 20 21:26:43 2018 +0200
@@ -31,12 +31,12 @@
 		-e 's|/man/|/share&|' \
 		-e 's|^INSTALL=install .*|INSTALL=install -c -o root -g root|' \
 		Makefile.install
-	make bin-all vgetty
+	make -j 1 bin-all vgetty
 	mkdir -p $DESTDIR/var/spool $DESTDIR/usr/share/man/man1 \
 		$DESTDIR/usr/share/man/man8
 	mv -f Makefile.install Makefile
 	sed -i 's|chown|echo chown|' Makefile fax/Makefile
-	make -k install.bin vgetty-install
+	make -k -j 1 install.bin vgetty-install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.