Commit 3e3fad2a authored by Phil's avatar Phil
Browse files

linux: update to tomoyo 2.5

 * add small fixes
Linux-lts: update to tomoyo 2.5
 * add acerhk
parent ef180209
......@@ -2,7 +2,7 @@
source ../_buildscripts/`pwd | cut -d/ -f3`-${_arch}-makepkg.conf
# Pre-Patch settings
_patch="3.1.4"
_prepatch="3.1.5-pre1"
_prepatch="3.1.5-pre2"
_queue="3.1"
# Aufs
_aufs="3.1-20111114"
......@@ -151,8 +151,8 @@ PATCHES=(
### rhbz 754907
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/cciss-fix-irqf-shared.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/hpsa-add-irqf-shared.patch%1
###rhbz 755154
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/rtlwifi-fix-lps_lock-deadlock.patch%1
###rhbz 731365
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/mac80211_offchannel_rework_revert.patch%1
# add quirk for other webcams
http://chakra.sourceforge.net/sources/linux/patches/3.1/bugfix/usb-add-quirk-for-other-webcams.patch%1
......@@ -171,8 +171,15 @@ PATCHES=(
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/acerhk/11_bg-flag.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/acerhk/12_Get-rid-off-bios-error.patch%1
# tomoyo 2.5
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/tomoyo/tomoyo-2.5-backport-from-3.2-rc4-for-3.1.4.patch%1
# other features
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/linux-next/multitouch/0002-HID-hid-multitouch-add-support-for-the-IDEACOM-6650-.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/v4l/0001-media-dvb-usb-prepare-for-multi-frontend-support-MFE.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/v4l/0002-media-dvb-usb-multi-frontend-support-MFE.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/v4l/0003-media-anysee-use-multi-frontend-MFE.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/v4l/0004-media-ttusb2-add-support-for-the-dvb-t-part-of-CT-36.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/v4l/0005-media-dvb-usb-refactor-MFE-code-for-individual-strea.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/ath_override-eeprom-countrycode.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/defaults-fat-utf8.patch%1
http://chakra.sourceforge.net/sources/linux/patches/3.1/features/dm-table-propagate-non-rotational-flag.patch%1
......@@ -181,7 +188,7 @@ PATCHES=(
)
# Name of the resulting patch (will be bzipped afterwards)
PATCHNAME="patch-3.1.4-1-CHAKRA"
PATCHNAME="patch-3.1.4-2-CHAKRA"
# Run this before applying patches
pre_apply() {
......
......@@ -12,21 +12,21 @@ pkgname=('linux-lts' 'linux-lts-headers') # Build stock -CHAKRA-LTS kernel
_kernelname=${pkgname#linux}
_basekernel=2.6.35
pkgver=${_basekernel}.14
pkgrel=2
_patchname="patch-${pkgver}-2-CHAKRA-LTS"
pkgrel=3
_patchname="patch-${pkgver}-3-CHAKRA-LTS"
arch=(i686 x86_64)
license=('GPL2')
url="http://www.kernel.org"
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
http://chakra-project.org/sources/linux/${_patchname}.bz2
http://chakra.sourceforge.net/sources/linux/${_patchname}.bz2
# the main kernel config files
config config.x86_64
# standard config files for mkinitcpio ramdisk
${pkgname}.preset)
md5sums=('091abeb4684ce03d1d936851618687b6'
'5ba067ccfa42ca8aaa84eaa847c7c9dc'
'960176c1988f2bdc98ef4c407edcad1c'
'382cdfe6a3b8af870a626a2c3bc256d2'
'c329fd8a587d9897619c985951963843'
'22882396c6a950d5f25ef1a1eb46c5e2'
'925ddf37962a4942fae3fbb6d1ab2e70'
'56cdd0978dd4a539a25813fd4273c834')
build() {
......@@ -82,8 +82,8 @@ package_linux-lts() {
'gspcav1' 'atl2' 'wlan-ng26' 'rt2500'
'aufs2' 'nouveau-drm-lts' 'kernel26-lts')
provides=('aufs2' 'nouveau-drm-lts' "kernel26-lts=${pkgver}"
"linux=${pkgver}")
conflicts=('kernel26-lts')
"linux=${pkgver}" 'acerhk=0.5.35')
conflicts=('kernel26-lts' 'acerhk')
install=linux-lts.install
optdepends=('crda: to set the correct wireless channels of your country')
......@@ -116,8 +116,6 @@ package_linux-lts() {
# remove build and source links
rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
# add compat symlink for the kernel image
ln -sf vmlinuz-${pkgname} "${pkgdir}/boot/vmlinuz26${_kernelname}"
# remove the firmware
rm -rf "${pkgdir}/lib/firmware"
# gzip -9 all modules to safe 100MB of space
......
......@@ -4587,6 +4587,7 @@ CONFIG_FB_XGI=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ACERHK=m
CONFIG_ASUS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
......@@ -5063,20 +5064,29 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# Security options
#
CONFIG_KEYS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
# CONFIG_SECURITY_PATH is not set
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
# CONFIG_SECURITY_SELINUX is not set
# CONFIG_SECURITY_SMACK is not set
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
# CONFIG_DEFAULT_SECURITY_SMACK is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
......
......@@ -4355,6 +4355,7 @@ CONFIG_FB_XGI=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ACERHK=m
CONFIG_ASUS_LAPTOP=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
......@@ -4831,20 +4832,29 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# Security options
#
CONFIG_KEYS=y
CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y
# CONFIG_SECURITY_NETWORK_XFRM is not set
# CONFIG_SECURITY_PATH is not set
CONFIG_SECURITY_PATH=y
# CONFIG_INTEL_TXT is not set
# CONFIG_SECURITY_SELINUX is not set
# CONFIG_SECURITY_SMACK is not set
# CONFIG_SECURITY_TOMOYO is not set
CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_SELINUX is not set
# CONFIG_DEFAULT_SECURITY_SMACK is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
......
......@@ -15,6 +15,8 @@ post_install () {
ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \
boot/kernel26${KERNEL_NAME}-fallback.img
# add compat symlink for the kernel image
ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
}
post_upgrade() {
......@@ -54,6 +56,7 @@ post_upgrade() {
ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \
boot/kernel26${KERNEL_NAME}-fallback.img
ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
}
post_remove() {
......
......@@ -10,10 +10,10 @@ pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -CHAKRA kernel
_kernelname=${pkgname#linux}
_basekernel=3.1
pkgver=${_basekernel}.4
pkgrel=1
pkgrel=2
_aufs="3.1-20111114"
makedepends=('xmlto' 'docbook-xsl')
_patchname="patch-${pkgver}-1-CHAKRA"
_patchname="patch-${pkgver}-2-CHAKRA"
arch=(i686 x86_64)
license=('GPL2')
url="http://www.kernel.org"
......@@ -25,7 +25,7 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_basekernel.tar.bz2
# standard config files for mkinitcpio ramdisk
linux.preset)
md5sums=('8d43453f8159b2332ad410b19d86a931'
'd4cf6564de296b4764cd372061de5192'
'a39826aca359261dac93dc888ead6b8e'
'd00c07285a3ae842bf630f07c66aaf1b'
'10528368b58ebaa90eb9cfb67eb48352'
'b019872ce926de3ec82985fc399832c6')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment