From 5268f103bae77b153904cfbecc0f6fc743260479 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 24 Jan 2017 01:00:39 +0000 Subject: [PATCH] core/linux-armv7-rc to 4.10.rc5-1 --- ...ags-add-support-for-Marvell-s-u-boot.patch | 2 +- ...trieve-MAC-addresses-from-Marvell-bo.patch | 2 +- .../0003-SMILE-Plug-device-tree-file.patch | 6 +-- .../0004-fix-mvsdio-eMMC-timing.patch | 2 +- ...ow-mac-address-to-be-set-as-a-parame.patch | 2 +- ...SoC-Audio-Codec-Fix-errors-reported-.patch | 2 +- ...-set-default-cubietruck-led-triggers.patch | 2 +- ...d-set-higher-minimum-buck2-regulator.patch | 2 +- .../0009-drm-armada-tracing-fix.patch | 2 +- core/linux-armv7-rc/99-linux.hook | 11 ++++ core/linux-armv7-rc/PKGBUILD | 51 ++++++++++++------- core/linux-armv7-rc/cmdline | 1 - core/linux-armv7-rc/config | 2 +- core/linux-armv7-rc/linux-armv7-rc.install | 6 ++- core/linux-armv7-rc/linux.preset | 10 ++++ 15 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 core/linux-armv7-rc/99-linux.hook delete mode 100644 core/linux-armv7-rc/cmdline create mode 100644 core/linux-armv7-rc/linux.preset diff --git a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch index 4bf849d62..d8af5cd53 100644 --- a/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch +++ b/core/linux-armv7-rc/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch @@ -1,4 +1,4 @@ -From ce5295efea45661c5e13354ee03d7073271bf914 Mon Sep 17 00:00:00 2001 +From b9f6d275e5af76eb4e32beb66480e8f53a7d1685 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:59:28 +0100 Subject: [PATCH 1/9] ARM: atags: add support for Marvell's u-boot diff --git a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch index b1317ecfb..ac44398c6 100644 --- a/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch +++ b/core/linux-armv7-rc/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch @@ -1,4 +1,4 @@ -From bcb91efdc2130f91a7bd87d52022ef942aec6a14 Mon Sep 17 00:00:00 2001 +From 3573189a2857cd66d248fb79e48a45ae70399c0b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sun, 2 Dec 2012 19:56:58 +0100 Subject: [PATCH 2/9] ARM: atags/fdt: retrieve MAC addresses from Marvell boot diff --git a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch index 07ca3fe28..931c95877 100644 --- a/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch +++ b/core/linux-armv7-rc/0003-SMILE-Plug-device-tree-file.patch @@ -1,4 +1,4 @@ -From 6112c7b35b2c6c5a02a69f2a4b9ea3c562b7012f Mon Sep 17 00:00:00 2001 +From 94679e069c9def09906a6b5f85c58ebd981ff615 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:41:19 -0600 Subject: [PATCH 3/9] SMILE Plug device tree file @@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index cccdbcb557b6..74b4dcbe8bbd 100644 +index f10fe8526239..f00e858de082 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -933,6 +933,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ +@@ -935,6 +935,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \ armada-370-db.dtb \ armada-370-dlink-dns327l.dtb \ armada-370-mirabox.dtb \ diff --git a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch index 25a92d54c..bd053eb6b 100644 --- a/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch +++ b/core/linux-armv7-rc/0004-fix-mvsdio-eMMC-timing.patch @@ -1,4 +1,4 @@ -From b1a1331419ffe23e8736fa8b942bd2ca2430a1a9 Mon Sep 17 00:00:00 2001 +From 4831d1d37e42c17f97ae238d6bbcfda7c8dac028 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 5 Sep 2014 15:43:56 -0600 Subject: [PATCH 4/9] fix mvsdio eMMC timing diff --git a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 0d2659574..0434d0794 100644 --- a/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-armv7-rc/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,4 +1,4 @@ -From 158d5a686346c0230093c15a46df00c3cf8a6ec6 Mon Sep 17 00:00:00 2001 +From 079ecb4f368b983d08e7c19daaf64311b8814ee3 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter diff --git a/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch index 1cda8124e..28e4ad8e8 100644 --- a/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch +++ b/core/linux-armv7-rc/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch @@ -1,4 +1,4 @@ -From 68671e2e7cc6ac31bb8bad764b45c88d771f79e4 Mon Sep 17 00:00:00 2001 +From f8ed0685d6606fe27a3e8fc8aa3744f17f9e1956 Mon Sep 17 00:00:00 2001 From: dobatog Date: Thu, 26 Feb 2015 12:32:27 +0100 Subject: [PATCH 6/9] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported diff --git a/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch b/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch index 8f24efb4e..a13f2e1f8 100644 --- a/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch +++ b/core/linux-armv7-rc/0007-set-default-cubietruck-led-triggers.patch @@ -1,4 +1,4 @@ -From 789190f46370b2c60ba36d7f1793aaed451b925e Mon Sep 17 00:00:00 2001 +From 6a7d1d2fab44c1830903b7af1a8a844ce4925763 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 14 Feb 2015 12:32:27 +0100 Subject: [PATCH 7/9] set default cubietruck led triggers diff --git a/core/linux-armv7-rc/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/core/linux-armv7-rc/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch index 4436c07e9..840572234 100644 --- a/core/linux-armv7-rc/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch +++ b/core/linux-armv7-rc/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch @@ -1,4 +1,4 @@ -From 0d0891b7abde896742d966ca32bc0a45d6bfe5b7 Mon Sep 17 00:00:00 2001 +From 5bd43bf12a2258976be01fe1211de9ad4d8e9145 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 11 Aug 2016 00:42:37 -0600 Subject: [PATCH 8/9] exynos4412-odroid: set higher minimum buck2 regulator diff --git a/core/linux-armv7-rc/0009-drm-armada-tracing-fix.patch b/core/linux-armv7-rc/0009-drm-armada-tracing-fix.patch index 2eb1fd6ae..1b2a16069 100644 --- a/core/linux-armv7-rc/0009-drm-armada-tracing-fix.patch +++ b/core/linux-armv7-rc/0009-drm-armada-tracing-fix.patch @@ -1,4 +1,4 @@ -From 5fe550f8ac792b731055ad12a3aa65e3b7c9529d Mon Sep 17 00:00:00 2001 +From 24b08faa09d097e432fe36817dce69335c63d412 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 26 Dec 2016 12:56:09 -0700 Subject: [PATCH 9/9] drm/armada tracing fix diff --git a/core/linux-armv7-rc/99-linux.hook b/core/linux-armv7-rc/99-linux.hook new file mode 100644 index 000000000..365b23303 --- /dev/null +++ b/core/linux-armv7-rc/99-linux.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Target = boot/zImage +Target = usr/lib/initcpio/* + +[Action] +Description = Updating %PKGBASE% initcpios +When = PostTransaction +Exec = /usr/bin/mkinitcpio -p %PKGBASE% diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD index b3952669c..ff506c600 100644 --- a/core/linux-armv7-rc/PKGBUILD +++ b/core/linux-armv7-rc/PKGBUILD @@ -4,7 +4,7 @@ buildarch=4 _rcver=4.10 -_rcrel=4 +_rcrel=5 _rcnrel=armv7-x1 pkgbase=linux-armv7-rc @@ -30,26 +30,28 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/testing/${_srcname}.tar.xz '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' '0009-drm-armada-tracing-fix.patch' 'config' - 'cmdline' 'kernel.its' 'kernel.keyblock' - 'kernel_data_key.vbprivk') -md5sums=('a5e775559b20450b34b4824d6751a1fb' - '518e6918185793b106ec2a3a61f6015f' - '430137ab493c2279c0cd13a3570b3449' - 'f8b1e21e890bb5cbc9b0c876467f0772' - '2caa18222d17b6bf0d701939a1dcb8fb' - '90902739306bd9d3a26bdb9e1905ac87' - 'c4e3758113bc37983552cc2889302b7e' - 'cf0ab26b775cbdfc31d06113625bfe19' - '5f1f081fa789b652f42d43548aa5b210' - 'acf706b512918f216a2cf320710f9edc' - '5c0c23275255d7b368fb50258b76499c' - '5a85c2521fc2b1f8a95dba5a64be5a5a' - '1813b39074d01af6548951764a0f6444' + 'kernel_data_key.vbprivk' + 'linux.preset' + '99-linux.hook') +md5sums=('1b07140eb31f7b4f41022d16fb42f38e' + 'ed687dcac40f35737678e506f2df0643' + '214847b73b9001db1362e8bb3f9aed87' + '82ffb2a8297f35e56f8827bd6cc89a32' + '70bc3d3d13f4e77728bbc324dc81a9d3' + '47eae7e2c1d8e41137c4214b3091aa99' + 'cfa66bcafa51215e71be60c63e978e35' + '5f76b742e3d04056a6bb49c1bde4a190' + 'a93178aff351099bdc1932b15c09e506' + 'd9986312d2a15c29cf816a967d3447e1' + '62e75ec9b302e39ac51227ebb4243b76' + 'ab67b6e3b9ec7394f2514ab36b695883' '4f2379ed84258050edb858ee8d281678' '61c5ff73c136ed07a7aadbf58db3d96a' - '584777ae88bce2c5659960151b64c7d8') + '584777ae88bce2c5659960151b64c7d8' + 'ae7ccb81e057c4d81401e725f102ee5f' + '79fa396e3f9a09a85156d6d7c2d34b58') prepare() { cd "${srcdir}/${_srcname}" @@ -112,6 +114,7 @@ _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') + backup=("etc/mkinitcpio.d/${pkgbase}.preset") provides=('kernel26' "linux=${pkgver}") conflicts=('linux') replaces=('linux-mvebu') @@ -137,6 +140,17 @@ _package() { -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ -i "${startdir}/${pkgname}.install" + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + sed \ + -e "1s|'linux.*'|'${pkgbase}'|" \ + -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # install pacman hook for initramfs regeneration + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | + install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook" + # remove build and source links rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware @@ -339,6 +353,7 @@ _package-chromebook() { cp ../kernel.its . mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg dd if=/dev/zero of=bootloader.bin bs=512 count=1 + echo 'console=tty0 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd' > cmdline vbutil_kernel \ --pack vmlinux.kpart \ --version 1 \ @@ -346,7 +361,7 @@ _package-chromebook() { --arch arm \ --keyblock ../kernel.keyblock \ --signprivate ../kernel_data_key.vbprivk \ - --config ../cmdline \ + --config cmdline \ --bootloader bootloader.bin mkdir -p "${pkgdir}/boot" diff --git a/core/linux-armv7-rc/cmdline b/core/linux-armv7-rc/cmdline deleted file mode 100644 index d5e97b036..000000000 --- a/core/linux-armv7-rc/cmdline +++ /dev/null @@ -1 +0,0 @@ -console=tty0 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootwait rw noinitrd diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config index 61e62cbc8..ab23b6fda 100644 --- a/core/linux-armv7-rc/config +++ b/core/linux-armv7-rc/config @@ -3313,7 +3313,7 @@ CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_AD7879_I2C=m CONFIG_TOUCHSCREEN_AD7879_SPI=m CONFIG_TOUCHSCREEN_AR1021_I2C=m -CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_ATMEL_MXT=y # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set CONFIG_TOUCHSCREEN_AUO_PIXCIR=m CONFIG_TOUCHSCREEN_BU21013=m diff --git a/core/linux-armv7-rc/linux-armv7-rc.install b/core/linux-armv7-rc/linux-armv7-rc.install index a81b5475e..1921fb2c7 100644 --- a/core/linux-armv7-rc/linux-armv7-rc.install +++ b/core/linux-armv7-rc/linux-armv7-rc.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-armv7-rc -KERNEL_VERSION=4.8.0-rc1-1-ARCH +KERNEL_VERSION=4.10.0-rc4-1-ARCH post_install () { # updating module dependencies @@ -15,3 +15,7 @@ post_upgrade() { echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} } + +post_remove() { + rm -f boot/initramfs-linux.img +} diff --git a/core/linux-armv7-rc/linux.preset b/core/linux-armv7-rc/linux.preset new file mode 100644 index 000000000..2a4ca8ad6 --- /dev/null +++ b/core/linux-armv7-rc/linux.preset @@ -0,0 +1,10 @@ +# mkinitcpio preset file for the linux-armv7-rc package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="4.10.0-rc4-1-ARCH" + +PRESETS=('default') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-linux.img" +#default_options=""