diff --git a/srcpkgs/sun7i-kernel/patches/0001-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch b/srcpkgs/sun7i-kernel/patches/0001-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch index 391c8c4d7fc..1359ff46e08 100644 --- a/srcpkgs/sun7i-kernel/patches/0001-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch +++ b/srcpkgs/sun7i-kernel/patches/0001-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch @@ -33,8 +33,8 @@ Signed-off-by: Jonathan Liu diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 7970e31..727add9 100644 ---- include/linux/compiler-gcc.h -+++ include/linux/compiler-gcc.h +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc.h ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc.h @@ -97,10 +97,122 @@ #define __maybe_unused __attribute__((unused)) #define __always_unused __attribute__((unused)) @@ -162,10 +162,10 @@ index 7970e31..727add9 100644 #if !defined(__noclone) #define __noclone /* not needed */ -diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h +diff --git linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc3.h linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc3.h deleted file mode 100644 index 37d4124..0000000 ---- include/linux/compiler-gcc3.h +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc3.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef __LINUX_COMPILER_H @@ -191,10 +191,10 @@ index 37d4124..0000000 -# error "GCOV profiling support for gcc versions below 3.4 not included" -# endif /* __GNUC_MINOR__ */ -#endif /* CONFIG_GCOV_KERNEL */ -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h +diff --git linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc4.h linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc4.h deleted file mode 100644 index 91b1aa8..0000000 ---- include/linux/compiler-gcc4.h +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/include/linux/compiler-gcc4.h +++ /dev/null @@ -1,74 +0,0 @@ -#ifndef __LINUX_COMPILER_H diff --git a/srcpkgs/sun7i-kernel/patches/0002-return_address.patch b/srcpkgs/sun7i-kernel/patches/0002-return_address.patch index af69ad4c694..2f5a3709c79 100644 --- a/srcpkgs/sun7i-kernel/patches/0002-return_address.patch +++ b/srcpkgs/sun7i-kernel/patches/0002-return_address.patch @@ -1,7 +1,7 @@ The function is defined in the source, so don't inline it in the header. ---- arch/arm/include/asm/ftrace.h 2014-10-22 23:53:32.000000000 +0200 -+++ arch/arm/include/asm/ftrace.h 2016-12-11 22:57:55.065090536 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/arch/arm/include/asm/ftrace.h 2014-10-22 23:53:32.000000000 +0200 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/arch/arm/include/asm/ftrace.h 2016-12-11 22:57:55.065090536 +0100 @@ -45,10 +45,7 @@ #else diff --git a/srcpkgs/sun7i-kernel/patches/0003-fix-extern_inline.patch b/srcpkgs/sun7i-kernel/patches/0003-fix-extern_inline.patch index 1edc3efbeec..44f6fe1108b 100644 --- a/srcpkgs/sun7i-kernel/patches/0003-fix-extern_inline.patch +++ b/srcpkgs/sun7i-kernel/patches/0003-fix-extern_inline.patch @@ -2,8 +2,8 @@ Defining a function "extern inline" or "extern __inline" makes it appear in the object files of source files including the header multiple times. This leads to multiply defined symbols when linking. Remove then "extern" where appropriate. ---- drivers/net/wireless/rtl8188eu/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/net/wireless/rtl8188eu/include/ieee80211.h 2016-12-11 23:48:07.113462416 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8188eu/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8188eu/include/ieee80211.h 2016-12-11 23:48:07.113462416 +0100 @@ -1188,12 +1188,12 @@ (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ (((Addr[5]) & 0xff) == 0xff)) @@ -19,8 +19,8 @@ multiply defined symbols when linking. Remove then "extern" where appropriate. { return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); ---- drivers/net/wireless/rtl8189es/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/net/wireless/rtl8189es/include/ieee80211.h 2016-12-11 23:46:24.353521931 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8189es/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8189es/include/ieee80211.h 2016-12-11 23:46:24.353521931 +0100 @@ -1188,12 +1188,12 @@ (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ (((Addr[5]) & 0xff) == 0xff)) @@ -36,8 +36,8 @@ multiply defined symbols when linking. Remove then "extern" where appropriate. { return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); ---- drivers/net/wireless/rtl8192cu/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/net/wireless/rtl8192cu/include/ieee80211.h 2016-12-11 23:47:59.585466757 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8192cu/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8192cu/include/ieee80211.h 2016-12-11 23:47:59.585466757 +0100 @@ -1149,12 +1149,12 @@ #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] @@ -71,8 +71,8 @@ multiply defined symbols when linking. Remove then "extern" where appropriate. { int hdrlen = 24; ---- drivers/net/wireless/rtl8723as/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/net/wireless/rtl8723as/include/ieee80211.h 2016-12-11 23:46:57.248502814 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8723as/include/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtl8723as/include/ieee80211.h 2016-12-11 23:46:57.248502814 +0100 @@ -1176,12 +1176,12 @@ (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ (((Addr[5]) & 0xff) == 0xff)) @@ -88,8 +88,8 @@ multiply defined symbols when linking. Remove then "extern" where appropriate. { return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); ---- drivers/staging/rtl8187se/ieee80211/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/staging/rtl8187se/ieee80211/ieee80211.h 2016-12-11 23:45:36.905549616 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/staging/rtl8187se/ieee80211/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/staging/rtl8187se/ieee80211/ieee80211.h 2016-12-11 23:45:36.905549616 +0100 @@ -1221,7 +1221,7 @@ return ((struct ieee80211_device *)netdev_priv(dev))->priv; } @@ -132,8 +132,8 @@ multiply defined symbols when linking. Remove then "extern" where appropriate. { return ieee->scans; } ---- drivers/staging/rtl8192u/ieee80211/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/staging/rtl8192u/ieee80211/ieee80211.h 2016-12-11 23:46:10.214530167 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/staging/rtl8192u/ieee80211/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/staging/rtl8192u/ieee80211/ieee80211.h 2016-12-11 23:46:10.214530167 +0100 @@ -2251,7 +2251,7 @@ return ((struct ieee80211_device *)netdev_priv(dev))->priv; } @@ -176,8 +176,8 @@ multiply defined symbols when linking. Remove then "extern" where appropriate. { return ieee->scans; } ---- drivers/staging/rtl8712/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/staging/rtl8712/ieee80211.h 2016-12-11 23:45:54.550539305 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/staging/rtl8712/ieee80211.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/staging/rtl8712/ieee80211.h 2016-12-11 23:45:54.550539305 +0100 @@ -734,7 +734,7 @@ #define IEEE_G (1<<2) #define IEEE_MODE_MASK (IEEE_A|IEEE_B|IEEE_G) diff --git a/srcpkgs/sun7i-kernel/patches/0004-fix-mixed_declarations_and_code.patch b/srcpkgs/sun7i-kernel/patches/0004-fix-mixed_declarations_and_code.patch index 13ce3d3b6bc..a07c3209dd6 100644 --- a/srcpkgs/sun7i-kernel/patches/0004-fix-mixed_declarations_and_code.patch +++ b/srcpkgs/sun7i-kernel/patches/0004-fix-mixed_declarations_and_code.patch @@ -1,7 +1,7 @@ The order of variable definitions and code can't be mixed with ISOC90 ---- drivers/net/wireless/rtxx7x/os/linux/usb_main_dev.c 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/net/wireless/rtxx7x/os/linux/usb_main_dev.c 2016-12-11 23:17:00.710634654 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtxx7x/os/linux/usb_main_dev.c 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/net/wireless/rtxx7x/os/linux/usb_main_dev.c 2016-12-11 23:17:00.710634654 +0100 @@ -444,11 +444,11 @@ struct net_device *net_dev; VOID *pAd = usb_get_intfdata(intf); diff --git a/srcpkgs/sun7i-kernel/patches/0005-fix-mouse_lifebook.patch b/srcpkgs/sun7i-kernel/patches/0005-fix-mouse_lifebook.patch index c1885277ca5..91d15835f46 100644 --- a/srcpkgs/sun7i-kernel/patches/0005-fix-mouse_lifebook.patch +++ b/srcpkgs/sun7i-kernel/patches/0005-fix-mouse_lifebook.patch @@ -1,8 +1,8 @@ Make these inline definitions "extern inline" to keep a copy of the code in the object files. ---- drivers/input/mouse/lifebook.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/input/mouse/lifebook.h 2016-12-11 23:57:26.116108248 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/input/mouse/lifebook.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/input/mouse/lifebook.h 2016-12-11 23:57:26.116108248 +0100 @@ -16,14 +16,14 @@ int lifebook_detect(struct psmouse *psmouse, bool set_properties); int lifebook_init(struct psmouse *psmouse); diff --git a/srcpkgs/sun7i-kernel/patches/0006-fix-mouse_fsp.patch b/srcpkgs/sun7i-kernel/patches/0006-fix-mouse_fsp.patch index 536d5e35aad..941fdf60543 100644 --- a/srcpkgs/sun7i-kernel/patches/0006-fix-mouse_fsp.patch +++ b/srcpkgs/sun7i-kernel/patches/0006-fix-mouse_fsp.patch @@ -1,8 +1,8 @@ Make these inline definitions "extern inline" to keep a copy of the code in the object files. ---- drivers/input/mouse/sentelic.h 2015-03-15 20:30:43.000000000 +0100 -+++ drivers/input/mouse/sentelic.h 2016-12-11 23:59:42.772013703 +0100 +--- linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/input/mouse/sentelic.h 2015-03-15 20:30:43.000000000 +0100 ++++ linux-sunxi-d47d367036be38c5180632ec8a3ad169a4593a88/drivers/input/mouse/sentelic.h 2016-12-11 23:59:42.772013703 +0100 @@ -115,11 +115,11 @@ extern int fsp_detect(struct psmouse *psmouse, bool set_properties); extern int fsp_init(struct psmouse *psmouse); diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template index 08dc16fa6b7..755636a526d 100644 --- a/srcpkgs/sun7i-kernel/template +++ b/srcpkgs/sun7i-kernel/template @@ -9,18 +9,19 @@ version=3.4.104 revision=2 maintainer="Orphaned " homepage="http://www.kernel.org" -license="GPL-2" +license="GPL-2.0-only" short_desc="Linux kernel for sun7i (${version%.*} series [git ${_gitshort}])" _patchurl="https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/5c82068/core/linux-sun7i" distfiles="https://github.com/linux-sunxi/linux-sunxi/archive/${_githash}.tar.gz ${_patchurl}/0001-Backport-firmware-loader.patch ${_patchurl}/0001-Backport-msdos-partition-UUIDs.patch" -checksum="614a6fc47beb64a3b9b55a772a4cea0192bb358254e0b717de1ea031d2d6864f +checksum="e3de775107e7ba6ad0cf3345844fca1d61c8a11037fa71a5238ead439d15a166 eeceb6459f2f40c91a6a5be8d8c60e68dec2631ec84d6165721edacb059507c4 f0bba58788f090dd213df0bde1ea0ce38999a8d28bebe443c899cb9cbc2b5eed" -wrksrc="linux-sunxi-${_githash}" +create_wrksrc=yes +build_wrksrc="linux-sunxi-${_githash}" _kernver="${version}_${revision}" nostrip=yes @@ -40,10 +41,11 @@ mutable_files=" /usr/lib/modules/${_kernver}/modules.devname" post_extract() { + cd "${build_wrksrc}" # Apply backported kernel firmware changes required by eudev>=2.1. - patch -p1 -i ${XBPS_BUILDDIR}/0001-Backport-firmware-loader.patch + patch -p1 -i ../0001-Backport-firmware-loader.patch # Apply backported kernel msdos partition UUID changes - patch -p1 -i ${XBPS_BUILDDIR}/0001-Backport-msdos-partition-UUIDs.patch + patch -p1 -i ../0001-Backport-msdos-partition-UUIDs.patch } do_configure() { @@ -180,4 +182,3 @@ sun7i-kernel-headers_package() { vmove usr/lib/modules/${_kernver}/build } } -