diff options
| -rw-r--r-- | libre/aif-libre/PKGBUILD | 3 | ||||
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 252 | ||||
| -rw-r--r-- | libre/linux-libre/change-default-console-loglevel.patch | 13 | ||||
| -rw-r--r-- | libre/linux-libre/config.i686 | 1 | ||||
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 1 | ||||
| -rw-r--r-- | libre/linux-libre/fix-i915.patch | 1 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.install | 3 | ||||
| -rw-r--r-- | libre/linux-libre/linux-libre.preset | 1 |
8 files changed, 164 insertions, 111 deletions
diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD index 96b874fd5..0751fb372 100644 --- a/libre/aif-libre/PKGBUILD +++ b/libre/aif-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Dieter Plaetinck <dieter@plaetinck.be> pkgname=aif-libre -pkgver=2011.07.20 +pkgver=2011.08.1 pkgrel=1 pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)" arch=('any') @@ -34,3 +34,4 @@ build() { } # vim:set ts=2 sw=2 et: +md5sums=('f4e5215cd27354e3915878d4c2bcee09') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e219e6b91..312f129e9 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -8,49 +8,61 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - _kernelname=${pkgname#linux-libre} _basekernel=3.0 pkgver=${_basekernel} -pkgrel=2 -makedepends=('xmlto' 'docbook-xsl') -arch=(i686 x86_64) -license=('GPL2') +pkgrel=3 +arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org" -options=(!strip) +license=('GPL2') +makedepends=('xmlto' 'docbook-xsl') +options=('!strip') source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.xz # the main kernel config files - config.i686 config.x86_64 + 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk - ${pkgname}.preset - boot-logo.patch - fix-i915.patch) + "${pkgname}.preset" + 'boot-logo.patch' + 'fix-i915.patch' + 'change-default-console-loglevel.patch') md5sums=('44e7bc20c235a193f9b6123a8d5e9509' - 'd4805e76a2b0c883ed8269f3dad601fb' - 'fbefcac9fecd28e4d2e12dbee77f6602' - '18341549f090fc403d7f4c47fff395a4' + '66dff8af6b00eb8d054b2af85aaa5ef7' + '1a98b8b8f2140ac8f95c3814cba8cc95' + '7af24ad1789055e991b1e1f090ff276d' '04b21c79df0a952c22d681dd4f4562df' - 'fe04ae7274a1f76ba2a8054aec60ef08') + '263725f20c0b9eb9c353040792d644e5' + '7396b811db06dec0250a1a098f527b83') build() { - cd ${srcdir}/linux-$pkgver - #patch -p1 -i ${srcdir}/patch-${pkgver} - + # fix #19234 i1915 display size patch -Np1 -i ${srcdir}/fix-i915.patch -# Add freedo as boot logo + # Add freedo as boot logo patch -Np1 -i ${srcdir}/boot-logo.patch + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) + # remove this when a Kconfig knob is made available by upstream + # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) + patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + cat $srcdir/config.$CARCH > ./.config # simpler if [ "${_kernelname}" != "" ]; then sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config fi - # remove the extraversion from Makefile + + # remove the "-libre" extraversion from Makefile # this ensures our kernel version is always 3.X-LIBRE # this way, minor kernel updates will not break external modules # we need to change this soon, see FS#16702 sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile + + # remove the sublevel from Makefile + # this ensures our kernel version is always 3.X-ARCH + sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile + # get kernel version make prepare + # load configuration # Configure the kernel. Replace the line below with one of your choice. #make menuconfig # CLI menu for configuration @@ -58,13 +70,16 @@ build() { #make xconfig # X-based configuration #make oldconfig # using old config from previous kernel version # ... or manually edit .config + #################### # stop here # this is useful to configure the kernel #msg "Stopping build" #return 1 #################### + yes "" | make config + # build! make ${MAKEFLAGS} bzImage modules } @@ -72,44 +87,49 @@ build() { package_linux-libre() { pkgdesc="The Linux-libre Kernel and modules" groups=('base') - backup=(etc/mkinitcpio.d/${pkgname}.preset) depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=$pkgver") conflicts=('kernel26' 'linux') replaces=('kernel26' 'linux') + backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install - optdepends=('crda: to set the correct wireless channels of your country') + + cd "${srcdir}/linux-${pkgver}" KARCH=x86 - cd ${srcdir}/linux-${pkgver} + # get kernel version _kernver="$(make kernelrelease)" - mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot} - make INSTALL_MOD_PATH=${pkgdir} modules_install - cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz-${pkgname} + + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + make INSTALL_MOD_PATH="${pkgdir}" modules_install + cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgname}" + # add vmlinux - install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux + install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" # install fallback mkinitcpio.conf file and preset file for kernel - install -m644 -D ${srcdir}/${pkgname}.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset + install -D -m644 "${srcdir}/${pkgname}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" + # set correct depmod command for install sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ - -i $startdir/${pkgname}.install + -i "${startdir}/${pkgname}.install" sed \ -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgname}.img\"|g" \ -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgname}-fallback.img\"|g" \ - -i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset + -i "${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset" # remove build and source links - rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build} + rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # add compat symlink for the kernel image - ln -sf vmlinuz-${pkgname} ${pkgdir}/boot/vmlinuz26${_kernelname} + ln -sf vmlinuz-${pkgname} "${pkgdir}/boot/vmlinuz26${_kernelname}" # remove the firmware - rm -rf ${pkgdir}/lib/firmware + rm -rf "${pkgdir}/lib/firmware" # gzip -9 all modules to safe 100MB of space - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; } package_linux-libre-headers() { @@ -117,111 +137,130 @@ package_linux-libre-headers() { provides=('kernel26-headers' "linux-headers=$pkgver") conflicts=('kernel26-headers' 'linux-headers') replaces=('kernel26-headers' 'linux-headers') - mkdir -p ${pkgdir}/lib/modules/${_kernver} - cd ${pkgdir}/lib/modules/${_kernver} + + mkdir -p "${pkgdir}/lib/modules/${_kernver}" + + cd "${pkgdir}/lib/modules/${_kernver}" ln -sf ../../../usr/src/linux-${_kernver} build - cd ${srcdir}/linux-$pkgver + + cd "${srcdir}/linux-$pkgver" install -D -m644 Makefile \ - ${pkgdir}/usr/src/linux-${_kernver}/Makefile + "${pkgdir}/usr/src/linux-${_kernver}/Makefile" install -D -m644 kernel/Makefile \ - ${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile + "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile" install -D -m644 .config \ - ${pkgdir}/usr/src/linux-${_kernver}/.config - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include + "${pkgdir}/usr/src/linux-${_kernver}/.config" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" for i in acpi asm-generic config crypto drm generated linux math-emu \ media net pcmcia scsi sound trace video xen; do - cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/ + cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/" done # copy arch includes for external modules - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 - cp -a arch/x86/include ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/ + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/x86" + cp -a arch/x86/include "${pkgdir}/usr/src/linux-${_kernver}/arch/x86/" + + # copy files necessary for later builds + cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" + cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" - # copy files necessary for later builds, like nvidia and vmware - cp Module.symvers ${pkgdir}/usr/src/linux-${_kernver} - cp -a scripts ${pkgdir}/usr/src/linux-${_kernver} # fix permissions on scripts dir - chmod og-w -R ${pkgdir}/usr/src/linux-${_kernver}/scripts - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions + chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions" - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel" - cp arch/$KARCH/Makefile ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/ - if [ "$CARCH" = "i686" ]; then - cp arch/$KARCH/Makefile_32.cpu ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/ + cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + + if [ "${CARCH}" = "i686" ]; then + cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" fi - cp arch/$KARCH/kernel/asm-offsets.s ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel/ + + cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/" # add headers for lirc package - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video - cp drivers/media/video/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/ + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video" + + cp drivers/media/video/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/" + for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i - cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" + cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}" done + # add docbook makefile install -D -m644 Documentation/DocBook/Makefile \ - ${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile + "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" + # add dm headers - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/md - cp drivers/md/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/md + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md" + # add inotify.h - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/linux - cp include/linux/inotify.h ${pkgdir}/usr/src/linux-${_kernver}/include/linux/ + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux" + cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/" + # add wireless headers - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/ - cp net/mac80211/*.h ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/ + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" + # add dvb headers for external modules # in reference to: # http://bugs.archlinux.org/task/9912 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core - cp drivers/media/dvb/dvb-core/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/ - # add dvb headers for external modules - # in reference to: + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core" + cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/" + # and... # http://bugs.archlinux.org/task/11194 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/ - cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/ + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/" + # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # in reference to: # http://bugs.archlinux.org/task/13146 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - cp drivers/media/dvb/frontends/lgdt330x.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - cp drivers/media/video/msp3400-driver.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - # add dvb headers + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + + # add dvb headers # in reference to: # http://bugs.archlinux.org/task/20402 - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb - cp drivers/media/dvb/dvb-usb/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/ - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends - cp drivers/media/dvb/frontends/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/ - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners - cp drivers/media/common/tuners/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/ + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" + cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends" + cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners" + cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/" + # add xfs and shmem for aufs building - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm - cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs" + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/mm" + cp fs/xfs/xfs_sb.h "${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h" + # copy in Kconfig files - for i in `find . -name "Kconfig*"`; do - mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'` - cp $i ${pkgdir}/usr/src/linux-${_kernver}/$i + for i in `find . -name "Kconfig*"`; do + mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'` + cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}" done - chown -R root.root ${pkgdir}/usr/src/linux-${_kernver} - find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \; + chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \; + # strip scripts directory - find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-sharedlib*) # Libraries (.so) - /usr/bin/strip $STRIP_SHARED "$binary";; - *application/x-archive*) # Libraries (.a) - /usr/bin/strip $STRIP_STATIC "$binary";; - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done + find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do + case "$(file -bi "${binary}")" in + *application/x-sharedlib*) # Libraries (.so) + /usr/bin/strip ${STRIP_SHARED} "${binary}";; + *application/x-archive*) # Libraries (.a) + /usr/bin/strip ${STRIP_STATIC} "${binary}";; + *application/x-executable*) # Binaries + /usr/bin/strip ${STRIP_BINARIES} "${binary}";; + esac + done + # remove unneeded architectures - rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} } package_linux-libre-docs() { @@ -229,11 +268,16 @@ package_linux-libre-docs() { provides=('kernel26-docs' "linux-docs=$pkgver") conflicts=('kernel26-docs' 'linux-docs') replaces=('kernel26-docs' 'linux-docs') - cd ${srcdir}/linux-$pkgver - mkdir -p $pkgdir/usr/src/linux-$_kernver - mv Documentation $pkgdir/usr/src/linux-$_kernver - find $pkgdir -type f -exec chmod 444 {} \; - find $pkgdir -type d -exec chmod 755 {} \; + + cd "${srcdir}/linux-$pkgver" + + mkdir -p "$pkgdir/usr/src/linux-$_kernver" + cp -r Documentation "$pkgdir/usr/src/linux-$_kernver" + find "${pkgdir}" -type f -exec chmod 444 {} \; + find "${pkgdir}" -type d -exec chmod 755 {} \; + # remove a file already in linux package - rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile + rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" } + +# vim:set ts=2 sw=2 et: diff --git a/libre/linux-libre/change-default-console-loglevel.patch b/libre/linux-libre/change-default-console-loglevel.patch new file mode 100644 index 000000000..cec208ee8 --- /dev/null +++ b/libre/linux-libre/change-default-console-loglevel.patch @@ -0,0 +1,13 @@ +diff -upr linux-3.0.orig/kernel/printk.c linux-3.0/kernel/printk.c +--- linux-3.0.orig/kernel/printk.c 2011-07-22 05:17:23.000000000 +0300 ++++ linux-3.0/kernel/printk.c 2011-07-27 14:43:07.000000000 +0300 +@@ -58,7 +58,7 @@ void asmlinkage __attribute__((weak)) ea + + /* We show everything that is MORE important than this.. */ + #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */ +-#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */ ++#define DEFAULT_CONSOLE_LOGLEVEL 4 /* anything MORE serious than KERN_DEBUG */ + + DECLARE_WAIT_QUEUE_HEAD(log_wait); + + diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index d9568618a..8bd0cbe40 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -5770,4 +5770,3 @@ CONFIG_CPU_RMAP=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y - diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index e4b5086d5..8d40df599 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -5511,4 +5511,3 @@ CONFIG_CPU_RMAP=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y - diff --git a/libre/linux-libre/fix-i915.patch b/libre/linux-libre/fix-i915.patch index 96654047b..3b631361a 100644 --- a/libre/linux-libre/fix-i915.patch +++ b/libre/linux-libre/fix-i915.patch @@ -24,4 +24,3 @@ index dc83b7a..c8f67bf 100644 I915_WRITE(TV_CTL, tv_ctl); I915_WRITE(TV_DAC, tv_dac); POSTING_READ(TV_DAC); - diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 67907bf56..59674365a 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.0.0-LIBRE +KERNEL_VERSION=3.0-LIBRE post_install () { # updating module dependencies @@ -56,4 +56,3 @@ post_remove() { rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}.img rm -f boot/{initramfs-linux,kernel26}-libre${KERNEL_NAME}-fallback.img } - diff --git a/libre/linux-libre/linux-libre.preset b/libre/linux-libre/linux-libre.preset index e000cf584..eeed678dc 100644 --- a/libre/linux-libre/linux-libre.preset +++ b/libre/linux-libre/linux-libre.preset @@ -12,4 +12,3 @@ default_image="/boot/initramfs-linux.img" #fallback_config="/etc/mkinitcpio.conf" fallback_image="/boot/initramfs-linux-fallback.img" fallback_options="-S autodetect" - |