From c0721d11407f7b7a062b44868b1eab9315fefd54 Mon Sep 17 00:00:00 2001 From: manuel Date: Fri, 12 Jan 2024 12:27:32 -0100 Subject: [PATCH] update build scripts --- my-distro-debian-32-pae/build.sh | 5 ++--- my-distro-debian-32/build.sh | 5 ++--- my-distro-debian-64/build.sh | 5 ++--- my-distro-devuan-32-pae/build.sh | 4 ++-- my-distro-devuan-32/build.sh | 4 ++-- my-distro-devuan-64/build.sh | 4 ++-- my-distro-ubuntu-64/build.sh | 4 ++-- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh index d2156757..f67278e0 100755 --- a/my-distro-debian-32-pae/build.sh +++ b/my-distro-debian-32-pae/build.sh @@ -230,17 +230,16 @@ shim-unsigned # Setup the chroot structure mkdir -p $build/build/config/archives mkdir -p $build/build/config/includes.binary -mkdir -p $build/build/config/hooks/live mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -254,7 +253,7 @@ mkdir -p $build/build/config/includes.chroot/boot/grub/themes # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh index 04781180..6ad7907c 100755 --- a/my-distro-debian-32/build.sh +++ b/my-distro-debian-32/build.sh @@ -231,17 +231,16 @@ shim-unsigned # Setup the chroot structure mkdir -p $build/build/config/archives mkdir -p $build/build/config/includes.binary -mkdir -p $build/build/config/hooks/live mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -255,7 +254,7 @@ mkdir -p $build/build/config/includes.chroot/boot/grub # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh index b64a868a..6d51b8f8 100755 --- a/my-distro-debian-64/build.sh +++ b/my-distro-debian-64/build.sh @@ -235,13 +235,12 @@ mkdir -p $build/build/config/hooks/live mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot -mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps @@ -254,7 +253,7 @@ mkdir -p $build/build/config/includes.chroot/boot/grub/themes # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index 51335a41..6537f76f 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -235,12 +235,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -255,7 +255,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index 2be8e418..962c2e4e 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -236,12 +236,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -256,7 +256,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index 61a19d79..d60f8bb9 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -236,12 +236,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm @@ -257,7 +257,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin diff --git a/my-distro-ubuntu-64/build.sh b/my-distro-ubuntu-64/build.sh index f1f5252c..437e818a 100755 --- a/my-distro-ubuntu-64/build.sh +++ b/my-distro-ubuntu-64/build.sh @@ -231,12 +231,12 @@ mkdir -p $build/build/config/hooks/normal mkdir -p $build/build/config/bootloaders mkdir -p $build/build/config/packages.chroot mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/lib/live/config mkdir -p $build/build/config/includes.chroot/usr/share/applications mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps @@ -248,7 +248,7 @@ mkdir -p $build/build/config/includes.chroot/boot/grub/themes # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/live/* $build/build/config/ncludes.chroot/usr/lib/live/config cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin