From 42b48451b20ccd14066de4c3b0d376f949a52b19 Mon Sep 17 00:00:00 2001 From: deata Date: Sun, 23 Dec 2018 12:52:24 +0200 Subject: [PATCH] device/linux-samsung-kylepro: modernize aport (!113) Kernel compiles and device boots. --- device/linux-samsung-kylepro/APKBUILD | 43 ++++-------- device/linux-samsung-kylepro/compiler-gcc6.h | 69 ------------------- .../config-samsung-kylepro.armhf | 1 + ...give-up-on-ilog2-const-optimizations.patch | 1 + .../gcc8-fix-put-user.patch | 1 + 5 files changed, 16 insertions(+), 99 deletions(-) delete mode 100644 device/linux-samsung-kylepro/compiler-gcc6.h create mode 120000 device/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch create mode 120000 device/linux-samsung-kylepro/gcc8-fix-put-user.patch diff --git a/device/linux-samsung-kylepro/APKBUILD b/device/linux-samsung-kylepro/APKBUILD index 080bf9805..4ccf576cb 100644 --- a/device/linux-samsung-kylepro/APKBUILD +++ b/device/linux-samsung-kylepro/APKBUILD @@ -1,25 +1,21 @@ +# Reference: # Kernel config based on: arch/arm/configs/bcm21664_hawaii_ss_kylepro_rev00_lineage_defconfig pkgname="linux-samsung-kylepro" pkgver=3.4.113 -pkgrel=2 +pkgrel=3 pkgdesc="Samsung Galaxy Trend Plus kernel fork" arch="armhf" _carch="arm" _flavor="samsung-kylepro" url="https://kernel.org" -license="GPL2" +license="GPL-2.0-only" options="!strip !check !tracedeps" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev gcc6" +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev" -# Compiler: this kernel was only tested with GCC6. Feel free to make a merge -# request if you find out that it is booting working with newer GCCs as -# well. See for instructions. -if [ "${CC:0:5}" != "gcc6-" ]; then - CC="gcc6-$CC" - HOSTCC="gcc6-gcc" - CROSS_COMPILE="gcc6-$CROSS_COMPILE" -fi +# Compiler: latest GCC from Alpine +HOSTCC="${CC:-gcc}" +HOSTCC="${HOSTCC#${CROSS_COMPILE}}" # Source _repository="android_kernel_samsung_kyleproxx" @@ -28,7 +24,8 @@ _config="config-${_flavor}.${arch}" source=" $pkgname-$_commit.tar.gz::https://github.com/Samsung-KYLEPROXX/${_repository}/archive/${_commit}.tar.gz $_config - compiler-gcc6.h + gcc7-give-up-on-ilog2-const-optimizations.patch + gcc8-fix-put-user.patch 00_return_address.patch 02_screen_reset.patch " @@ -36,22 +33,7 @@ builddir="$srcdir/${_repository}-${_commit}" prepare() { default_prepare - - # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$builddir/include/linux/" - - # Remove -Werror from all makefiles - local i - local makefiles="$(find . -type f -name Makefile) - $(find . -type f -name Kbuild)" - for i in $makefiles; do - sed -i 's/-Werror-/-W/g' "$i" - sed -i 's/-Werror//g' "$i" - done - - # Prepare kernel config ('yes ""' for kernels lacking olddefconfig) - cp "$srcdir"/$_config "$builddir"/.config - yes "" | make ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig + downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC" } build() { @@ -81,7 +63,8 @@ package() { } sha512sums="b66ab7d8ed557ed095b059beb7b37d196a7290e6c8364560126a94f696718c4a61f99b1e21700d9a4b50c569243e4e2cbfc9fbd9d9517ca49cfa32f31525c27f linux-samsung-kylepro-026cf3b3e97ec40aa1c0c52837a318725786f05a.tar.gz -0891dc88c6c0176f1d291a9ff570c9ab1a477f166312d067f3d3f6674a62f379d3e830ca1229e1834fe152f3c2b75288d4183c2becc3d402b729777f969d926b config-samsung-kylepro.armhf -d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h +2cbb243d21a627eb1ca06aeeec2fec05d3b93905c47c52480381adc6932c8473e284a173948ce1f66311c93fa1553a2ccbc7d7173314f6cd8245b62e0bef2a4f config-samsung-kylepro.armhf +77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch +197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch c40eaa11547f5bc2b1ff965506bdfe3015ff16e4b5ad9ccb3b8134ceafd1d32407c4ef2b213e02e036ce1e9bdcbfe768dff7d4b054bec77705a176c1f783b6f5 00_return_address.patch c0a59be648ef646650c83b5d135daa05aae300c7ad5056d49f1b3f9967c4d7f337b0ddb8ae319b11e43c17aaf5fc9dcc9724463d265c1d765dc85c86f612f4ea 02_screen_reset.patch" diff --git a/device/linux-samsung-kylepro/compiler-gcc6.h b/device/linux-samsung-kylepro/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/device/linux-samsung-kylepro/compiler-gcc6.h +++ /dev/null @@ -1,69 +0,0 @@ -// SOURCE: -// https://github.com/NextThingCo/CHIP-u-boot/issues/10#issuecomment-287515505 - -#ifndef __LINUX_COMPILER_H -#error "Please don't include directly, include instead." -#endif - -#define __used __attribute__((__used__)) -#define __must_check __attribute__((warn_unused_result)) -#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) - -/* Mark functions as cold. gcc will assume any path leading to a call - to them will be unlikely. This means a lot of manual unlikely()s - are unnecessary now for any paths leading to the usual suspects - like BUG(), printk(), panic() etc. [but let's keep them for now for - older compilers] - - Early snapshots of gcc 4.3 don't support this and we can't detect this - in the preprocessor, but we can live with this because they're unreleased. - Maketime probing would be overkill here. - - gcc also has a __attribute__((__hot__)) to move hot functions into - a special section, but I don't see any sense in this right now in - the kernel context */ -#define __cold __attribute__((__cold__)) - -#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) - -#ifndef __CHECKER__ -# define __compiletime_warning(message) __attribute__((warning(message))) -# define __compiletime_error(message) __attribute__((error(message))) -#endif /* __CHECKER__ */ - -/* - * Mark a position in code as unreachable. This can be used to - * suppress control flow warnings after asm blocks that transfer - * control elsewhere. - * - * Early snapshots of gcc 4.5 don't support this and we can't detect - * this in the preprocessor, but we can live with this because they're - * unreleased. Really, we need to have autoconf for the kernel. - */ -#define unreachable() __builtin_unreachable() - -/* Mark a function definition as prohibited from being cloned. */ -#define __noclone __attribute__((__noclone__)) - -/* - * Tell the optimizer that something else uses this function or variable. - */ -#define __visible __attribute__((externally_visible)) - -/* - * GCC 'asm goto' miscompiles certain code sequences: - * - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 - * - * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. - * - * (asm goto is automatically volatile - the naming reflects this.) - */ -#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - -#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -#define __HAVE_BUILTIN_BSWAP32__ -#define __HAVE_BUILTIN_BSWAP64__ -#define __HAVE_BUILTIN_BSWAP16__ -#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ - diff --git a/device/linux-samsung-kylepro/config-samsung-kylepro.armhf b/device/linux-samsung-kylepro/config-samsung-kylepro.armhf index 945902bcf..749a792fc 100644 --- a/device/linux-samsung-kylepro/config-samsung-kylepro.armhf +++ b/device/linux-samsung-kylepro/config-samsung-kylepro.armhf @@ -2395,6 +2395,7 @@ CONFIG_USB_G_ANDROID_SAMSUNG_COMPOSITE=y # CONFIG_USB_G_MULTI is not set # CONFIG_USB_G_HID is not set # CONFIG_USB_G_DBGP is not set +# CONFIG_USB_G_WEBCAM is not set # CONFIG_USB_MTP_SAMSUNG is not set # diff --git a/device/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch new file mode 120000 index 000000000..da3d1ed41 --- /dev/null +++ b/device/linux-samsung-kylepro/gcc7-give-up-on-ilog2-const-optimizations.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/gcc7-give-up-on-ilog2-const-optimizations.patch \ No newline at end of file diff --git a/device/linux-samsung-kylepro/gcc8-fix-put-user.patch b/device/linux-samsung-kylepro/gcc8-fix-put-user.patch new file mode 120000 index 000000000..1d40b2674 --- /dev/null +++ b/device/linux-samsung-kylepro/gcc8-fix-put-user.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/gcc8-fix-put-user.patch \ No newline at end of file