From fd7a5e513a392329f20cd591dcd9925f8f534285 Mon Sep 17 00:00:00 2001 From: Manuel Fernando da silva rosa Date: Fri, 18 Nov 2022 14:19:21 +0000 Subject: [PATCH] Modificar 'build-32.sh' --- build-32.sh | 116 ++++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/build-32.sh b/build-32.sh index 607b2647..f54bef08 100755 --- a/build-32.sh +++ b/build-32.sh @@ -2,18 +2,18 @@ PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable -build="$(pwd)" +.build32="$(pwd)" -# Create the build folder, move into it removing stale mountpoints and files there. -[ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build -cd build +# Create the .build32 folder, move into it removing stale mountpoints and files there. +[ -e .build32 ] && [ ! -d .build32 ] && rm -f .build32 || [ ! -e .build32 ] && mkdir .build32 +cd .build32 umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done +for i in ./* ./..build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done # Set of the structure to be used for the ISO and Live system. -# See /usr/lib/live/build/config for a full list of examples. +# See /usr/lib/live/.build32/config for a full list of examples. # Up above is the manual description of what options I used so far. lb config noauto \ @@ -52,8 +52,8 @@ lb config noauto \ # Install the Xfce Desktop -mkdir -p $build/build/config/package-lists -echo xfce4 xfce4-goodies > $build/build/config/package-lists/desktop.list.chroot +mkdir -p $.build32/.build32/config/package-lists +echo xfce4 xfce4-goodies > $.build32/.build32/config/package-lists/desktop.list.chroot # Install software echo "# Install software to the squashfs for calamares to unpack to the OS. @@ -195,7 +195,7 @@ ffmpegthumbnailer xterm grub-pc -" > $build/build/config/package-lists/packages.list.chroot +" > $.build32/.build32/config/package-lists/packages.list.chroot # Packages to be stored in /pool but not installed in the OS . @@ -213,65 +213,65 @@ shim-helpers-i386-signed shim-signed shim-signed-common shim-unsigned -" > $build/build/config/package-lists/installer.list.binary +" > $.build32/.build32/config/package-lists/installer.list.binary # 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/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 -mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps -mkdir -p $build/build/config/includes.chroot/usr/share/plymouth -mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base -mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -mkdir -p $build/build/config/includes.chroot/etc/default +mkdir -p $.build32/.build32/config/archives +mkdir -p $.build32/.build32/config/includes.binary +mkdir -p $.build32/.build32/config/hooks/live +mkdir -p $.build32/.build32/config/hooks/normal +mkdir -p $.build32/.build32/config/bootloaders +mkdir -p $.build32/.build32/config/packages.chroot +mkdir -p $.build32/.build32/config/includes.chroot/etc +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/applications +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/backgrounds +mkdir -p $.build32/.build32/config/includes.chroot/etc/calamares +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/icons +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/themes +mkdir -p $.build32/.build32/config/includes.chroot/etc/live/config.conf.d +mkdir -p $.build32/.build32/config/includes.chroot/etc/dpkg/origins +mkdir -p $.build32/.build32/config/includes.chroot/usr/sbin +mkdir -p $.build32/.build32/config/includes.chroot/etc/lightdm +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/pixmaps +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/plymouth +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/desktop-base +mkdir -p $.build32/.build32/config/includes.chroot/etc/skel/Desktop +mkdir -p $.build32/.build32/config/includes.chroot/etc/default # 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/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 -cp $build/bootloader-config-32bit/* $build/build/config/includes.chroot/usr/sbin -cp $build/grub/* $build/build/config/includes.chroot/etc/default +cp $.build32/userconfig/* $.build32/.build32/config/includes.chroot/etc/live/config.conf.d +cp $.build32/applications/* $.build32/.build32/config/includes.chroot/usr/share/applications +cp $.build32/hooks/live/* $.build32/.build32/config/hooks/live +cp $.build32/hooks/normal/* $.build32/.build32/config/hooks/normal +cp $.build32/install-debian/* $.build32/.build32/config/includes.chroot/usr/share/pixmaps +cp $.build32/sources-final/* $.build32/.build32/config/includes.chroot/usr/sbin +cp $.build32/bootloader-config-32bit/* $.build32/.build32/config/includes.chroot/usr/sbin +cp $.build32/grub/* $.build32/.build32/config/includes.chroot/etc/default -cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders -cp -r $build/repos/* $build/build/config/archives -cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds -cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares -cp -r $build/configs/* $build/build/config/includes.chroot/etc/ -cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons -cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes -cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base -cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth -cp -r $build/packages32/* $build/build/config/packages.chroot +cp -r $.build32/lightdm/* $.build32/.build32/config/includes.chroot/etc/lightdm +cp -r $.build32/bootloaders/* $.build32/.build32/config/bootloaders +cp -r $.build32/repos/* $.build32/.build32/config/archives +cp -r $.build32/backgrounds/* $.build32/.build32/config/includes.chroot/usr/share/backgrounds +cp -r $.build32/calamares/* $.build32/.build32/config/includes.chroot/etc/calamares +cp -r $.build32/configs/* $.build32/.build32/config/includes.chroot/etc/ +cp -r $.build32/icons/* $.build32/.build32/config/includes.chroot/usr/share/icons +cp -r $.build32/themes/* $.build32/.build32/config/includes.chroot/usr/share/themes +cp -r $.build32/desktop-base/* $.build32/.build32/config/includes.chroot/usr/share/desktop-base +cp -r $.build32/plymouth/* $.build32/.build32/config/includes.chroot/usr/share/plymouth +cp -r $.build32/packages32/* $.build32/.build32/config/packages.chroot # Resolves Synaptics issue. Might be better in a conf hook. -mkdir -p $build/build/config/includes.chroot/usr/share/distro-info -mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates -cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates -ln -s Devuan.info $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.info -ln -s Devuan.mirrors $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors -ln -s devuan.csv $build/build/config/includes.chroot/usr/share/distro-info/my-distro.csv +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/distro-info +mkdir -p $.build32/.build32/config/includes.chroot/usr/share/python-apt/templates +cp -r $.build32/devuan/* $.build32/.build32/config/includes.chroot/usr/share/python-apt/templates +ln -s Devuan.info $.build32/.build32/config/includes.chroot/usr/share/python-apt/templates/My-distro.info +ln -s Devuan.mirrors $.build32/.build32/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors +ln -s devuan.csv $.build32/.build32/config/includes.chroot/usr/share/distro-info/my-distro.csv -# Build the ISO # -lb build #--debug --verbose +# .build32 the ISO # +lb .build32 #--debug --verbose