From 9e47dc2b1e0987d3b00ecc5314b84f79d39c1a0a Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 7 Sep 2017 23:37:47 +0000 Subject: [PATCH] core/linux-odroid-c1 to 3.10.107-2 --- core/linux-odroid-c1/0001-disable-pie.patch | 30 +++++++++++++++++++++ core/linux-odroid-c1/PKGBUILD | 6 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 core/linux-odroid-c1/0001-disable-pie.patch diff --git a/core/linux-odroid-c1/0001-disable-pie.patch b/core/linux-odroid-c1/0001-disable-pie.patch new file mode 100644 index 000000000..6cc2c9aee --- /dev/null +++ b/core/linux-odroid-c1/0001-disable-pie.patch @@ -0,0 +1,30 @@ +From cc2bf49fc88e52aae8464f8c9876855cb1ab21dd Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Thu, 7 Sep 2017 12:50:39 -0600 +Subject: [PATCH] disable pie + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index ed83376624f..6217f927d55 100644 +--- a/Makefile ++++ b/Makefile +@@ -374,11 +374,11 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ + -Werror-implicit-function-declaration \ + -Wno-format-security \ + -fno-delete-null-pointer-checks \ +- -std=gnu89 ++ -std=gnu89 $(call cc-option,-fno-PIE) + + KBUILD_AFLAGS_KERNEL := + KBUILD_CFLAGS_KERNEL := +-KBUILD_AFLAGS := -D__ASSEMBLY__ ++KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE) + KBUILD_AFLAGS_MODULE := -DMODULE + KBUILD_CFLAGS_MODULE := -DMODULE + KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds +-- +2.14.1 + diff --git a/core/linux-odroid-c1/PKGBUILD b/core/linux-odroid-c1/PKGBUILD index a5630f9f8..2a524cab3 100644 --- a/core/linux-odroid-c1/PKGBUILD +++ b/core/linux-odroid-c1/PKGBUILD @@ -9,7 +9,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-C1" pkgver=3.10.107 -pkgrel=1 +pkgrel=2 arch=('armv7h') url="https://github.com/hardkernel/linux" license=('GPL2') @@ -17,10 +17,12 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools') options=('!strip') source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz" "git+https://github.com/mdrjr/c1_bootini.git" + '0001-disable-pie.patch' 'config' 'amlogic.service') md5sums=('fbdd73c858eae0d4c8b314077a0a16a2' 'SKIP' + 'a2329e6dcdc856559fbd8b0847b3b55d' 'c27274182cbe6e22dcf5b12ad84f4585' 'b8956789318f49cec5b8bb0b41654a9b') @@ -34,6 +36,8 @@ prepare() { # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh + + git apply ../0001-disable-pie.patch } build() {