diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 12 | ||||
-rw-r--r-- | libre/linux-libre-grsec/gnewsense-binutils-flag.patch | 28 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 12 | ||||
-rw-r--r-- | libre/linux-libre-lts/gnewsense-binutils-flag.patch | 28 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 14 | ||||
-rw-r--r-- | libre/linux-libre/gnewsense-binutils-flag.patch | 28 |
6 files changed, 28 insertions, 94 deletions
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 91e6d6e24..a6ab2b46b 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -32,23 +32,26 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch" "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig" # the main kernel config files - 'config.i686' 'config.x86_64' + 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' - ) + # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ + '3.15.7-2704e67ebc-loongson-community.patch') sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688' 'c58b09c71666a79f5dcf83d05aaa5d64ab3fb83782a7dadabdc1a4e29c5b09ab' '13f4ca6702a9985c68e045b510552f5f122938e1ed3264990aaae82a4f64d67a' 'SKIP' 'd47cc4487a687782d4010c81002a48ee0171981863ab38b9f656d6e780d4a297' 'b4e55b41c014df808daad8105e4cbbf684df94641c213d2d9e6fc87e2a4ea59f' + '' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' - 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182') + 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' + '') _kernelname=${pkgbase#linux-libre} _replaces=("${_replaces[@]/\%/${_kernelname}}") @@ -82,6 +85,9 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -p1 -i "${srcdir}/change-default-console-loglevel.patch" + # Adding loongson-community patch + patch -p1 -i ${srcdir}/3.15.7-2704e67ebc-loongson-community.patch + cat "${srcdir}/config.${CARCH}" > ./.config if [ "${_kernelname}" != "" ]; then diff --git a/libre/linux-libre-grsec/gnewsense-binutils-flag.patch b/libre/linux-libre-grsec/gnewsense-binutils-flag.patch deleted file mode 100644 index 5f2d44f99..000000000 --- a/libre/linux-libre-grsec/gnewsense-binutils-flag.patch +++ /dev/null @@ -1,28 +0,0 @@ -Our binutils somehow ended up with a -mfix-gs2f-kernel, rather than --mfix-ls2f-kernel. Cope with it. - -Index: arch/mips/loongson/Platform -=================================================================== ---- arch/mips/loongson/Platform.orig 2010-10-25 19:09:49.000000000 +0000 -+++ arch/mips/loongson/Platform 2010-10-25 19:10:44.000000000 +0000 -@@ -10,6 +10,12 @@ - $(call cc-option,-march=loongson2f,-march=r4600) - # Enable the workarounds for Loongson2f - ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS -+ ifneq ($(call as-option,-Wa$(comma)-mfix-gs2f-kernel,),) -+ cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-gs2f-kernel -+ ifneq ($(CONFIG_CPU_NOP_WORKAROUNDS),$(CONFIG_CPU_JUMP_WORKAROUNDS)) -+ cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-gs2f-kernel -+ endif -+ else - ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),) - $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop) - else -@@ -20,6 +26,7 @@ - else - cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump - endif -+ endif - endif - - # diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index c92fc46f1..8858fce8e 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -25,7 +25,7 @@ options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" # the main kernel config files - 'config.i686' 'config.x86_64' + 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} @@ -34,12 +34,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' '0006-genksyms-fix-typeof-handling.patch' - ) + # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ + '3.14.14-a410a5e2b7-loongson-community.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'f747eeb343d5105bcd1a1b02ce391c746bccbce62e58394b674fc553be844ccc' '9e7dcc90121995024632476d50286b62dbb73da20a7970653a2d72a0a98406c0' '35f283689c4f8b346bc05ac57c3cce50a61a1d0c11a665fc1abf519bb3f1beea' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' @@ -47,7 +49,8 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7') + 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' + '') _kernelname=${pkgbase#linux-libre} _replaces=("${_replaces[@]/\%/${_kernelname}}") @@ -88,6 +91,9 @@ prepare() { # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" + # Adding loongson-community patch + patch -p1 -i ${srcdir}/3.14.14-a410a5e2b7-loongson-community.patch + cat "${srcdir}/config.${CARCH}" > ./.config if [ "${_kernelname}" != "" ]; then diff --git a/libre/linux-libre-lts/gnewsense-binutils-flag.patch b/libre/linux-libre-lts/gnewsense-binutils-flag.patch deleted file mode 100644 index 5f2d44f99..000000000 --- a/libre/linux-libre-lts/gnewsense-binutils-flag.patch +++ /dev/null @@ -1,28 +0,0 @@ -Our binutils somehow ended up with a -mfix-gs2f-kernel, rather than --mfix-ls2f-kernel. Cope with it. - -Index: arch/mips/loongson/Platform -=================================================================== ---- arch/mips/loongson/Platform.orig 2010-10-25 19:09:49.000000000 +0000 -+++ arch/mips/loongson/Platform 2010-10-25 19:10:44.000000000 +0000 -@@ -10,6 +10,12 @@ - $(call cc-option,-march=loongson2f,-march=r4600) - # Enable the workarounds for Loongson2f - ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS -+ ifneq ($(call as-option,-Wa$(comma)-mfix-gs2f-kernel,),) -+ cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-gs2f-kernel -+ ifneq ($(CONFIG_CPU_NOP_WORKAROUNDS),$(CONFIG_CPU_JUMP_WORKAROUNDS)) -+ cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-gs2f-kernel -+ endif -+ else - ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),) - $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop) - else -@@ -20,6 +26,7 @@ - else - cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump - endif -+ endif - endif - - # diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index a2477e7d2..486038263 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -25,23 +25,26 @@ options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz" # the main kernel config files - 'config.i686' 'config.x86_64' + 'config.i686' 'config.x86_64' 'config.mips64el' # standard config files for mkinitcpio ramdisk 'linux.preset' 'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm} 'change-default-console-loglevel.patch' 'compal-laptop-hwmon-fix.patch' - ) + # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/ + '3.16-7981337ad0-loongson-community.patch') sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218' '3bbc78694d76b12b6229799d7c4daf5215b9dd731908d96b03603aceb54ad5c7' '65739ffbc01d1ecea8328130b14e0258aa036e37ede2f0b1aa9b8efa2ad68a66' '0d827a89f8955e1f39b6a6d10887d1ca7a46b42cc4417bf823eb9f260c26f660' + '' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' '074b67818582874146c389c029bc43648d145891a27e47aa2c5c42d3571f0264' '2e87a8ec1cc0c91938cac24992d8a3d4362b3e9d939767e4c9d2ec8e6d969d53' 'f67f60a30bcf2e9a2ba88ad97cace308da7a7f94919bb95c3dc030f5885a8015' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - 'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588') + 'f36f61a0a72bcb0a9c04264343503bfbf927c9ea0db819e66734a3933b060588' + '') _kernelname=${pkgbase#linux-libre} _replaces=("${_replaces[@]/\%/${_kernelname}}") @@ -74,9 +77,12 @@ prepare() { # #41458 fix hwmon for compal-laptop module patch -p1 -i "${srcdir}/compal-laptop-hwmon-fix.patch" + # Adding loongson-community patch + patch -p1 -i ${srcdir}/3.16-7981337ad0-loongson-community.patch + cat "${srcdir}/config.${CARCH}" > ./.config - if [ "${_kernelname}" != "" ]; then + if [ "${_kernelname}" == "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config fi diff --git a/libre/linux-libre/gnewsense-binutils-flag.patch b/libre/linux-libre/gnewsense-binutils-flag.patch deleted file mode 100644 index 5f2d44f99..000000000 --- a/libre/linux-libre/gnewsense-binutils-flag.patch +++ /dev/null @@ -1,28 +0,0 @@ -Our binutils somehow ended up with a -mfix-gs2f-kernel, rather than --mfix-ls2f-kernel. Cope with it. - -Index: arch/mips/loongson/Platform -=================================================================== ---- arch/mips/loongson/Platform.orig 2010-10-25 19:09:49.000000000 +0000 -+++ arch/mips/loongson/Platform 2010-10-25 19:10:44.000000000 +0000 -@@ -10,6 +10,12 @@ - $(call cc-option,-march=loongson2f,-march=r4600) - # Enable the workarounds for Loongson2f - ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS -+ ifneq ($(call as-option,-Wa$(comma)-mfix-gs2f-kernel,),) -+ cflags-$(CONFIG_CPU_NOP_WORKAROUNDS) += -Wa$(comma)-mfix-gs2f-kernel -+ ifneq ($(CONFIG_CPU_NOP_WORKAROUNDS),$(CONFIG_CPU_JUMP_WORKAROUNDS)) -+ cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-gs2f-kernel -+ endif -+ else - ifeq ($(call as-option,-Wa$(comma)-mfix-loongson2f-nop,),) - $(error only binutils >= 2.20.2 have needed option -mfix-loongson2f-nop) - else -@@ -20,6 +26,7 @@ - else - cflags-$(CONFIG_CPU_JUMP_WORKAROUNDS) += -Wa$(comma)-mfix-loongson2f-jump - endif -+ endif - endif - - # |