This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, core34 has been updated
via 3fab49a03bcc4545fd7bc84827a298ce53c80779 (commit)
via fb245aaaf75806c890892e7b29dfae249cac54ca (commit)
from 5e80a2e48a0e1b87fefc1a7f4c420bedaad22f70 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3fab49a03bcc4545fd7bc84827a298ce53c80779
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 8 02:05:00 2010 +0100
Manually force early load of ehcd_hci to fix usb 2.0 detection.
commit fb245aaaf75806c890892e7b29dfae249cac54ca
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 8 02:04:06 2010 +0100
Updated alsa-driver (1.0.22.1) to fix intel_hda detection.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/34/filelists/mkinitcpio | 1 +
config/rootfiles/core/34/update.sh | 4 ++--
lfs/alsa | 4 ++--
lfs/mkinitcpio | 2 +-
src/install+setup/install/main.c | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
create mode 120000 config/rootfiles/core/34/filelists/mkinitcpio
Difference in files:
diff --git a/config/rootfiles/core/34/filelists/mkinitcpio b/config/rootfiles/core/34/filelists/mkinitcpio
new file mode 120000
index 0000000..f9b3fde
--- /dev/null
+++ b/config/rootfiles/core/34/filelists/mkinitcpio
@@ -0,0 +1 @@
+../../../common/mkinitcpio
\ No newline at end of file
diff --git a/config/rootfiles/core/34/update.sh b/config/rootfiles/core/34/update.sh
index 7e9b836..31f36c4 100644
--- a/config/rootfiles/core/34/update.sh
+++ b/config/rootfiles/core/34/update.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2009 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -94,7 +94,7 @@ fi
#
echo
echo Create new Initramdisks ...
-cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
+cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
diff --git a/lfs/alsa b/lfs/alsa
index 113eaca..b70d1e3 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -33,7 +33,7 @@ endif
VER = 1.0.22
UVER = 1.0.22
FVER = 1.0.20
-DVER = 1.0.22
+DVER = 1.0.22.1
THISAPP = alsa-lib-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -65,7 +65,7 @@ alsa-driver-$(DVER).tar.bz2 = $(DL_FROM)/alsa-driver-$(DVER).tar.bz2
$(DL_FILE)_MD5 = b28a12348905fb6915bc41f0edb2ecce
alsa-utils-$(UVER).tar.bz2_MD5 = f7180316188552ee1e6759a03f1fe98d
alsa-firmware-$(FVER).tar.bz2_MD5 = 75fe079c35c091cac49f3a60876bc26a
-alsa-driver-$(DVER).tar.bz2_MD5 = 3ad66ab5f3d0b7174a1ddacff38c8c70
+alsa-driver-$(DVER).tar.bz2_MD5 = 8e516f2dca30acd0c4527632ef3fb36e
install : $(TARGET)
diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio
index c7dc4b6..6365894 100644
--- a/lfs/mkinitcpio
+++ b/lfs/mkinitcpio
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/
sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf
- sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf
+ sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf
sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide
@rm -rf $(DIR_APP)
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 3e468d8..74f2974 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -117,9 +117,9 @@ int main(int argc, char *argv[])
mysystem("/sbin/modprobe ide-generic");
mysystem("/sbin/modprobe ide-cd");
mysystem("/sbin/modprobe ide-disk");
+ mysystem("/sbin/modprobe ehci-hcd");
mysystem("/sbin/modprobe uhci-hcd");
mysystem("/sbin/modprobe ohci-hcd");
- mysystem("/sbin/modprobe ehci-hcd");
mysystem("/sbin/modprobe ohci1394");
mysystem("/sbin/modprobe sd_mod");
mysystem("/sbin/modprobe sr_mod");
hooks/post-receive
--
IPFire 2.x development tree