Fix alsa kmod build on buildsystems with ipfire kernel

Fix updater directory permission/owner handling

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index b22b6cd799ca7d56119aaf7195d1e3a621d44c2c..1e68f0badcc1d7584947e7a5086d847430a3b778 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -112,7 +112,9 @@ echo Stopping Squid ...
 #
 echo
 echo Unpack the updated files ...
-extract_files
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+       --no-overwrite-dir
 #
 # Starting Squid
 #
@@ -213,14 +215,6 @@ rm -rf /etc/sysconfig/lm_sensors
 #
 /etc/init.d/mISDN config
 #
-# Update permissions
-#
-chown -r nobody:nobody /var/ipfire/outgoing
-chown -r nobody:nobody /var/ipfire/proxy
-chown -r nobody:nobody /var/ipfire/qos
-chown -r nobody:nobody /var/ipfire/urlfilter
-chown -r nobody:nobody /var/ipfire/updatexlerator
-#
 # Remove obsolete packages, update the lists and do upgrade
 #
 echo '#!/bin/bash'                                        >  /tmp/remove_obsolete_paks 

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8dca3922fca71c9f3056030cd2894c31efaf1d99..8b70cd3defd2612778dad52a14ff076419e4f1fa 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-== List of softwares used to build IPFire Version: 2.3-test ==
+== List of softwares used to build IPFire Version: 2.3-beta4 ==
 * Archive-Tar-1.29
 * Archive-Zip-1.16
 * BerkeleyDB-0.27

diff --git a/lfs/alsa b/lfs/alsa
index 677783e88ae3758387d83f6803d75a26ca13a065..6bc2a56c61ccdb541faf9b89143cd1ae04c12a83 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -95,7 +95,7 @@ ifeq "$(KMOD)" "1"
        cd $(DIR_SRC) && tar xfj $(DIR_DL)/alsa-driver-$(VER).tar.bz2
        cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc/ | |g" Makefile
        cd $(DIR_SRC)/alsa-driver-$(VER) && sed -i -e "s| soc||g" Makefile
-       cd $(DIR_SRC)/alsa-driver-$(VER) && ./configure
+       cd $(DIR_SRC)/alsa-driver-$(VER) && ./configure --with-kernel=/usr/src/linux
        cd $(DIR_SRC)/alsa-driver-$(VER) && make
        cd $(DIR_SRC)/alsa-driver-$(VER) && make install
 else

diff --git a/lfs/linux b/lfs/linux
index 821349e1a9852404919a42de9de811c7b469d4ca..50adaa18a0d5e4e93a40d1fcae8cb0afa087d695 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -91,7 +91,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) $(DIR_SRC)/linux* $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        ln -s linux-$(VER) /usr/src/linux
 
        # Security fix for CIFS & Netfilter SNMP

diff --git a/lfs/updater b/lfs/updater
index f743730001e01ec00f8c542e3fd48c2076342993..422ef4718f8b202256dadbc8737c1c29d0deb206 100644 (file)
--- a/lfs/updater
+++ b/lfs/updater
@@ -60,7 +60,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
                --exclude='proc/*' --exclude='tmp/ROOTFILES'
        mv -f /tmp/ROOTFILES /install/updater/ROOTFILES
-       tar -x -C /tmp -f /$(SNAME).tar
+       tar --preserve --numeric-owner -x  -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
        cd /tmp && tar cf /install/updater/files * && rm -rf *
        cat /install/updater/ROOTFILES | grep -v "#" > /install/updater/ROOTFILES.tmp