From 10cbdc7225d7126111c49f4a696386aa20dba3aa Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 5 Oct 2018 11:57:26 -0400 Subject: [PATCH] linux-samsung-i9100: modernize with new gcc8 linux aportgen code --- device/linux-samsung-i9100/APKBUILD | 144 +++++++----------- device/linux-samsung-i9100/compiler-gcc6.h | 69 --------- ...give-up-on-ilog2-const-optimizations.patch | 1 + .../gcc8-fix-put-user.patch | 1 + 4 files changed, 58 insertions(+), 157 deletions(-) delete mode 100644 device/linux-samsung-i9100/compiler-gcc6.h create mode 120000 device/linux-samsung-i9100/gcc7-give-up-on-ilog2-const-optimizations.patch create mode 120000 device/linux-samsung-i9100/gcc8-fix-put-user.patch diff --git a/device/linux-samsung-i9100/APKBUILD b/device/linux-samsung-i9100/APKBUILD index 4e279eb33..4ac0d356d 100644 --- a/device/linux-samsung-i9100/APKBUILD +++ b/device/linux-samsung-i9100/APKBUILD @@ -1,125 +1,93 @@ -# Based on linux-lg-mako. Changes: -# - add findutils makedepend (necessary for the initramfs) -# - it builds an initramfs - do not use ramdisk.cpio and -# ramdisk-recovery-device.cpio, in there, always use the -# initramfs from the recovery partition ("isorec") -# - directly boot to that initramfs, not only when the recovery -# key combination was pressed. -# - use Alpine's busybox-static instead of the pre-compiled -# binary, that comes with the source -# -# Kernel config changes, based on: arch/arm/configs/i9100_defconfig -# - enable devtmpfs (needed for udev -> touch support in weston) -# - change compression from CONFIG_KERNEL_LZMA=y to -# CONFIG_KERNEL_GZIP=y (so it works with busybox) -# - disable ANDROID_PARANOID_NETWORK (removes network restrictions) +# Reference: +# Kernel config based on: arch/arm/configs/i9100_defconfig -_vendor=samsung -_flavor=samsung-i9100 -_hash="349a3e91e76d17e67ef6213e1f6712e700695631" -_config="config-${_flavor}.armhf" - -pkgname=linux-${_flavor} +pkgname=linux-samsung-i9100 pkgver=3.0.101 -case $pkgver in - *.*.*) _kernver=${pkgver%.*};; - *.*) _kernver=$pkgver;; -esac -pkgrel=11 +pkgrel=12 +pkgdesc="Samsung Galaxy SII kernel fork" arch="armhf" -pkgdesc="Samsung Galaxy SII kernel from LineageOS" -url="https://github.com/LineageOS/android_kernel_samsung_smdk4412" -depends="" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev -findutils busybox-static-armhf gcc6" +_carch="arm" +_flavor="samsung-i9100" +url="https://kernel.org" +license="GPL-2.0-only" options="!strip !check !tracedeps" -install= +makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev + findutils busybox-static-armhf" + +# Compiler: latest GCC from Alpine +HOSTCC="${CC:-gcc}" +HOSTCC="${HOSTCC#${CROSS_COMPILE}}" + +# Source +_repository="android_kernel_samsung_smdk4412" +_commit="349a3e91e76d17e67ef6213e1f6712e700695631" +_config="config-${_flavor}.${arch}" source=" - $pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_samsung_smdk4412/archive/${_hash}.tar.gz + $pkgname-$_commit.tar.gz::https://github.com/LineageOS/${_repository}/archive/${_commit}.tar.gz $_config - compiler-gcc6.h + gcc7-give-up-on-ilog2-const-optimizations.patch + gcc8-fix-put-user.patch init " -subpackages="" -license="GPL2" -_abi_release=${pkgver} -_carch="arm" - -# 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 - -ksrcdir="$srcdir/android_kernel_samsung_smdk4412-${_hash}" - -prepare() { - local _patch_failed= - cd "$ksrcdir" - - # first apply patches in specified order - for i in $source; do - case $i in - *.patch) - msg "Applying $i..." - if ! patch -s -p1 -N -i "$srcdir"/$i; then - echo $i >>failed - _patch_failed=1 - fi - ;; - esac - done - - if ! [ -z "$_patch_failed" ]; then - error "The following patches failed:" - cat failed - return 1 - fi +builddir="$srcdir/$_repository-${_commit}" +prepare_isorec() { # Use Alpine's busybox.static instead of the pre-compiled busybox shipped # with the source cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \ - "$ksrcdir"/usr/galaxys2_initramfs_files/busybox + "$builddir"/usr/galaxys2_initramfs_files/busybox # do not use ramdisk.cpio and ramdisk-recovery-device.cpio, always use # the initramfs from the recovery partition ("isorec"), so we can build # it later and independently from the kernel. also directly boot that # partition, not only when the recovery key combination was used. - cd "$ksrcdir"/usr/ + cd "$builddir"/usr/ mv galaxys2_initramfs.list galaxys2_initramfs.list_old grep -v "../../ramdisk" galaxys2_initramfs.list_old > galaxys2_initramfs.list - cp -v "$srcdir"/init "$ksrcdir"/usr/galaxys2_initramfs_files/init + cp -v "$srcdir"/init "$builddir"/usr/galaxys2_initramfs_files/init - # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/" + # Paths supplied to gen_initramfs_list.sh are prefixed with "source/". + ln -s "$builddir" ln -s "$builddir"/source +} - mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config - make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ - silentoldconfig +prepare() { + default_prepare + prepare_isorec + + cd "$builddir" + downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC" } build() { - cd "$srcdir"/build unset LDFLAGS make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" } package() { - install -Dm644 "$srcdir/build/arch/arm/boot/zImage" \ - "$pkgdir/boot/vmlinuz-$_flavor" - - install -D "$srcdir/build/include/config/kernel.release" \ + # kernel.release + install -D "$builddir/include/config/kernel.release" \ "$pkgdir/usr/share/kernel/$_flavor/kernel.release" + + # zImage (find the right one) + cd "$builddir/arch/$_carch/boot" + _target="$pkgdir/boot/vmlinuz-$_flavor" + for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do + [ -e "$_zimg" ] || continue + msg "zImage found: $_zimg" + install -Dm644 "$_zimg" "$_target" + break + done + if ! [ -e "$_target" ]; then + error "Could not find zImage in $PWD!" + return 1 + fi } sha512sums="285ffd2c82d0444b99da583573d19443b73de22d7382aae54413af229a28bebf4ea32ecbe248ae54ae64bbbc0af7d722b1ef86d5dd099e2990dcc6284fb195fa linux-samsung-i9100-349a3e91e76d17e67ef6213e1f6712e700695631.tar.gz 087372ce82f8eae44694d7c6288822e5565c6bbed3a07cb42a6b009fa25a84a16ec44d76fe5f504bcf945e28237e1d62cf3686d1a60126525e3fdea2613cbb3c config-samsung-i9100.armhf -d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h +77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch +0b33408a0c024c6a9103cc1006bf1534d0146333815a91406a8ae87ce5ec09da0ec427f2c7df211ecbd0a0a59206b3757f6196b9f2d3963734acc69807a5bbf2 gcc8-fix-put-user.patch dd4094d5f4ec281d32f12af88cb22a782e497c8e52f69cf60b73ac7d6171fc95f1f8040b3d0ad2ff3f016d22ac1d91c5b522e5d03203534a76742bc55a082af5 init" diff --git a/device/linux-samsung-i9100/compiler-gcc6.h b/device/linux-samsung-i9100/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/device/linux-samsung-i9100/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-i9100/gcc7-give-up-on-ilog2-const-optimizations.patch b/device/linux-samsung-i9100/gcc7-give-up-on-ilog2-const-optimizations.patch new file mode 120000 index 000000000..da3d1ed41 --- /dev/null +++ b/device/linux-samsung-i9100/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-i9100/gcc8-fix-put-user.patch b/device/linux-samsung-i9100/gcc8-fix-put-user.patch new file mode 120000 index 000000000..1d40b2674 --- /dev/null +++ b/device/linux-samsung-i9100/gcc8-fix-put-user.patch @@ -0,0 +1 @@ +../../.shared-patches/linux/gcc8-fix-put-user.patch \ No newline at end of file