manuel
/
My-distro-configs-devuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new commit

This commit is contained in:
Manuel 2022-11-19 09:24:53 -01:00
parent 3afe6a77c0
commit faedd426fa
4 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BldHelper-32-non-pae-release.sh
View File

@ -32,7 +32,7 @@ cd ./My-distro-configs-devuan && git pull --ff-only
# Timing matters, don't destroy the old one without a replacement. # Timing matters, don't destroy the old one without a replacement.
# Check for the ISO to appear and wait for things to settle. # Check for the ISO to appear and wait for things to settle.
until [ -e build/*.iso ] until [ -e build32/*.iso ]
do ((++_break)) do ((++_break))
[ $_break -gt $_wait ] && break || sleep 1 [ $_break -gt $_wait ] && break || sleep 1
done done
@ -41,10 +41,10 @@ if [ ${_break} -lt ${_wait} ] ; then
### 10 June, 2022 - After 17 June, this comment and the following line can be removed ### 10 June, 2022 - After 17 June, this comment and the following line can be removed
echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out
mv build/*.iso build/${FileName}.iso mv build32/*.iso build/${FileName}.iso
# Make the checksum file. # Make the checksum file.
cd build cd build32
echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum

6
BldHelper-32-release.sh
View File

@ -32,7 +32,7 @@ cd ./My-distro-configs-devuan && git pull --ff-only
# Timing matters, don't destroy the old one without a replacement. # Timing matters, don't destroy the old one without a replacement.
# Check for the ISO to appear and wait for things to settle. # Check for the ISO to appear and wait for things to settle.
until [ -e build/*.iso ] until [ -e build32/*.iso ]
do ((++_break)) do ((++_break))
[ $_break -gt $_wait ] && break || sleep 1 [ $_break -gt $_wait ] && break || sleep 1
done done
@ -41,10 +41,10 @@ if [ ${_break} -lt ${_wait} ] ; then
### 10 June, 2022 - After 17 June, this comment and the following line can be removed ### 10 June, 2022 - After 17 June, this comment and the following line can be removed
echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out
mv build/*.iso build/${FileName}.iso mv build32/*.iso build/${FileName}.iso
# Make the checksum file. # Make the checksum file.
cd build cd build32
echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum

2
BldHelper-64-release.sh
View File

@ -24,7 +24,7 @@ _break=0 ; _wait=30 # Time (in seconds) to wait
# Move into the builder directory. # Move into the builder directory.
# Make sure the local repos are up to date. # Make sure the local repos are up to date.
cd /repos/builds/my-distro-builds/ cd /repos/builds/my-distro-builds/
cd ./My-distro-configs-devuan && git pull --ff-onlyly cd ./My-distro-configs-devuan && git pull --ff-only
# Run the build script - expect 50 minutes, allow 60. # Run the build script - expect 50 minutes, allow 60.
./build-64.sh 2>&1 | tee -a /tmp/${FileName}.out ./build-64.sh 2>&1 | tee -a /tmp/${FileName}.out

110
build-32.sh
View File

@ -2,18 +2,18 @@
PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH"
# Set the working folder variable # Set the working folder variable
.build32="$(pwd)" build32="$(pwd)"
# Create the .build32 folder, move into it removing stale mountpoints and files there. # Create the build32 folder, move into it removing stale mountpoints and files there.
[ -e .build32 ] && [ ! -d .build32 ] && rm -f .build32 || [ ! -e .build32 ] && mkdir .build32 [ -e build32 ] && [ ! -d build32 ] && rm -f build32 || [ ! -e build32 ] && mkdir build32
cd .build32 cd build32
umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null 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. # Set of the structure to be used for the ISO and Live system.
# See /usr/lib/live/.build32/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. # Up above is the manual description of what options I used so far.
lb config noauto \ lb config noauto \
@ -52,8 +52,8 @@ lb config noauto \
# Install the Xfce Desktop # Install the Xfce Desktop
mkdir -p $.build32/.build32/config/package-lists mkdir -p $build32/build32/config/package-lists
echo xfce4 xfce4-goodies > $.build32/.build32/config/package-lists/desktop.list.chroot echo xfce4 xfce4-goodies > $build32/build32/config/package-lists/desktop.list.chroot
# Install software # Install software
echo "# Install software to the squashfs for calamares to unpack to the OS. echo "# Install software to the squashfs for calamares to unpack to the OS.
@ -195,7 +195,7 @@ ffmpegthumbnailer
xterm xterm
grub-pc grub-pc
" > $.build32/.build32/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 . # Packages to be stored in /pool but not installed in the OS .
@ -213,61 +213,61 @@ shim-helpers-i386-signed
shim-signed shim-signed
shim-signed-common shim-signed-common
shim-unsigned shim-unsigned
" > $.build32/.build32/config/package-lists/installer.list.binary " > $build32/build32/config/package-lists/installer.list.binary
# Setup the chroot structure # Setup the chroot structure
mkdir -p $.build32/.build32/config/archives mkdir -p $build32/build32/config/archives
mkdir -p $.build32/.build32/config/includes.binary mkdir -p $build32/build32/config/includes.binary
mkdir -p $.build32/.build32/config/hooks/live mkdir -p $build32/build32/config/hooks/live
mkdir -p $.build32/.build32/config/hooks/normal mkdir -p $build32/build32/config/hooks/normal
mkdir -p $.build32/.build32/config/bootloaders mkdir -p $build32/build32/config/bootloaders
mkdir -p $.build32/.build32/config/packages.chroot mkdir -p $build32/build32/config/packages.chroot
mkdir -p $.build32/.build32/config/includes.chroot/etc 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/applications
mkdir -p $.build32/.build32/config/includes.chroot/usr/share/backgrounds 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/etc/calamares
mkdir -p $.build32/.build32/config/includes.chroot/usr/share/icons 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/usr/share/themes
mkdir -p $.build32/.build32/config/includes.chroot/etc/live/config.conf.d 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/etc/dpkg/origins
mkdir -p $.build32/.build32/config/includes.chroot/usr/sbin 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/etc/lightdm
mkdir -p $.build32/.build32/config/includes.chroot/usr/share/pixmaps 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/plymouth
mkdir -p $.build32/.build32/config/includes.chroot/usr/share/desktop-base 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/skel/Desktop
mkdir -p $.build32/.build32/config/includes.chroot/etc/default mkdir -p $build32/build32/config/includes.chroot/etc/default
# Copy Configs to the chroot # Copy Configs to the chroot
cp $.build32/userconfig/* $.build32/.build32/config/includes.chroot/etc/live/config.conf.d 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/applications/* $build32/build32/config/includes.chroot/usr/share/applications
cp $.build32/hooks/live/* $.build32/.build32/config/hooks/live cp $build32/hooks/live/* $build32/build32/config/hooks/live
cp $.build32/hooks/normal/* $.build32/.build32/config/hooks/normal cp $build32/hooks/normal/* $build32/build32/config/hooks/normal
cp $.build32/install-debian/* $.build32/.build32/config/includes.chroot/usr/share/pixmaps 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/sources-final/* $build32/build32/config/includes.chroot/usr/sbin
cp $.build32/bootloader-config-32bit/* $.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 $build32/grub/* $build32/build32/config/includes.chroot/etc/default
cp -r $.build32/lightdm/* $.build32/.build32/config/includes.chroot/etc/lightdm cp -r $build32/lightdm/* $build32/build32/config/includes.chroot/etc/lightdm
cp -r $.build32/bootloaders/* $.build32/.build32/config/bootloaders cp -r $build32/bootloaders/* $build32/build32/config/bootloaders
cp -r $.build32/repos/* $.build32/.build32/config/archives cp -r $build32/repos/* $build32/build32/config/archives
cp -r $.build32/backgrounds/* $.build32/.build32/config/includes.chroot/usr/share/backgrounds 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/calamares/* $build32/build32/config/includes.chroot/etc/calamares
cp -r $.build32/configs/* $.build32/.build32/config/includes.chroot/etc/ 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/icons/* $build32/build32/config/includes.chroot/usr/share/icons
cp -r $.build32/themes/* $.build32/.build32/config/includes.chroot/usr/share/themes 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/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/plymouth/* $build32/build32/config/includes.chroot/usr/share/plymouth
cp -r $.build32/packages32/* $.build32/.build32/config/packages.chroot cp -r $build32/packages32/* $build32/build32/config/packages.chroot
# Resolves Synaptics issue. Might be better in a conf hook. # Resolves Synaptics issue. Might be better in a conf hook.
mkdir -p $.build32/.build32/config/includes.chroot/usr/share/distro-info mkdir -p $build32/build32/config/includes.chroot/usr/share/distro-info
mkdir -p $.build32/.build32/config/includes.chroot/usr/share/python-apt/templates 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 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.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.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 ln -s devuan.csv $build32/build32/config/includes.chroot/usr/share/distro-info/my-distro.csv