From cc03d52ee45e30af94e909f2bab4b4a838369cb6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 24 May 2011 08:22:51 +0200 Subject: [PATCH] autoupdate kernel version at package install and core update scripts. --- config/rootfiles/core/next/update.sh | 2 +- lfs/Config | 1 + lfs/core-updates | 5 ++++- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 444fccebce..070a12b740 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -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 diff --git a/lfs/Config b/lfs/Config index 01b9cf1c92..fac10eba27 100644 --- a/lfs/Config +++ b/lfs/Config @@ -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 diff --git a/lfs/core-updates b/lfs/core-updates index f7f50cf5d9..0dd2ecccbc 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -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 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 83e9f49002..60f8bbb42e 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -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 diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 55c376b3b1..70efa9db7e 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -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 -- 2.39.2