Commit e973b2aa authored by amnon's avatar amnon

updates

parent 88b83da7
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=aufs2
pkgver=2.6.33_20100514
pkgrel=3
pkgrel=4
_kernver=${pkgver%_*}-CHAKRA
pkgdesc="Another Unionfs Implementation"
arch=('i686' 'x86_64')
......
......@@ -2,7 +2,7 @@
pkgname=broadcom-wl
pkgver=5.60.48.36
pkgrel=5
pkgrel=6
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
......
......@@ -9,23 +9,23 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
_origname=initscripts
pkgname=chakra-initscripts
pkgver=2010.05
pkgrel=9
pkgver=2010.06
pkgrel=2
pkgdesc="System initialization/bootup scripts"
arch=('any')
url="http://www.chakra-project.org"
license=('GPL')
groups=('base')
depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=139-1'
depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=157-1'
'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
install=initscripts.install
source=(http://chakra-project.org/sources/initscripts/${_origname}-${pkgver}-8.tar.gz)
md5sums=('e9e11d508519eb5a20db160ed95fae53')
provides=('initscripts=2010.05')
source=(http://chakra-project.org/sources/initscripts/initscripts-${pkgver}-${pkgrel}.tar.gz)
md5sums=('6e2208b8040bba656ec1675069e713d1')
provides=('initscripts=2010.06')
conflicts=('initscripts')
build() {
cd ${srcdir}/${_origname}-${pkgver}-8/
cd ${srcdir}/${_origname}-${pkgver}-${pkgrel}/
DESTDIR=$startdir/pkg ./install.sh
cp -rf ${startdir}/etc ${startdir}/pkg
......
#
# /etc/rc.conf - Main Configuration for Arch Linux
# /etc/rc.conf - Main Configuration for Chakra GNU/Linux
#
# -----------------------------------------------------------------------
......
This diff is collapsed.
......@@ -8,24 +8,25 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=initscripts
pkgver=2010.05
pkgrel=8
pkgver=2010.06
pkgrel=2
pkgdesc="System initialization/bootup scripts"
arch=('i686' 'x86_64')
url="http://www.chakra-project.org"
license=('GPL')
groups=('base')
backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=139-1'
depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=157-1'
'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
optdepends=('bridge-utils: Network bridging support'
'dhcpcd: DHCP network configuration'
'wireless_tools: Wireless networking')
provides=("initscripts=${pkgver}")
install=initscripts.install
source=(http://chakra-project.org/sources/initscripts/initscripts-${pkgver}-${pkgrel}.tar.gz)
md5sums=('e9e11d508519eb5a20db160ed95fae53')
md5sums=('6e2208b8040bba656ec1675069e713d1')
build() {
cd ${srcdir}/${pkgname}-${pkgver}-${pkgrel}/
cd ${srcdir}/initscripts-${pkgver}-${pkgrel}/
DESTDIR=${pkgdir} ./install.sh
}
post_install() {
echo "==> Fixing /etc/rc.conf"
cp /etc/rc.conf /etc/rc.conf.pacnew
cp /etc/rc.conf.pacsave /etc/rc.conf
}
post_upgrade() {
if [ "$(vercmp $2 2009.07)" -lt 0 ]; then
echo "==> Adjusting /etc/inittab for transition to /dev/tty standard."
echo "==> Original file saved as /etc/inittab.pacsave"
sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
fi
echo "==> Fixing /etc/rc.conf"
cp /etc/rc.conf /etc/rc.conf.pacnew
cp /etc/rc.conf.pacsave /etc/rc.conf
}
# $Id: PKGBUILD 79881 2010-05-08 18:42:53Z thomas $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=mkinitcpio
pkgver=0.6.4
pkgver=0.6.6
pkgrel=1
pkgdesc="Modular initramfs image creation utility"
arch=(any)
url="http://www.archlinux.org/"
license=('GPL')
depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux-ng' 'gen-init-cpio' 'coreutils'
depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux-ng>=2.17' 'gen-init-cpio' 'coreutils'
'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=150' 'file' 'gzip'
'which')
optdepends=('xz-utils: Use lzma compression for the initramfs image'
optdepends=('xz: Use lzma compression for the initramfs image'
'bzip2: Use bzip2 compression for the initramfs image'
'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
'klibc-module-init-tools' 'klibc-udev')
source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz)
source=(ftp://ftp.archlinux.org/other/mkinitcpio/mkinitcpio-${pkgver}.tar.gz)
backup=(etc/mkinitcpio.conf)
sha256sums=('50d1975498a24b4d11dd77d5bffd4516ec52465bb5e0d172867b8ceeaa04cdd8')
sha256sums=('2b638eb40cb3513742a2fec59f4903edfa1deab2c8c9b184121bae646345143c')
build() {
:
}
package() {
cd $srcdir/${pkgname}-${pkgver}
cd $srcdir/mkinitcpio-${pkgver}
make DESTDIR="${pkgdir}" install
}
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=ndiswrapper
pkgver=1.56
pkgrel=4
pkgrel=5
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
......
......@@ -66,101 +66,8 @@ increase_pkgrels() {
done
;;
fixit)
title2 "Increasing support pkgrels"
for module in ${whattodo[*]}
do
status_start "$module"
pushd $module &>/dev/null
sed -i -e 's/\<pkgrel=20\>/pkgrel=21/g' PKGBUILD
sed -i -e 's/\<pkgrel=19\>/pkgrel=20/g' PKGBUILD
sed -i -e 's/\<pkgrel=18\>/pkgrel=19/g' PKGBUILD
sed -i -e 's/\<pkgrel=17\>/pkgrel=18/g' PKGBUILD
sed -i -e 's/\<pkgrel=16\>/pkgrel=17/g' PKGBUILD
sed -i -e 's/\<pkgrel=15\>/pkgrel=16/g' PKGBUILD
sed -i -e 's/\<pkgrel=14\>/pkgrel=15/g' PKGBUILD
sed -i -e 's/\<pkgrel=13\>/pkgrel=14/g' PKGBUILD
sed -i -e 's/\<pkgrel=12\>/pkgrel=13/g' PKGBUILD
sed -i -e 's/\<pkgrel=11\>/pkgrel=12/g' PKGBUILD
sed -i -e 's/\<pkgrel=10\>/pkgrel=11/g' PKGBUILD
sed -i -e 's/\<pkgrel=9\>/pkgrel=10/g' PKGBUILD
sed -i -e 's/\<pkgrel=8\>/pkgrel=9/g' PKGBUILD
sed -i -e 's/\<pkgrel=7\>/pkgrel=8/g' PKGBUILD
sed -i -e 's/\<pkgrel=6\>/pkgrel=7/g' PKGBUILD
sed -i -e 's/\<pkgrel=5\>/pkgrel=6/g' PKGBUILD
sed -i -e 's/\<pkgrel=4\>/pkgrel=5/g' PKGBUILD
sed -i -e 's/\<pkgrel=3\>/pkgrel=4/g' PKGBUILD
sed -i -e 's/\<pkgrel=2\>/pkgrel=3/g' PKGBUILD
sed -i -e 's/\<pkgrel=1\>/pkgrel=2/g' PKGBUILD
popd &>/dev/null
status_done
done
;;
qt)
title2 "Increasing Qt pkgrels"
for module in ${whattodo[*]}
do
status_start "$module"
pushd $module &>/dev/null
sed -i -e 's/\<pkgrel=20\>/pkgrel=21/g' PKGBUILD
sed -i -e 's/\<pkgrel=19\>/pkgrel=20/g' PKGBUILD
sed -i -e 's/\<pkgrel=18\>/pkgrel=19/g' PKGBUILD
sed -i -e 's/\<pkgrel=17\>/pkgrel=18/g' PKGBUILD
sed -i -e 's/\<pkgrel=16\>/pkgrel=17/g' PKGBUILD
sed -i -e 's/\<pkgrel=15\>/pkgrel=16/g' PKGBUILD
sed -i -e 's/\<pkgrel=14\>/pkgrel=15/g' PKGBUILD
sed -i -e 's/\<pkgrel=13\>/pkgrel=14/g' PKGBUILD
sed -i -e 's/\<pkgrel=12\>/pkgrel=13/g' PKGBUILD
sed -i -e 's/\<pkgrel=11\>/pkgrel=12/g' PKGBUILD
sed -i -e 's/\<pkgrel=10\>/pkgrel=11/g' PKGBUILD
sed -i -e 's/\<pkgrel=9\>/pkgrel=10/g' PKGBUILD
sed -i -e 's/\<pkgrel=8\>/pkgrel=9/g' PKGBUILD
sed -i -e 's/\<pkgrel=7\>/pkgrel=8/g' PKGBUILD
sed -i -e 's/\<pkgrel=6\>/pkgrel=7/g' PKGBUILD
sed -i -e 's/\<pkgrel=5\>/pkgrel=6/g' PKGBUILD
sed -i -e 's/\<pkgrel=4\>/pkgrel=5/g' PKGBUILD
sed -i -e 's/\<pkgrel=3\>/pkgrel=4/g' PKGBUILD
sed -i -e 's/\<pkgrel=2\>/pkgrel=3/g' PKGBUILD
sed -i -e 's/\<pkgrel=1\>/pkgrel=2/g' PKGBUILD
popd &>/dev/null
status_done
done
;;
kde)
title2 "Increasing KDE pkgrels"
for module in ${whattodo[*]}
do
status_start "$module"
pushd $module &>/dev/null
sed -i -e 's/\<pkgrel=20\>/pkgrel=21/g' PKGBUILD
sed -i -e 's/\<pkgrel=19\>/pkgrel=20/g' PKGBUILD
sed -i -e 's/\<pkgrel=18\>/pkgrel=19/g' PKGBUILD
sed -i -e 's/\<pkgrel=17\>/pkgrel=18/g' PKGBUILD
sed -i -e 's/\<pkgrel=16\>/pkgrel=17/g' PKGBUILD
sed -i -e 's/\<pkgrel=15\>/pkgrel=16/g' PKGBUILD
sed -i -e 's/\<pkgrel=14\>/pkgrel=15/g' PKGBUILD
sed -i -e 's/\<pkgrel=13\>/pkgrel=14/g' PKGBUILD
sed -i -e 's/\<pkgrel=12\>/pkgrel=13/g' PKGBUILD
sed -i -e 's/\<pkgrel=11\>/pkgrel=12/g' PKGBUILD
sed -i -e 's/\<pkgrel=10\>/pkgrel=11/g' PKGBUILD
sed -i -e 's/\<pkgrel=9\>/pkgrel=10/g' PKGBUILD
sed -i -e 's/\<pkgrel=8\>/pkgrel=9/g' PKGBUILD
sed -i -e 's/\<pkgrel=7\>/pkgrel=8/g' PKGBUILD
sed -i -e 's/\<pkgrel=6\>/pkgrel=7/g' PKGBUILD
sed -i -e 's/\<pkgrel=5\>/pkgrel=6/g' PKGBUILD
sed -i -e 's/\<pkgrel=4\>/pkgrel=5/g' PKGBUILD
sed -i -e 's/\<pkgrel=3\>/pkgrel=4/g' PKGBUILD
sed -i -e 's/\<pkgrel=2\>/pkgrel=3/g' PKGBUILD
sed -i -e 's/\<pkgrel=1\>/pkgrel=2/g' PKGBUILD
popd &>/dev/null
status_done
done
;;
tools)
title2 "Increasing tool pkgrels"
*)
title2 "Increasing pkgrels"
for module in ${whattodo[*]}
do
status_start "$module"
......
......@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=tiacx
pkgver=20080210
pkgrel=16
pkgrel=17
pkgdesc="OpenSource module for Texas Instruments ACX100/ACX111 wireless chips. For stock arch 2.6 kernel"
arch=(i686 x86_64)
url="http://acx100.sourceforge.net/"
......
# $Id: PKGBUILD 68156 2010-02-11 07:06:43Z tpowa $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase="udev"
pkgname=('udev' 'udev-compat')
pkgver=151
pkgrel=4
pkgver=158
pkgrel=1
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
......@@ -16,22 +20,16 @@ options=(!makeflags !libtool)
makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
81-arch.rules load-modules.sh cdsymlinks.sh root-link.sh
arch-udev-rules.patch ignore-remove.sh
firmware-loader-fix-missing-firmware.patch)
md5sums=('aeae0e6273dcbec246c3c1b9868ebed1'
arch-udev-rules.patch)
md5sums=('26f99dde11f8e393d659614d7d1a3964'
'6393ee81993f8b9beb776ca904005864'
'a2d0d59742b80b3b28ed498718654eb7'
'f91fddc67609b45b244a624977c4247b'
'2e808ee78d237c478b57af2a68d43769'
'2d6dc6842464f107bccc68cd505a6c31'
'22c1f059cdeddaac5e7fe33b007da6a3'
'35fa97500243a79b2370fa4684828e69'
'ec1fa2ecaff2e8efc611cb70568630ad')
'70198227b7bbe3852e1cd2299693af66')
build() {
cd $srcdir/$pkgname-$pkgver
# The new firmware loader has a bug where modprobe will hang 60 seconds when a
# firmware file is missing. Fix this by properly reporting error to the kernel
patch -p1 -i "$srcdir"/firmware-loader-fix-missing-firmware.patch || return 1
./configure --prefix="" --mandir=/usr/share/man\
--includedir=/usr/include\
--libexecdir=/lib/udev\
......@@ -64,14 +62,8 @@ package_udev() {
install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
# install root-link.sh
install -D -m755 $srcdir/root-link.sh $pkgdir/lib/udev/root-link.sh
# install ignore-remove.sh
install -D -m755 $srcdir/ignore-remove.sh $pkgdir/lib/udev/ignore-remove.sh
# disable error logging to prevent startup failures printed to vc on boot
sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf
# install additional standard rules files
for rule in $srcdir/$pkgname-$pkgver/rules/packages/*.rules; do
install -D -m 644 $rule $pkgdir/lib/udev/rules.d/
done
# fix standard udev rules to fit to arch
cd $pkgdir/lib/udev/rules.d/
patch -Np1 -i $srcdir/arch-udev-rules.patch || return 1
......@@ -83,12 +75,6 @@ package_udev() {
$pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional
mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \
$pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional
# remove not needed rules
rm $pkgdir/lib/udev/rules.d/40-ia64.rules
rm $pkgdir/lib/udev/rules.d/40-ppc.rules
rm $pkgdir/lib/udev/rules.d/40-s390.rules
rm $pkgdir/lib/udev/rules.d/64-device-mapper.rules
rm $pkgdir/lib/udev/rules.d/64-md-raid.rules
# create framebuffer blacklist
mkdir -p $pkgdir/etc/modprobe.d/
......@@ -97,7 +83,6 @@ package_udev() {
done
# create static devices in /lib/udev/devices/
mkdir ${pkgdir}/lib/udev/devices
mkdir ${pkgdir}/lib/udev/devices/pts
mkdir ${pkgdir}/lib/udev/devices/shm
......@@ -128,6 +113,8 @@ package_udev() {
for i in $pkgdir/lib/udev/rules.d/*.rules; do
sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g' $i
done
mv "${pkgdir}/lib/girepository-1.0" "${pkgdir}/usr/lib/" || return 1
}
package_udev-compat() {
......@@ -136,5 +123,5 @@ package_udev-compat() {
groups=('')
cd $srcdir/$pkgname-$pkgver
install -d -m755 ${pkgdir}/lib/${pkgname}/rules.d
install -D -m644 ${srcdir}/${pkgname}-${pkgver}/rules/gentoo/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
install -D -m644 ${srcdir}/${pkgname}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
}
......@@ -24,35 +24,27 @@ diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules
# block-related
KERNEL=="sch[0-9]*", GROUP="disk"
@@ -116,5 +116,4 @@
KERNEL=="rrom[0-9]*", MODE="0400"
# do not delete static device nodes
-ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
-ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
+ACTION=="remove", PROGRAM="ignore-remove.sh %r", OPTIONS+="ignore_remove"
diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
--- rules.d/80-drivers.rules 2009-03-07 22:22:48.200242883 +0100
+++ rules.d.arch/80-drivers.rules 2009-03-07 22:22:54.757744454 +0100
@@ -2,13 +2,14 @@
ACTION!="add", GOTO="drivers_end"
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -b $env{MODALIAS}"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -b tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -b tifm_ms"
-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"
-SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
--- rules.d/80-drivers.rules 2010-06-03 11:55:08.978720002 +0200
+++ rules.d.arch/80-drivers.rules 2010-06-03 11:58:41.207865142 +0200
@@ -2,12 +2,13 @@
ACTION=="remove", GOTO="drivers_end"
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -bv $env{MODALIAS}"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -bv tifm_sd"
-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -bv tifm_ms"
-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -bv --all ms_block mspro_block"
-SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -bv i2o_block"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -bv sg"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -bv ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
LABEL="drivers_end"
diff -Nur udev-151.orig/extras/firmware/firmware.c udev-151/extras/firmware/firmware.c
--- udev-151.orig/extras/firmware/firmware.c 2009-12-15 16:19:30.000000000 +0100
+++ udev-151/extras/firmware/firmware.c 2010-01-31 13:17:09.195896260 +0100
@@ -149,6 +149,7 @@
util_path_encode(firmware, fwencpath, sizeof(fwencpath));
util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL);
+ util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
if (fwfile == NULL) {
int err;
@@ -166,6 +167,7 @@
udev_selinux_resetfscreatecon(udev);
} while (err == -ENOENT);
rc = 2;
+ set_loading(udev, loadpath, "-1");
goto exit;
}
@@ -176,7 +178,6 @@
if (unlink(misspath) == 0)
util_delete_path(udev, misspath);
- util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
set_loading(udev, loadpath, "1");
util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL);
#!/bin/sh
if [ -z "$1" ]; then
exit 1
fi
for f in ${DEVNAME} ${DEVLINKS}; do
if [ -e "/lib/udev/devices/${f#$1}" ]; then
exit 0
fi
done
exit 1
......@@ -46,7 +46,7 @@ if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
# If no modules could be found, try if the alias name is a module name
# In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour
[ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST=""
[ -z "${mods}" ] && $LOGGER -p info -t "$(basename $0)" "'$1' is not a valid module or alias name"
[ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name"
for mod in ${mods}; do
# Find the module and all its dependencies
deps="$($MODPROBE -i --show-depends ${mod})"
......@@ -61,9 +61,9 @@ if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
for dep in $deps; do
if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then
if [ "${dep}" = "${mod}" ]; then
$LOGGER -p info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted"
$LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted"
else
$LOGGER -p info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted"
$LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted"
fi
continue 2
fi
......@@ -74,7 +74,7 @@ if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then
$MODPROBE $USEBLACKLIST ${mod}
done
else
$MODPROBE $1
$MODPROBE $USEBLACKLIST $1
fi
fi
# vim: set et ts=4:
......@@ -10,7 +10,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=vhba-module
pkgver=1.2.1
_kernver='2.6.33-CHAKRA'
pkgrel=9
pkgrel=10
pkgdesc="Kernel module that emulates SCSI devices"
arch=('i686' 'x86_64')
url="http://cdemu.sourceforge.net/"
......
......@@ -4,7 +4,7 @@
pkgname=zd1211-firmware
pkgver=1.4
pkgrel=4
pkgrel=5
pkgdesc="Firmware for the in-kernel26 zd1211rw wireless driver"
arch=('any')
url="http://zd1211.wiki.sourceforge.net/"
......
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