diff options
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/linux-libre/config.i686 | 6 | ||||
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 6 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.install | 10 | ||||
| -rw-r--r-- | ~fauno/minidjvu/PKGBUILD | 7 |
5 files changed, 28 insertions, 20 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index a4b891b52..8548fc33b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.1 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -68,9 +68,12 @@ build() { patch -Np1 -i ${srcdir}/${_basekernel}.*-*-loongson-community.patch patch -Np0 -i "${srcdir}/lxo-config.patch" -# ensure N32 - sed -i "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" ./.config - sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config +# ensure N32, add localversion and remove uevent helper as per +# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README + sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ + -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=\"-LIBRE\"|g" ./.config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler fi @@ -343,10 +346,10 @@ package_linux-libre-docs() { rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } md5sums=('d73df15ab1d36fe3c102755d8f42117f' - '06b461d4db995ddcbecbf345ae3b8987' - '84475b01ec148cb1f367bba20025a148' - '7d8fac41f4c4c2d14d8c65645fb676bd' - '2a0302eda795903d3b01e41ba807c91e' + 'cb42276bca126c676c51d02d74bf7fe7' + '1cf576c8c91e88ba4be55eb53979135e' + '267ea59695619730032f89ac70bf9391' + '5a415fc0c864dc3f5c4afa63f1506c52' 'a8a3843046926eb7ab81312cd438c5c5' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 43bf1d3c3..e056a28d6 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.1.1-1 Kernel Configuration +# Linux/i386 3.1.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5329,7 +5329,7 @@ CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_MINIX_FS=m CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -5404,7 +5404,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_MSDOS_PARTITION=y CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_MINIX_SUBPARTITION=y CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_UNIXWARE_DISKLABEL is not set CONFIG_LDM_PARTITION=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 6011a797a..e528ee7eb 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.1.1-1 Kernel Configuration +# Linux/x86_64 3.1.6-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -5092,7 +5092,7 @@ CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # CONFIG_VXFS_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_MINIX_FS=m CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set @@ -5167,7 +5167,7 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_MAC_PARTITION=y CONFIG_MSDOS_PARTITION=y CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set +CONFIG_MINIX_SUBPARTITION=y CONFIG_SOLARIS_X86_PARTITION=y # CONFIG_UNIXWARE_DISKLABEL is not set CONFIG_LDM_PARTITION=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index d75b48c8f..badaceefd 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.1.5-1-LIBRE +KERNEL_VERSION=3.1.6-1-LIBRE post_install () { # updating module dependencies @@ -43,11 +43,9 @@ post_upgrade() { echo ">>>" fi - if grep "^[^#]*[[:space:]]/boot" etc/fstab 2>&1 >/dev/null; then - if ! grep "[[:space:]]/boot" etc/mtab 2>&1 >/dev/null; then - echo "WARNING: /boot appears to be a seperate partition but is not mounted." - echo " You probably just broke your system. Congratulations." - fi + if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then + echo "WARNING: /boot appears to be a separate partition but is not mounted." + echo " You probably just broke your system. Congratulations." fi # updating module dependencies diff --git a/~fauno/minidjvu/PKGBUILD b/~fauno/minidjvu/PKGBUILD index 42950e5d2..664e8a3f8 100644 --- a/~fauno/minidjvu/PKGBUILD +++ b/~fauno/minidjvu/PKGBUILD @@ -14,10 +14,17 @@ md5sums=('b354eb74d83c6e2d91aab2a6c2879ba7') build() { cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib + sed -i -e 's#/usr/bin/gzip#/bin/gzip#' Makefile sed -i -e 's#-9 \$(MANDIR)#-9 $(DESTDIR)$(MANDIR)#' Makefile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" mkdir -p "$pkgdir"/usr/{bin,lib,share/man/man1} make DESTDIR="$pkgdir/" install } |