manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make patch file reproducible

Browse source
This commit is contained in:
Manuel Thalmann 2024-06-20 16:46:06 +02:00
parent f219d2fba3
commit b16f334bf4
2 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
archiso/scripts/show-diff.sh
View file

@ -2,5 +2,22 @@
# Shows the differences between Arch's original `archiso` template named `releng` and this `archiso` directory. # Shows the differences between Arch's original `archiso` template named `releng` and this `archiso` directory.
pushd "${BASH_SOURCE%/*}" > /dev/null; pushd "${BASH_SOURCE%/*}" > /dev/null;
. ./template-path.sh; . ./template-path.sh;
diff -ru --color --no-dereference -x{.git,.gitignore,README.md,scripts,LICENSE,out,valhalla.patch,work} "$(templatePath)" ..; {
contextRoot="$(mktemp -d)";
rm -rf "$contextRoot";
cp -r "$(templatePath)" "$contextRoot";
chmod -R 755 "$contextRoot";
git init "$contextRoot";
pushd "$contextRoot" > /dev/null;
git add .;
popd > /dev/null;
sudo rsync -r --exclude={.git,.gitignore,README.md,scripts,LICENSE,out,valhalla.patch,work} .. "$contextRoot"
} 2>&1 > /dev/null;
pushd "$contextRoot" > /dev/null;
git diff;
popd > /dev/null;
popd > /dev/null; popd > /dev/null;

18
archiso/scripts/valhalla.patch
View file

@ -1,7 +1,8 @@
diff -ru --no-dereference -x.git -x.gitignore -xREADME.md -xscripts -xLICENSE -xout -xvalhalla.patch /usr/bin/../share/archiso/configs/releng/airootfs/root/.zlogin ../airootfs/root/.zlogin diff --git a/airootfs/root/.zlogin b/airootfs/root/.zlogin
--- /usr/bin/../share/archiso/configs/releng/airootfs/root/.zlogin 2024-05-23 23:16:11.000000000 +0200 index bf6bc8f..f003a1f 100755
+++ ../airootfs/root/.zlogin 2024-06-18 22:02:32.189465802 +0200 --- a/airootfs/root/.zlogin
@@ -4,3 +4,10 @@ +++ b/airootfs/root/.zlogin
@@ -4,3 +4,10 @@ if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
fi fi
~/.automated_script.sh ~/.automated_script.sh
@ -12,10 +13,11 @@ diff -ru --no-dereference -x.git -x.gitignore -xREADME.md -xscripts -xLICENSE -x
+fi; +fi;
+ +
+loadkeys de_CH-latin1 +loadkeys de_CH-latin1
diff -ru --no-dereference -x.git -x.gitignore -xREADME.md -xscripts -xLICENSE -xout -xvalhalla.patch /usr/bin/../share/archiso/configs/releng/packages.x86_64 ../packages.x86_64 diff --git a/packages.x86_64 b/packages.x86_64
--- /usr/bin/../share/archiso/configs/releng/packages.x86_64 2024-05-23 23:16:11.000000000 +0200 index 9e876e7..cb29125 100755
+++ ../packages.x86_64 2024-06-18 22:18:23.338967643 +0200 --- a/packages.x86_64
@@ -32,6 +32,7 @@ +++ b/packages.x86_64
@@ -32,6 +32,7 @@ f2fs-tools
fatresize fatresize
foot-terminfo foot-terminfo
fsarchiver fsarchiver