autoupdate kernel version at package install and core update scripts.
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 May 2011 06:22:51 +0000 (08:22 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 24 May 2011 06:22:51 +0000 (08:22 +0200)
config/rootfiles/core/next/update.sh
lfs/Config
lfs/core-updates
src/paks/linux-pae/install.sh
src/paks/linux-xen/install.sh

index 444fcce..070a12b 100644 (file)
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 #
-KVER="2.6.32.41"
+KVER="xxxKVERxxx"
 MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
index 01b9cf1..fac10eb 100644 (file)
@@ -196,6 +196,7 @@ define PAK
        fi
        cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
        sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
+       sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
        chmod 755 /install/packages/package/{{,un}install,update}.sh
        cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
                -p --numeric-owner
index f7f50cf..0dd2ecc 100644 (file)
@@ -63,7 +63,7 @@ core/%:
        
        #Change KVER to Kernelversion
        sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
-       
+
        #Remove doubled files with tar/untar/tar to save space
        tar -c -C / --files-from=/tmp/ROOTFILES \
                -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
@@ -80,6 +80,9 @@ core/%:
        #build package
        cp -f $(DIR_SRC)/config/rootfiles/$@/update.sh /install/packages/package
        chmod 755 /install/packages/package/update.sh
+       #Change xxxKVERxxx to Kernelversion
+       sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh
+
        cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \
                update.sh files ROOTFILES
        rm -rf /install/packages/package
index 83e9f49..60f8bbb 100644 (file)
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.41
+KVER=xxxKVERxxx
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then
index 55c376b..70efa9d 100644 (file)
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 #
-KVER=2.6.32.41
+KVER=xxxKVERxxx
 ROOT=`mount | grep " / " | cut -d" " -f1`
 ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2`
 if [ ! -z $ROOTUUID ]; then