diff options
Diffstat (limited to 'libre/linux-libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 26 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.preset.mips64el | 14 |
2 files changed, 29 insertions, 11 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 6842b2712..13ca9d56d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -29,8 +29,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild' 'Kbuild.platforms' 'boot-logo.patch' - 'change-default-console-loglevel.patch') - #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") + 'change-default-console-loglevel.patch' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' 'd0ceaebf20b53184c50e7f4980ed45d1' '0b483b23413dbc451f2b041b9a475c03' @@ -38,12 +38,14 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662') -#if [ "$CARCH" != "mips64el" ]; then -# # Don't use the Loongson-specific patches on non-mips64el arches. -# unset source[${#source[@]}-1] -# unset md5sums[${#md5sums[@]}-1] -#fi + '9d3c56a4b999c8bfbd4018089a62f662' + '88d501404f172dac6fcb248978251560' + '5296bf025db8b17613bc7205459564f0') +if [ "$CARCH" != "mips64el" ]; then + # Don't use the Loongson-specific patches on non-mips64el arches. + unset source[${#source[@]}-1] + unset md5sums[${#md5sums[@]}-1] +fi _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE @@ -66,21 +68,23 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ - < "${srcdir}/lxo-config.patch" > lxo-config.patch + < "${srcdir}/config.patch" > config.patch msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -Np0 -i lxo-config.patch + patch -Np0 -i config.patch # ensure N32, add localversion, remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README # and make USB storage support builtin (e.g. for booting from USB # disks without slowly loading an initramfs) +# since 3.4 rtl8187 supports adhoc mode, so batman-adv is enabled again sed -ri \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \ - -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ + -e "s|# CONFIG_BATMAN_ADV is not set|CONFIG_BATMAN_ADV=m|g" \ ./.config + echo -e "CONFIG_BATMAN_ADV_BLA=y\nCONFIG_BATMAN_ADV_DEBUG=n" >> .config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler fi diff --git a/libre/linux-libre/linux-libre.preset.mips64el b/libre/linux-libre/linux-libre.preset.mips64el new file mode 100644 index 000000000..7af90ba7a --- /dev/null +++ b/libre/linux-libre/linux-libre.preset.mips64el @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the 'linux' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-libre" + +PRESETS=('default' 'fallback') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-linux-libre.img" +#default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-linux-libre-fallback.img" +fallback_options="-S autodetect" |