Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-10 07:54:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

some trials are starting to work, linux 3.4, new shadow, pam, linux-firmware, filesystem boot without errors, committing new linux

Browse Source
This commit is contained in:
abveritas 2012-06-04 17:09:12 +00:00
parent c9f5351d35
commit fdd7acfde3
13 changed files with 736 additions and 602 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filesystem/PKGBUILD
View File

@ -33,7 +33,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a'
'6e488ffecc8ba142c0cf7e2d7aeb832e' '6e488ffecc8ba142c0cf7e2d7aeb832e'
'8a9042a2cedf6b6b47eb8973f14289cb' '8a9042a2cedf6b6b47eb8973f14289cb'
'b8355d9d2782f424f4cedcf682651be0' 'b8355d9d2782f424f4cedcf682651be0'
'1341f9b657085f45197eb154b53a763b' '18854ca68f1edc5777e6cb1cace1ffd9'
'e5d8323a4dbee7a6d0d2a19cbf4b819f' 'e5d8323a4dbee7a6d0d2a19cbf4b819f'
'7bc65f234dfb6abf24e7c3b03e86f4ff' '7bc65f234dfb6abf24e7c3b03e86f4ff'
'd41d8cd98f00b204e9800998ecf8427e' 'd41d8cd98f00b204e9800998ecf8427e'

3
filesystem/fstab
View File

@ -2,5 +2,4 @@
# /etc/fstab: static file system information # /etc/fstab: static file system information
# #
# <file system> <dir> <type> <options> <dump> <pass> # <file system> <dir> <type> <options> <dump> <pass>
devpts /dev/pts devpts defaults 0 0 tmpfs /tmp tmpfs nodev,nosuid 0 0
shm /dev/shm tmpfs nodev,nosuid 0 0

76
linux-firmware/PKGBUILD
View File

