From 9adaf7c524cba00d03b76b026e8d31bd8b9c7419 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 15 Mar 2009 07:44:06 +0100 Subject: [PATCH] Add filelists folder and exclude to core-updates Add kernel and openswan to core28 (no installer yet) --- config/rootfiles/core/24/exclude | 0 .../rootfiles/core/24/{ => filelists}/files | 0 config/rootfiles/core/25/exclude | 0 .../rootfiles/core/25/{ => filelists}/files | 0 config/rootfiles/core/26/exclude | 0 .../rootfiles/core/26/{ => filelists}/files | 0 config/rootfiles/core/27/exclude | 0 .../rootfiles/core/27/{ => filelists}/files | 0 config/rootfiles/core/28/exclude | 2 ++ .../rootfiles/core/28/{ => filelists}/files | 0 config/rootfiles/core/28/filelists/linux | 1 + config/rootfiles/core/28/filelists/openswan | 1 + lfs/core-updates | 31 ++++++++++++++++--- 13 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 config/rootfiles/core/24/exclude rename config/rootfiles/core/24/{ => filelists}/files (100%) create mode 100644 config/rootfiles/core/25/exclude rename config/rootfiles/core/25/{ => filelists}/files (100%) create mode 100644 config/rootfiles/core/26/exclude rename config/rootfiles/core/26/{ => filelists}/files (100%) create mode 100644 config/rootfiles/core/27/exclude rename config/rootfiles/core/27/{ => filelists}/files (100%) create mode 100644 config/rootfiles/core/28/exclude rename config/rootfiles/core/28/{ => filelists}/files (100%) create mode 120000 config/rootfiles/core/28/filelists/linux create mode 120000 config/rootfiles/core/28/filelists/openswan diff --git a/config/rootfiles/core/24/exclude b/config/rootfiles/core/24/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/24/files b/config/rootfiles/core/24/filelists/files similarity index 100% rename from config/rootfiles/core/24/files rename to config/rootfiles/core/24/filelists/files diff --git a/config/rootfiles/core/25/exclude b/config/rootfiles/core/25/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/25/files b/config/rootfiles/core/25/filelists/files similarity index 100% rename from config/rootfiles/core/25/files rename to config/rootfiles/core/25/filelists/files diff --git a/config/rootfiles/core/26/exclude b/config/rootfiles/core/26/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/26/files b/config/rootfiles/core/26/filelists/files similarity index 100% rename from config/rootfiles/core/26/files rename to config/rootfiles/core/26/filelists/files diff --git a/config/rootfiles/core/27/exclude b/config/rootfiles/core/27/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/27/files b/config/rootfiles/core/27/filelists/files similarity index 100% rename from config/rootfiles/core/27/files rename to config/rootfiles/core/27/filelists/files diff --git a/config/rootfiles/core/28/exclude b/config/rootfiles/core/28/exclude new file mode 100644 index 0000000000..c58d7385b2 --- /dev/null +++ b/config/rootfiles/core/28/exclude @@ -0,0 +1,2 @@ +etc/ipsec.conf +etc/ipsec.secrets diff --git a/config/rootfiles/core/28/files b/config/rootfiles/core/28/filelists/files similarity index 100% rename from config/rootfiles/core/28/files rename to config/rootfiles/core/28/filelists/files diff --git a/config/rootfiles/core/28/filelists/linux b/config/rootfiles/core/28/filelists/linux new file mode 120000 index 0000000000..c469fe1886 --- /dev/null +++ b/config/rootfiles/core/28/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/28/filelists/openswan b/config/rootfiles/core/28/filelists/openswan new file mode 120000 index 0000000000..2b72682cfa --- /dev/null +++ b/config/rootfiles/core/28/filelists/openswan @@ -0,0 +1 @@ +../../../common/openswan \ No newline at end of file diff --git a/lfs/core-updates b/lfs/core-updates index 9d242eea39..e0962bd079 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -53,12 +53,33 @@ core/%: rm -rf /install/packages/package mkdir -p /install/packages/package eval $$(cat /usr/src/config/rootfiles/$@/meta) - cp -f /usr/src/config/rootfiles/$@/update.sh /install/packages/package - cp -f /usr/src/config/rootfiles/$@/files /install/packages/package/ROOTFILES - sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES + + #Generate ROOTFILES from filelists + find $(DIR_SRC)/config/rootfiles/$@/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES.tmp + + #remove excluded files from ROOTFILES + grep -f $(DIR_SRC)/config/rootfiles/$@/exclude -v /tmp/ROOTFILES.tmp > /tmp/ROOTFILES + rm -rf /tmp/ROOTFILES.tmp + + #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/*' \ + --exclude='proc/*' --exclude='tmp/ROOTFILES' \ + --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude + mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES + tar --preserve --numeric-owner -x -C /tmp -f /$(SNAME).tar + rm -f /$(SNAME).tar + cd /tmp && tar cf /install/packages/package/files * && rm -rf * + cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp + rm /install/packages/package/ROOTFILES + mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES + + #build package + cp -f $(DIR_SRC)/config/rootfiles/$@/update.sh /install/packages/package chmod 755 /install/packages/package/update.sh - cd / && tar cf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*' - -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \ update.sh files ROOTFILES rm -rf /install/packages/package -- 2.39.2