@ -1,20 +1,17 @@
# #
# Chakra Packages for Chakra, part of chakra-project.org # Chakra Packages for Chakra, part of chakra-project.org
# #
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer abveritas[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=linux-firmware pkgname=linux-firmware
pkgver=20111226 pkgver=20120227
_b43=4.178.10.4
_legacy=3.130.20.0
_nouveau=20091212
pkgrel=1 pkgrel=1
pkgdesc="Firmware files for Linux" pkgdesc="Firmware files for Linux"
arch=('any') arch=('any')
url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
license=('GPL2' 'GPL3' 'custom') license=('GPL2' 'GPL3' 'custom')
provides=('kernel26-firmware=3.1.99' 'linux-firmware=3.1.99') provides=('kernel26-firmware=2.6.34.99')
conflicts=('linux-firmware-git' conflicts=('linux-firmware-git'
'kernel26-firmware' 'kernel26-firmware'
'ar9170-fw' 'ar9170-fw'
@ -24,13 +21,9 @@ conflicts=('linux-firmware-git'
'iwlwifi-5000-ucode' 'iwlwifi-5000-ucode'
'iwlwifi-5150-ucode' 'iwlwifi-5150-ucode'
'iwlwifi-6000-ucode' 'iwlwifi-6000-ucode'
'rt2860-firmware'
'rt2870usb-fw' 'rt2870usb-fw'
'rt2x00-rt61-fw' 'rt2x00-rt61-fw'
'rt2x00-rt71w-fw' 'rt2x00-rt71w-fw')
'b43-firmware'
'b43-firmware-legacy'
'nouveau-firmware')
replaces=('kernel26-firmware' replaces=('kernel26-firmware'
'ar9170-fw' 'ar9170-fw'
'iwlwifi-1000-ucode' 'iwlwifi-1000-ucode'
@ -39,63 +32,20 @@ replaces=('kernel26-firmware'
'iwlwifi-5000-ucode' 'iwlwifi-5000-ucode'
'iwlwifi-5150-ucode' 'iwlwifi-5150-ucode'
'iwlwifi-6000-ucode' 'iwlwifi-6000-ucode'
'rt2860-firmware'
'rt2870usb-fw' 'rt2870usb-fw'
'rt2x00-rt61-fw' 'rt2x00-rt61-fw'
'rt2x00-rt71w-fw' 'rt2x00-rt71w-fw')
'b43-firmware'
'b43-firmware-legacy'
'nouveau-firmware')
makedepends=("b43-fwcutter=014")
options=(!strip) options=(!strip)
source=(http://chakra.sourceforge.net/sources/linux-firmware/$pkgname-$pkgver.tar.xz source=(ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz)
http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/ar9170.fw sha256sums=('bc1cbee23ab8be8478be66e5486008d81b91fbf6de50347fd1be58b5e56bc6b7')
http://mirror2.openwrt.org/sources/broadcom-wl-${_b43}.tar.bz2
http://downloads.openwrt.org/sources/wl_apsta-${_legacy}.o
http://people.freedesktop.org/~pq/nouveau-drm/nouveau-firmware-$_nouveau.tar.gz)
sha256sums=('c59ad00d557882607590726205ddd923f2a14f6e45021ccb34c2aa1d73ccadc7'
'1b379c5a8d6ab3a43911f7949d6306fe2dae3afb1368be5452a8fc7d9c54e0a0'
'32f6ad98facbb9045646fdc8b54bb03086d204153253f9c65d0234a5d90ae53f'
'7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90'
'4eaeb2044c1da95b50ea4f1facb0effc74d65d8b13dc10893c26e4fe9fe23fb8')
# create tarball: source PKGBUILD && mksource
mksource() {
rm -vRf linux-firmware*
git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
pushd ${pkgname}
git archive --format=tar --prefix linux-firmware-$(date +%Y%m%d)/ master | xz -9 > ../linux-firmware-$(date +%Y%m%d).tar.xz
popd
sha256sum linux-firmware-$(date +%Y%m%d).tar.xz
}
package() { package() {
cd "${srcdir}/${pkgname}-${pkgver}" cd "${srcdir}/${pkgname}-${pkgver}"
install -d -m755 "${pkgdir}/lib/firmware" install -d -m755 "${pkgdir}/usr/lib/firmware"
cp -a * "${pkgdir}/lib/firmware/" cp -a * "${pkgdir}/usr/lib/firmware/"
install -d -m755 "${pkgdir}/usr/share/licenses/linux-firmware/" install -d -m755 "${pkgdir}/usr/share/licenses/linux-firmware/"
rm -f "${pkgdir}/lib/firmware/GPL*" rm -f "${pkgdir}/usr/lib/firmware/GPL*"
mv "${pkgdir}/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/" mv "${pkgdir}/usr/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/"
# Symlinks for Broadcom firmware
#ln -s bcm43xx-0-610-809-0.fw "${pkgdir}/lib/firmware/brcm/bcm43xx-0.fw"
#ln -s bcm43xx_hdr-0-610-809-0.fw "${pkgdir}/lib/firmware/brcm/bcm43xx_hdr-0.fw"
# https://bugs.archlinux.org/task/20064
install -m644 "${srcdir}/ar9170.fw" "${pkgdir}/lib/firmware/"
# install b43-firmware
b43-fwcutter -w "${pkgdir}/lib/firmware/" ${srcdir}/broadcom-wl-${_b43}/linux/wl_apsta.o
# install b43-legacy-firmware
b43-fwcutter -w "${pkgdir}/lib/firmware/" ${srcdir}/wl_apsta-${_legacy}.o
# install nouveau firmwares
cd $srcdir/nouveau
for i in `ls`; do
install -D -m644 $i ${pkgdir}/lib/firmware/nouveau/$i
done
} }
# vim:set ts=2 sw=2 et: # vim:set ts=2 sw=2 et:

113
linux/PKGBUILD
View File

@ -1,51 +1,80 @@
# #
# Core Packages for Chakra, part of chakra-project.org # Core Packages for Chakra, part of chakra-project.org
# #
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer abveritas[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgbase="linux" pkgbase=linux
pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -CHAKRA kernel pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -CHAKRA kernel
# pkgname=linux-custom # Build kernel with a different name # pkgname=linux-custom # Build kernel with a different name
_kernelname=${pkgname#linux} _kernelname=${pkgname#linux}
_basekernel=3.2 _basekernel=3.4
pkgver=${_basekernel}.11 pkgver=${_basekernel}
pkgrel=1 pkgrel=1
_aufs="3.2-20120109" arch=('i686' 'x86_64')
makedepends=('xmlto' 'docbook-xsl') url="http://www.kernel.org/"
_patchname="patch-${pkgver}-1-CHAKRA"
arch=(i686 x86_64)
license=('GPL2') license=('GPL2')
url="http://www.kernel.org" makedepends=('xmlto' 'docbook-xsl')
options=(!strip) options=('!strip')
source=(ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_basekernel.tar.bz2 source=("ftp://ftp.archlinux.org/other/linux/linux-3.4.tar.xz"
http://chakra.sourceforge.net/sources/linux/${_patchname}.bz2 #"http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz"
#"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
# the main kernel config files # the main kernel config files
config.i686 config.x86_64 'config' 'config.x86_64'
# standard config files for mkinitcpio ramdisk # standard config files for mkinitcpio ramdisk
linux.preset) "${pkgname}.preset"
md5sums=('7ceb61f87c097fc17509844b71268935' 'fix-acerhdf-1810T-bios.patch'
'f9634e57111ad9a1cd7e0c8f0476ab92' 'change-default-console-loglevel.patch'
'e8238d2f3dee0234a8a55cdaba9e91e4' 'i915-fix-ghost-tv-output.patch')
'91525d8106c580d3dedc44a9d5e8d092' md5sums=('cba7741056c05ac98277b99909039a7e'
'b019872ce926de3ec82985fc399832c6') '0c9de293b4d34d2d91de453592c4a89f'
'4c54e74f4f05714e3682317e5bde4fd4'
'eb14dcfd80c00852ef81ded6e826826a'
'3cb9e819538197398aad5db5529b22d6'
'65cbe8e4c8efaf96dd162102e46ce81d'
'342071f852564e1ad03b79271a90b1a5')
build() { build() {
cd ${srcdir}/linux-$_basekernel cd "${srcdir}/linux-${_basekernel}"
# fix setlocalversion # add upstream patch
sed -i 's|echo "+"|# echo "+"|g' ./scripts/setlocalversion #patch -p1 -i "${srcdir}/patch-${pkgver}"
# Add -CHAKRA patches # add latest fixes from stable queue, if needed
patch -Np1 -i ${srcdir}/${_patchname} # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
# create .config # Some chips detect a ghost TV output
cat "${srcdir}/config.${CARCH}" > ./.config # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
# Arch Linux bug report: FS#19234
#
# It is unclear why this patch wasn't merged upstream, it was accepted,
# then dropped because the reasoning was unclear. However, it is clearly
# needed.
patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
# Patch submitted upstream, waiting for inclusion:
# https://lkml.org/lkml/2012/2/19/51
# add support for latest bios of Acer 1810T acerhdf module
patch -Np1 -i "${srcdir}/fix-acerhdf-1810T-bios.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"
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
else
cat "${srcdir}/config" > ./.config
fi
if [ "${_kernelname}" != "" ]; then if [ "${_kernelname}" != "" ]; then
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
fi fi
# set extraversion to pkgrel
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
# get kernel version # get kernel version
make prepare make prepare
@ -73,16 +102,11 @@ build() {
package_linux() { package_linux() {
pkgdesc="The Linux Kernel and modules" pkgdesc="The Linux Kernel and modules"
groups=('base') groups=('base')
depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7.5') depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country') optdepends=('crda: to set the correct wireless channels of your country')
replaces=('kernel24' 'kernel24-scsi' 'kernel26' 'linux-scsi' provides=('kernel26')
'alsa-driver' 'ieee80211' 'hostap-driver26' conflicts=('kernel26')
'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv' replaces=('kernel26')
'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
'gspcav1' 'atl2' 'wlan-ng26' 'rt2500'
'aufs3' 'nouveau-drm')
provides=("aufs3=$_aufs" 'nouveau-drm' 'kernel26' 'acerhk=0.5.35')
conflicts=('kernel26' 'acerhk')
backup=("etc/mkinitcpio.d/${pkgname}.preset") backup=("etc/mkinitcpio.d/${pkgname}.preset")
install=${pkgname}.install install=${pkgname}.install
@ -121,10 +145,10 @@ package_linux() {
# gzip -9 all modules to save 100MB of space # gzip -9 all modules to save 100MB of space
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
# make room for external modules # make room for external modules
ln -s "../extramodules-${_basekernel}${_kernelname:--CHAKRA}" "${pkgdir}/lib/modules/${_kernver}/extramodules" ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
# add real version for building modules and running depmod from post_install/upgrade # add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA}" mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--CHAKRA}/version" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
} }
package_linux-headers() { package_linux-headers() {
@ -149,7 +173,7 @@ package_linux-headers() {
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include" mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
for i in acpi asm-generic config crypto drm generated linux math-emu \ for i in acpi asm-generic config crypto drm generated linux math-emu \
media net pcmcia scsi sound trace video xen; do media mtd 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 done
@ -202,25 +226,18 @@ package_linux-headers() {
cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/" cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
# add dvb headers for external modules # 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" 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/" cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
# and... # and...
# http://bugs.archlinux.org/task/11194
mkdir -p "${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/" cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new # 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/" 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/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/" cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
# add dvb headers # add dvb headers
# in reference to:
# http://bugs.archlinux.org/task/20402
mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb" 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/" 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" mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
@ -255,7 +272,7 @@ package_linux-headers() {
done done
# remove unneeded architectures # 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,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
} }
package_linux-docs() { package_linux-docs() {

11
linux/change-default-console-loglevel.patch Normal file
View File

@ -0,0 +1,11 @@
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);

839
linux/config.x86_64
View File

File diff suppressed because it is too large Load Diff

10
linux/fix-acerhdf-1810T-bios.patch Normal file
View File

@ -0,0 +1,10 @@
--- linux-3.3/drivers/platform/x86/acerhdf.c~ 2012-03-08 09:21:18.759446675 +0100
+++ linux-3.3/drivers/platform/x86/acerhdf.c 2012-03-08 09:20:17.900452311 +0100
@@ -182,6 +182,7 @@
{"Acer", "Aspire 1810T", "v1.3308", 0x55, 0x58, {0x9e, 0x00} },
{"Acer", "Aspire 1810TZ", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
{"Acer", "Aspire 1810T", "v1.3310", 0x55, 0x58, {0x9e, 0x00} },
+ {"Acer", "Aspire 1810T", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
{"Acer", "Aspire 1810TZ", "v1.3314", 0x55, 0x58, {0x9e, 0x00} },
/* Acer 531 */
{"Acer", "AO531h", "v0.3201", 0x55, 0x58, {0x20, 0x00} },

26
linux/i915-fix-ghost-tv-output.patch Normal file
View File

@ -0,0 +1,26 @@
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Tested-by: Santi <santi@agolina.net>
---
drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index dc83b7a..c8f67bf 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1267,6 +1267,15 @@
DAC_B_0_7_V |
DAC_C_0_7_V);
+ /*
+ * The TV sense state should be cleared to zero on cantiga platform. Otherwise
+ * the TV is misdetected. This is hardware requirement.
+ */
+ if (IS_GM45(dev))
+ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
+ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
+
+
I915_WRITE(TV_CTL, tv_ctl);
I915_WRITE(TV_DAC, tv_dac);
POSTING_READ(TV_DAC);

28
linux/linux.install
View File

@ -2,7 +2,7 @@
# arg 2: the old package version # arg 2: the old package version
KERNEL_NAME= KERNEL_NAME=
KERNEL_VERSION=3.2-CHAKRA KERNEL_VERSION=3.4.0-1-CHAKRA
post_install () { post_install () {
# updating module dependencies # updating module dependencies
@ -11,17 +11,24 @@ post_install () {
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux${KERNEL_NAME} mkinitcpio -p linux${KERNEL_NAME}
# add compat symlinks for the initramfs images # compat symlinks for the official kernels only
ln -sf initramfs-linux${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then
ln -sf initramfs-linux${KERNEL_NAME}-fallback.img \ loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)"
boot/kernel26${KERNEL_NAME}-fallback.img [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
ln -sf vmlinuz-linux${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME} if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
# add compat symlinks for the initramfs images
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}
fi
fi
} }
post_upgrade() { post_upgrade() {
pacman -Q grub &>/dev/null pacman -Q grub &>/dev/null
hasgrub=$? hasgrub=$?
pacman -Q grub2 &>/dev/null pacman -Q grub2-common &>/dev/null
hasgrub2=$? hasgrub2=$?
pacman -Q lilo &>/dev/null pacman -Q lilo &>/dev/null
haslilo=$? haslilo=$?
@ -39,7 +46,6 @@ post_upgrade() {
if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then 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 "WARNING: /boot appears to be a separate partition but is not mounted."
echo " You probably just broke your system. Congratulations."
fi fi
# updating module dependencies # updating module dependencies
@ -47,12 +53,6 @@ post_upgrade() {
depmod ${KERNEL_VERSION} depmod ${KERNEL_VERSION}
echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
mkinitcpio -p linux${KERNEL_NAME} mkinitcpio -p linux${KERNEL_NAME}
# add compat symlinks for the initramfs images
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() { post_remove() {

29
mkinitcpio-nfs-utils/PKGBUILD
View File

@ -1,23 +1,32 @@
# $Id: PKGBUILD 68748 2010-02-14 10:45:02Z thomas $ #
# Maintainer: Thomas Bächler <thomas@archlinux.org> # Core Packages for Chakra, part of chakra-project.org
#
# maintainer abveritas[at]chakra-project[dog]org>
# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=mkinitcpio-nfs-utils pkgname=mkinitcpio-nfs-utils
pkgver=0.2 pkgver=0.3
pkgrel=2 pkgrel=1
pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio" pkgdesc="ipconfig and nfsmount tools for NFS root support in mkinitcpio"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://www.archlinux.org/" url="http://www.archlinux.org/"
license=('GPL2') license=('GPL2')
depends=('glibc') depends=('glibc')
source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz) source=("ftp://ftp.archlinux.org/other/mkinitcpio/$pkgname-$pkgver.tar.xz"
sha256sums=('3f2839f21a420cd732d34e58f84534acdb7fc29f69381dbba3f00e3424201cd3') 'initcpio-install-net'
'initcpio-hook-net')
sha256sums=('d290d489844fae100ca7b848b8eef40078124ff373203086bacc07329d1e8939'
'8e5ddaacb0e5751e432f95870958c5fa2e01e1ab3f55b5eca2b8b2d030b5d861'
'29a5a4a9ebd61bfa1afbb8dcaf2187e487ee1f34b1979a85a853fa2acbeb510e')
build() { build() {
cd "${srcdir}/${pkgname}-${pkgver}" make -C "$pkgname-$pkgver"
make || return 1
} }
package() { package() {
cd "$srcdir/${pkgname}-${pkgver}" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
make DESTDIR="${pkgdir}" install
# override hooks, they need updates
install -m644 "$srcdir/initcpio-install-net" "$pkgdir/usr/lib/initcpio/install/net"
install -m644 "$srcdir/initcpio-hook-net" "$pkgdir/usr/lib/initcpio/hooks/net"
} }

90
mkinitcpio-nfs-utils/initcpio-hook-net Normal file
View File

@ -0,0 +1,90 @@
# vim: set ft=sh:
run_hook() {
local line i net_mac bootif_mac bootif_dev defaultrootpath defaultserver
# These variables will be parsed from /tmp/net-*.conf generated by ipconfig
local DEVICE
local IPV4ADDR IPV4BROADCAST IPV4NETMASK IPV4GATEWAY IPV4DNS0 IPV4DNS1
local HOSTNAME DNSDOMAIN NISDOMAIN ROOTSERVER ROOTPATH
local filename
# /tmp/net-*.conf
if [ -z "${ip}" -a -n "${nfsaddrs}" ]; then
ip="${nfsaddrs}"
fi
if [ -n "${ip}" ]; then
if [ -n "${BOOTIF}" ]; then
bootif_mac=${BOOTIF#01-}
bootif_mac=${bootif_mac//-/:}
for i in /sys/class/net/*/address; do
read net_mac < ${i}
if [ "${bootif_mac}" == "${net_mac}" ]; then
bootif_dev=${i#/sys/class/net/}
bootif_dev=${bootif_dev%/address}
break
fi
done
ip="${ip}::${bootif_dev}"
fi
# setup network and save some values
ipconfig "ip=${ip}"
for conf in /tmp/net-*.conf; do
[ -f "$conf" ] && . "$conf"
done
# calculate nfs_server, nfs_path and nfs_option for later nfs mount
if [ "${root}" = "/dev/nfs" -o "${nfsroot}" != "" ]; then
# parse ROOTPATH if defined by dhcp server
if [ -n "${ROOTPATH}" ]; then
line="${ROOTPATH}"
nfs_server="${line%%:*}"
[ "${nfs_server}" = "${line}" ] && nfs_server="${ROOTSERVER}"
defaultserver="${nfs_server}"
line="${line#*:}"
nfs_path="${line}"
defaultrootpath="${nfs_path}"
else
# define a default ROOTPATH
if [ "${ROOTPATH}" = "" ]; then
defaultrootpath="/tftpboot/${IPV4ADDR}"
fi
fi
# parse nfsroot if present (overrides ROOTPATH)
if [ -n "${nfsroot}" ]; then
line="${nfsroot}"
nfs_server="${line%%:*}"
[ -z "${nfs_server}" ] && nfs_server="${defaultserver}"
line="${line#*:}"
nfs_path="${line%%,*}"
line="${line#"${nfs_path}"}"
[ -z "${nfs_path}" ] && nfs_path="${defaultrootpath}"
nfs_option="${line#","}"
fi
# ensure root and filesystem type are set proper for nfs boot
root="/dev/nfs"
rootfstype="nfs"
echo "NFS-Mount: ${nfs_server}:${nfs_path}"
# set mount handler for NFS
mount_handler="nfs_mount_handler"
fi
fi
}
nfs_mount_handler() {
if [ -z "$nfs_server" -o -z "$nfs_path" ]; then
err "Unable to mount root filesystem over NFS: wrong parameters."
echo "You are being dropped to a recovery shell"
echo " Type 'exit' to try and continue booting"
launch_interactive_shell
msg "Trying to continue (this will most likely fail) ..."
fi
nfsmount ${nfs_option:+-o ${nfs_option}} "${nfs_server}:${nfs_path}" "$1"
}
# vim: set ft=sh ts=4 sw=4 et:

107
mkinitcpio-nfs-utils/initcpio-install-net Normal file
View File

@ -0,0 +1,107 @@
#!/bin/bash
build() {
add_checked_modules '/drivers/net/'
add_binary "/usr/lib/initcpio/ipconfig" "/bin/ipconfig"
add_binary "/usr/lib/initcpio/nfsmount" "/bin/nfsmount"
add_runscript
}
help() {
cat <<HELPEOF
This hook loads the necessary modules for a network device.
Detection will take place at runtime. To minimize the modules
in the image, add the autodetect hook too.
For pcmcia net devices please use pcmcia hook too.
Kernel Parameters:
An interface spec can be either short form, which is just the name of
an interface (eth0 or whatever), or long form. The long form consists
of up to seven elements, separated by colons:
ip=<client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf>
nfsaddrs= is an alias to ip= and can be used too.
<client-ip> IP address of the client. If empty, the address will
either be determined by RARP/BOOTP/DHCP. What protocol
is used de- pends on the <autoconf> parameter. If this
parameter is not empty, autoconf will be used.
<server-ip> IP address of the NFS server. If RARP is used to
determine the client address and this parameter is NOT
empty only replies from the specified server are
accepted. To use different RARP and NFS server,
specify your RARP server here (or leave it blank), and
specify your NFS server in the 'nfsroot' parameter
(see above). If this entry is blank the address of the
server is used which answered the RARP/BOOTP/DHCP
request.
<gw-ip> IP address of a gateway if the server is on a different
subnet. If this entry is empty no gateway is used and the
server is assumed to be on the local network, unless a
value has been received by BOOTP/DHCP.
<netmask> Netmask for local network interface. If this is empty,
the netmask is derived from the client IP address assuming
classful addressing, unless overridden in BOOTP/DHCP reply.
<hostname> Name of the client. If empty, the client IP address is
used in ASCII notation, or the value received by
BOOTP/DHCP.
<device> Name of network device to use. If this is empty, all
devices are used for RARP/BOOTP/DHCP requests, and the
first one we receive a reply on is configured. If you
have only one device, you can safely leave this blank.
<autoconf> Method to use for autoconfiguration. If this is either
'rarp', 'bootp', or 'dhcp' the specified protocol is
used. If the value is 'both', 'all' or empty, all
protocols are used. 'off', 'static' or 'none' means
no autoconfiguration.
Examples:
ip=127.0.0.1:::::lo:none --> Enable the loopback interface.
ip=192.168.1.1:::::eth2:none --> Enable static eth2 interface.
ip=:::::eth0:dhcp --> Enable dhcp protcol for eth0 configuration.
nfsroot=[<server-ip>:]<root-dir>[,<nfs-options>]
If the 'nfsroot' parameter is NOT given on the command line, the default
"/tftpboot/%s" will be used.
<server-ip> Specifies the IP address of the NFS server. If this field
is not given, the default address as determined by the
'ip' variable (see below) is used. One use of this
parameter is for example to allow using different servers
for RARP and NFS. Usually you can leave this blank.
<root-dir> Name of the directory on the server to mount as root. If
there is a "%s" token in the string, the token will be
replaced by the ASCII-representation of the client's IP
address.
<nfs-options> Standard NFS options. All options are separated by commas.
If the options field is not given, the following defaults
will be used:
port = as given by server portmap daemon
rsize = 1024
wsize = 1024
timeo = 7
retrans = 3
acregmin = 3
acregmax = 60
acdirmin = 30
acdirmax = 60
flags = hard, nointr, noposix, cto, ac
root=/dev/nfs
If you don't use nfsroot= parameter you need to set root=/dev/nfs
to boot from a nfs root by autoconfiguration.
HELPEOF
}
# vim: set ft=sh ts=4 sw=4 et: