diff --git a/.MiniRepoIgnoreList b/.MiniRepoIgnoreList new file mode 100644 index 0000000..c9a3bfe --- /dev/null +++ b/.MiniRepoIgnoreList @@ -0,0 +1,34 @@ +# This is what gets ignored from the Dev repo +# If it isn't in this list , it gets updated. +# Misc stuff of no consequence to the builds. +.git +.gitignore +LICENSE +README.md +build + +# Needed for doing updates during release builds +.UpdateIgnore +.MiniRepoIgnoreList +RepoUpdater +RepoUpdate.config + +# Not needed from the Dev repos for Release builds +testbuild.sh +unstablebuild.sh +BldHelper-testing.sh +BldHelper-unstable.sh +acortesting +acorunstable + +# Already updated from in core-files with the first run. +# Saves time, by not rechecking files from core-files . +acorapplication +acorbootloaders +acorcsv +acorgrub +acorhooks +acorlightdm +acorprofile +acorrepos +acoruserconfig diff --git a/.UpdateIgnore b/.UpdateIgnore new file mode 100644 index 0000000..6e66e11 --- /dev/null +++ b/.UpdateIgnore @@ -0,0 +1,42 @@ +# Files we don't want from other repositories. +.git +.gitignore +.UpdateIgnore +RepoUpdater +RepoUpdate.config +LICENSE +README.md + +# Files & Directories in the Production Repo that shouldn't be touched. +.MiniRepoIgnoreList +budgiebuild.sh +cinnamonbuild.sh +gnomebuild.sh +kdebuild.sh +lxde32build.sh +lxdebuild.sh +lxqt32build.sh +lxqtbuild.sh +xfce32build.sh +xfcebuild.sh +Budgie +Cinnamon +Gnome +Kde +Lxde +Lxde32 +Lxqt +Lxqt32 +Mate +Xfce +Xfce32 +Master.UpdateIgnore + +# Files a directories from the Dev repo to exclude. +BldHelper-testing.sh +BldHelper-unstable.sh +unstablebuild.sh +testbuild.sh +acortesting +acorunstable +build diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e75dda0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +*~ +*.bak +*.BAK +*.orig +*.ORIG +/TODO +*log.out +build \ No newline at end of file diff --git a/AcorOS-budgie/BldHelper-release.sh b/AcorOS-budgie/BldHelper-release.sh deleted file mode 100755 index 715be02..0000000 --- a/AcorOS-budgie/BldHelper-release.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# BldHelper-release.sh -# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. -# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. - -### ## # Set build working variables HERE # ## ### - -PREFIX=AcorOS-budgie-5.3 # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/home/manuel/acoros-build/out/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/home/manuel/acoros-build/out/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkDir=/manuel/acoros-build/AcorOSbudgie86_64configs # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -_break=0 ; _wait=30 # Time (in seconds) to wait - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /home/manuel/acoros-build/ -cd ./AcorOSbudgie86_64configs && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. - ./budgiebuild-64.sh 2>&1 | tee -a /tmp/${FileName}.out - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do ((++_break)) - [ $_break -gt $_wait ] && break || sleep 1 -done - -if [ ${_break} -lt ${_wait} ] ; then -### 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 - -mv build/*.iso build/${FileName}.iso - -# Make the checksum file. -cd build -echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum -sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* - -lb clean & - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -### - -else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append /tmp/${FileName}.out - mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -fi - diff --git a/AcorOS-budgie/BldHelper-testing.sh b/AcorOS-budgie/BldHelper-testing.sh deleted file mode 100755 index 44ee11a..0000000 --- a/AcorOS-budgie/BldHelper-testing.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -##BldHelper-testing.sh -### ## # Set build working variables HERE # ## ### - -PREFIX=AcorOS-budgie # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=testing # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName=${PREFIX}-${SUFFIX}-${TODAY}-${BUILD} # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/home/manuel/acoros-build/out/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/home/manuel/acoros-build/out/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -#WorkingDir=~/pep_builder/${PREFIX}${SUFFIX} # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -WorkingDir=/manuel/acoros-build/AcorOSbudgie86_64configs #* If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /home/manuel/acoros-build/ -cd ./AcorOSbudgie86_64configs && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. -./budgietestbuild-64.sh 2>&1 | tee /tmp/${FileName}.log - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do sleep 2 # Waiting for ISO image -done - -cd build -mv *.iso ../${FileName}.iso -lb clean & -cd ../ - -# Make the checksum file. -sha512sum ${FileName}.iso > ${FileName}-sha512.checksum - - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -#mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log - -# Set the timestamps to the ISO's internal before moving them to the DL directory. -# _stamp=$(hexdump -C -s 33598 -n 12 ${FileName}.iso | head -1 | cut -f2 -d"|" ) - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* -### - - -# This will "flush" our variables without handing any back to MasterBuilder.sh . -# exit # But NOT `return`. - diff --git a/AcorOS-budgie/BldHelper-unstable.sh b/AcorOS-budgie/BldHelper-unstable.sh deleted file mode 100755 index d95cf5b..0000000 --- a/AcorOS-budgie/BldHelper-unstable.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -# BldHelper-unstable.sh -### ## # Set build working variables HERE # ## ### - -PREFIX=AcorOS-budgie # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=unstable # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -### ## # Make NO Edits Below This Line !! # ## ### - - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName=${PREFIX}-${SUFFIX}-${TODAY}-${BUILD} # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/home/manuel/acoros-build/out/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/home/manuel/acoros-build/out/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkingDir=~/manuel/acoros-build/AcorOSbudgie86_64configs # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * - - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /home/manuel/acoros-build/ -cd ./AcorOSbudgie86_64configs && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. -./budgieunstablebuild-64.sh 2>&1 | tee /tmp/${FileName}.log - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do sleep 2 # Waiting for ISO image -done - -cd fusato -mv *.iso ../${FileName}.iso -lb clean & -cd ../ - -# Make the checksum file. -sha512sum ${FileName}.iso > ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.log ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log - -# Set the timestamps to the ISO's internal before moving them to the DL directory. -# _stamp=$(hexdump -C -s 33598 -n 12 ${FileName}.iso | head -1 | cut -f2 -d"|" ) - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* -### - - -# This will "flush" our variables without handing any back to MasterBuilder.sh . -# exit # But NOT `return`. - diff --git a/AcorOS-budgie/acortesting b/AcorOS-budgie/acortesting deleted file mode 120000 index 336e72f..0000000 --- a/AcorOS-budgie/acortesting +++ /dev/null @@ -1 +0,0 @@ -../acortesting \ No newline at end of file diff --git a/AcorOS-budgie/acorunstable b/AcorOS-budgie/acorunstable deleted file mode 120000 index d8d3786..0000000 --- a/AcorOS-budgie/acorunstable +++ /dev/null @@ -1 +0,0 @@ -../acorunstable \ No newline at end of file diff --git a/AcorOS-budgie/budgietestbuild-64.sh b/AcorOS-budgie/budgietestbuild-64.sh deleted file mode 100755 index 07d7333..0000000 --- a/AcorOS-budgie/budgietestbuild-64.sh +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -acorbuild="$(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 -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 - - -# 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. -# Up above is the manual description of what options I used so far. - -lb config noauto \ - --binary-images iso-hybrid \ - --mode debian \ - --architectures amd64 \ - --linux-flavours amd64 \ - --distribution bullseye \ - --archive-areas "main contrib non-free" \ - --mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-chroot https://deb.debian.org/debian \ - --parent-mirror-chroot-security https://security.debian.org/debian-security \ - --parent-mirror-binary https://deb.debian.org/debian \ - --parent-mirror-binary-security https://security.debian.org/debian-security \ - --mirror-chroot https://deb.debian.org/debian \ - --mirror-chroot-security https://security.debian.org/debian-security \ - --updates true \ - --security true \ - --backports false \ - --cache true \ - --apt-recommends true \ - --iso-application AcorOS \ - --win32-loader false \ - --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-volume AcorOS \ - --image-name "AcorOS" \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Budgie Desktop -mkdir -p $acorbuild/build/config/package-lists -echo budgie-desktop > $acorbuild/build/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-amd64 -locales -nala -dkms -dbus-x11 -ntp -deb-multimedia-keyring -acoros-keyring -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -w64codecs -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -file-roller -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -package-update-indicator -desktop-base -debian-system-adjustments -gnome-packagekit -acoros-translations -acoroslocale -gvfs-backends -samba -gnome-packagekit -iso-flag-png -network-manager -network-manager-gnome -bluez -gufw -acoros-icons -blue-papirus-icons -brown-papirus-icons -darc-aurora-gtk-theme -orchis-gtk-theme -papirus-cyan-icons -papirus-dark-grey -papirus-icon-theme -yaru++-icons -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -budgie-core -#budgie-desktop -nautilus -gnome-terminal -gedit -gedit-plugins -acoros-budgie-configs -gnome-backgrounds -budgie-app-launcher-applet -budgie-applications-menu-applet -budgie-brightness-controller-applet -budgie-hotcorners-applet -budgie-fuzzyclock-applet -budgie-keyboard-autoswitch-applet -budgie-previews budgie-previews-applet -budgie-quicknote-applet -budgie-recentlyused-applet -budgie-showtime-applet -budgie-takeabreak-applet -budgie-trash-applet -budgie-visualspace-applet -budgie-weathershow-applet -budgie-window-mover-applet -budgie-window-shuffler -budgie-workspace-overview-applet -budgie-workspace-wallpaper-applet -budgie-desktop-view -budgie-indicator-applet -balena-etcher-electron -gnome-screenshot -gnome-contacts eog eog-plugins -gnome-bluetooth gnome-calendar -gnome-paint gnome-calculator -gnome-system-monitor -alacarte font-manager -baobab -gnome-calendar -gnome-disk-utility -neofetch -timeshift -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -transmission-gtk -thunderbird -thunderbird-l10n-pt-br -thunderbird-l10n-pt-pt -thunderbird-l10n-de -thunderbird-l10n-en-gb -thunderbird-l10n-es-es -thunderbird-l10n-fr -thunderbird-l10n-it -firefox -firefox-l10n-de -firefox-l10n-en -firefox-l10n-es -firefox-l10n-it -firefox-l10n-br -firefox-l10n-pt -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -libreoffice-l10n-fr -libreoffice-l10n-it -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -qt5-style-plugins -qt5ct -calamares-settings-acoros -calamares -firmware-linux -firmware-linux-free -firmware-linux-nonfree -firmware-misc-nonfree -firmware-realtek -firmware-atheros -firmware-bnx2 -firmware-bnx2x -firmware-brcm80211 -firmware-intelwimax -firmware-iwlwifi -firmware-libertas -firmware-netxen -firmware-zd1211 -gdebi -locales -f2fs-tools -xfsprogs -xfsdump -grub-pc - -" > $acorbuild/build/config/package-lists/packages.list.chroot - - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -efibootmgr -grub-common -grub2-common -grub-efi -grub-efi-amd64 -grub-efi-amd64-bin -grub-efi-amd64-signed -libefiboot1 -libefivar1 -mokutil -os-prober -shim-helpers-amd64-signed -shim-signed -shim-signed-common -shim-unsigned - -" > $acorbuild/build/config/package-lists/installer.list.binary - - -# Setup the chroot structure -mkdir -p $acorbuild/build/config/archives -mkdir -p $acorbuild/build/config/includes.binary -mkdir -p $acorbuild/build/config/hooks/live -mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders -mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications -mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info -mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates -mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins -mkdir -p $acorbuild/build/config/includes.chroot/usr/bin -mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin -mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm - -# Copy Configs to the chroot -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications -cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live -cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm - -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives -cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info - -# Place files unique to Testing builds here. -cp -r $acorbuild/acortesting/bootloaders/* $acorbuild/build/config/bootloaders -cp -r $acorbuild/acortesting/repos/* $acorbuild/build/config/archives - -#symlinks chroot -ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info -ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors -ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv -ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default - - - -# Build the ISO # -lb build #--debug --verbose - - diff --git a/AcorOS-budgie/budgieunstablebuild-64.sh b/AcorOS-budgie/budgieunstablebuild-64.sh deleted file mode 100755 index e44269e..0000000 --- a/AcorOS-budgie/budgieunstablebuild-64.sh +++ /dev/null @@ -1,298 +0,0 @@ -#!/bin/bash -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -acorbuild="$(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 -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 - - -# 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. -# Up above is the manual description of what options I used so far. - -lb config noauto \ - --binary-images iso-hybrid \ - --mode debian \ - --architectures amd64 \ - --linux-flavours amd64 \ - --distribution bullseye \ - --archive-areas "main contrib non-free" \ - --mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-chroot https://deb.debian.org/debian \ - --parent-mirror-chroot-security https://security.debian.org/debian-security \ - --parent-mirror-binary https://deb.debian.org/debian \ - --parent-mirror-binary-security https://security.debian.org/debian-security \ - --mirror-chroot https://deb.debian.org/debian \ - --mirror-chroot-security https://security.debian.org/debian-security \ - --updates true \ - --security true \ - --backports false \ - --cache true \ - --apt-recommends true \ - --iso-application AcorOS \ - --win32-loader false \ - --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-volume AcorOS \ - --image-name "AcorOS" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Budgie Desktop -mkdir -p $acorbuild/build/config/package-lists -echo budgie-desktop > $acorbuild/build/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-amd64 -locales -nala -dkms -dbus-x11 -ntp -deb-multimedia-keyring -acoros-keyring -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -w64codecs -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -file-roller -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -package-update-indicator -desktop-base -debian-system-adjustments -gnome-packagekit -acoros-translations -acoroslocale -gvfs-backends -samba -gnome-packagekit -iso-flag-png -network-manager -network-manager-gnome -bluez -gufw -acoros-icons -blue-papirus-icons -brown-papirus-icons -darc-aurora-gtk-theme -orchis-gtk-theme -papirus-cyan-icons -papirus-dark-grey -papirus-icon-theme -yaru++-icons -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -budgie-core -#budgie-desktop -nautilus -gnome-terminal -gedit -gedit-plugins -acoros-budgie-configs -gnome-backgrounds -budgie-app-launcher-applet -budgie-applications-menu-applet -budgie-brightness-controller-applet -budgie-hotcorners-applet -budgie-fuzzyclock-applet -budgie-keyboard-autoswitch-applet -budgie-previews budgie-previews-applet -budgie-quicknote-applet -budgie-recentlyused-applet -budgie-showtime-applet -budgie-takeabreak-applet -budgie-trash-applet -budgie-visualspace-applet -budgie-weathershow-applet -budgie-window-mover-applet -budgie-window-shuffler -budgie-workspace-overview-applet -budgie-workspace-wallpaper-applet -budgie-desktop-view -budgie-indicator-applet -balena-etcher-electron -gnome-screenshot -gnome-contacts eog eog-plugins -gnome-bluetooth gnome-calendar -gnome-paint gnome-calculator -gnome-system-monitor -alacarte font-manager -baobab -gnome-calendar -gnome-disk-utility -neofetch -timeshift -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -transmission-gtk -thunderbird -thunderbird-l10n-pt-br -thunderbird-l10n-pt-pt -thunderbird-l10n-de -thunderbird-l10n-en-gb -thunderbird-l10n-es-es -thunderbird-l10n-fr -thunderbird-l10n-it -firefox -firefox-l10n-de -firefox-l10n-en -firefox-l10n-es -firefox-l10n-it -firefox-l10n-br -firefox-l10n-pt -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -libreoffice-l10n-fr -libreoffice-l10n-it -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -qt5-style-plugins -qt5ct -calamares-settings-acoros -calamares -firmware-linux -firmware-linux-free -firmware-linux-nonfree -firmware-misc-nonfree -firmware-realtek -firmware-atheros -firmware-bnx2 -firmware-bnx2x -firmware-brcm80211 -firmware-intelwimax -firmware-iwlwifi -firmware-libertas -firmware-netxen -firmware-zd1211 -gdebi -f2fs-tools -xfsprogs -xfsdump -grub-pc - -" > $acorbuild/build/config/package-lists/packages.list.chroot - - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -efibootmgr -grub-common -grub2-common -grub-efi -grub-efi-amd64 -grub-efi-amd64-bin -grub-efi-amd64-signed -libefiboot1 -libefivar1 -mokutil -os-prober -shim-helpers-amd64-signed -shim-signed -shim-signed-common -shim-unsigned - -" > $acorbuild/build/config/package-lists/installer.list.binary - - -# Setup the chroot structure -mkdir -p $acorbuild/build/config/archives -mkdir -p $acorbuild/build/config/includes.binary -mkdir -p $acorbuild/build/config/hooks/live -mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders -mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications -mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info -mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates -mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins -mkdir -p $acorbuild/build/config/includes.chroot/usr/bin -mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin -mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm - -# Copy Configs to the chroot -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications -cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live -cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm - -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives -cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info - - -# Place files unique to Unstable builds here. -cp -r $acorbuild/acorunstable/bootloaders/* $acorbuild/build/config/bootloaders -cp -r $acorbuild/acorunstable/repos/* $acorbuild/build/config/archives - -#symlinks chroot -ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info -ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors -ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv -ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default - -# Build the ISO # -lb build #--debug --verbose - - diff --git a/AcorOS-cinnamon/BldHelper-release.sh b/AcorOS-cinnamon/BldHelper-release.sh deleted file mode 100755 index ffb15f5..0000000 --- a/AcorOS-cinnamon/BldHelper-release.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# BldHelper-release.sh -# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. -# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. - -### ## # Set build working variables HERE # ## ### - -PREFIX=AcorOS-cinnamon-5.3 # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/home/manuel/acoros-build/out/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/home/manuel/acoros-build/out/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkDir=/manuel/acoros-build/AcorOScinnamon86_64configs # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -_break=0 ; _wait=30 # Time (in seconds) to wait - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /home/manuel/acoros-build/ -cd ./AcorOScinnamon86_64configs && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. - ./cinnamonbuild-64.sh 2>&1 | tee -a /tmp/${FileName}.out - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do ((++_break)) - [ $_break -gt $_wait ] && break || sleep 1 -done - -if [ ${_break} -lt ${_wait} ] ; then -### 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 - -mv build/*.iso build/${FileName}.iso - -# Make the checksum file. -cd build -echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum -sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* - -lb clean & - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -### - -else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append /tmp/${FileName}.out - mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -fi - diff --git a/AcorOS-cinnamon/BldHelper-testing.sh b/AcorOS-cinnamon/BldHelper-testing.sh deleted file mode 100755 index a240fd0..0000000 --- a/AcorOS-cinnamon/BldHelper-testing.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -##BldHelper-testing.sh -### ## # Set build working variables HERE # ## ### - -PREFIX=AcorOS-cinnamon # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=testing # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName=${PREFIX}-${SUFFIX}-${TODAY}-${BUILD} # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/home/manuel/acoros-build/out/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/home/manuel/acoros-build/out/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -#WorkingDir=~/pep_builder/${PREFIX}${SUFFIX} # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -WorkingDir=/manuel/acoros-build/AcorOScinnamon86_64configs #* If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /home/manuel/acoros-build/ -cd ./AcorOScinnamon86_64configs && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. -./cinnamontestbuild-64.sh 2>&1 | tee /tmp/${FileName}.log - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do sleep 2 # Waiting for ISO image -done - -cd build -mv *.iso ../${FileName}.iso -lb clean & -cd ../ - -# Make the checksum file. -sha512sum ${FileName}.iso > ${FileName}-sha512.checksum - - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -#mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log - -# Set the timestamps to the ISO's internal before moving them to the DL directory. -# _stamp=$(hexdump -C -s 33598 -n 12 ${FileName}.iso | head -1 | cut -f2 -d"|" ) - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* -### - - -# This will "flush" our variables without handing any back to MasterBuilder.sh . -# exit # But NOT `return`. - diff --git a/AcorOS-cinnamon/BldHelper-unstable.sh b/AcorOS-cinnamon/BldHelper-unstable.sh deleted file mode 100755 index 3cc3333..0000000 --- a/AcorOS-cinnamon/BldHelper-unstable.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -# BldHelper-unstable.sh -### ## # Set build working variables HERE # ## ### - -PREFIX=AcorOS-cinnamon # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=unstable # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -### ## # Make NO Edits Below This Line !! # ## ### - - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName=${PREFIX}-${SUFFIX}-${TODAY}-${BUILD} # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/home/manuel/acoros-build/out/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/home/manuel/acoros-build/out/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkingDir=~/manuel/acoros-build/AcorOScinnamon86_64configs # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * - - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /home/manuel/acoros-build/ -cd ./AcorOScinnamon86_64configs && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. -./cinnamonunstablebuild-64.sh 2>&1 | tee /tmp/${FileName}.log - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do sleep 2 # Waiting for ISO image -done - -cd fusato -mv *.iso ../${FileName}.iso -lb clean & -cd ../ - -# Make the checksum file. -sha512sum ${FileName}.iso > ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.log ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log - -# Set the timestamps to the ISO's internal before moving them to the DL directory. -# _stamp=$(hexdump -C -s 33598 -n 12 ${FileName}.iso | head -1 | cut -f2 -d"|" ) - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* -### - - -# This will "flush" our variables without handing any back to MasterBuilder.sh . -# exit # But NOT `return`. - diff --git a/AcorOS-cinnamon/acortesting b/AcorOS-cinnamon/acortesting deleted file mode 120000 index 336e72f..0000000 --- a/AcorOS-cinnamon/acortesting +++ /dev/null @@ -1 +0,0 @@ -../acortesting \ No newline at end of file diff --git a/AcorOS-cinnamon/acorunstable b/AcorOS-cinnamon/acorunstable deleted file mode 120000 index d8d3786..0000000 --- a/AcorOS-cinnamon/acorunstable +++ /dev/null @@ -1 +0,0 @@ -../acorunstable \ No newline at end of file diff --git a/AcorOS-gnome/acortesting b/AcorOS-gnome/acortesting deleted file mode 120000 index 336e72f..0000000 --- a/AcorOS-gnome/acortesting +++ /dev/null @@ -1 +0,0 @@ -../acortesting \ No newline at end of file diff --git a/AcorOS-gnome/acorunstable b/AcorOS-gnome/acorunstable deleted file mode 120000 index d8d3786..0000000 --- a/AcorOS-gnome/acorunstable +++ /dev/null @@ -1 +0,0 @@ -../acorunstable \ No newline at end of file diff --git a/AcorOS-gnome/gnometestbuild-64.sh b/AcorOS-gnome/gnometestbuild-64.sh deleted file mode 100755 index 056571f..0000000 --- a/AcorOS-gnome/gnometestbuild-64.sh +++ /dev/null @@ -1,270 +0,0 @@ -#!/bin/bash -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -acorbuild="$(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 -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 - - -# 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. -# Up above is the manual description of what options I used so far. - -lb config noauto \ - --binary-images iso-hybrid \ - --mode debian \ - --architectures amd64 \ - --linux-flavours amd64 \ - --distribution bullseye \ - --archive-areas "main contrib non-free" \ - --mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-chroot https://deb.debian.org/debian \ - --parent-mirror-chroot-security https://security.debian.org/debian-security \ - --parent-mirror-binary https://deb.debian.org/debian \ - --parent-mirror-binary-security https://security.debian.org/debian-security \ - --mirror-chroot https://deb.debian.org/debian \ - --mirror-chroot-security https://security.debian.org/debian-security \ - --updates true \ - --security true \ - --backports false \ - --cache true \ - --apt-recommends true \ - --iso-application AcorOS \ - --win32-loader false \ - --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-volume AcorOS \ - --image-name "AcorOS" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Gnome Desktop -mkdir -p $acorbuild/build/config/package-lists -echo gnome > $acorbuild/build/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-amd64 -locales -nala -dkms -dbus-x11 -ntp -deb-multimedia-keyring -acoros-keyring -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -w64codecs -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -desktop-base -debian-system-adjustments -gnome-packagekit -acoros-translations -acoroslocale -gvfs-backends -samba -gnome-packagekit -iso-flag-png -network-manager -network-manager-gnome -bluez -gufw -acoros-icons -orchis-gtk-theme -blue-papirus-icons -brown-papirus-icons -darc-aurora-gtk-theme -papirus-cyan-icons -papirus-dark-grey -papirus-icon-theme -yaru++-icons -plymouth -plymouth-themes -cups -system-config-printer -acoros-gnome-configs -gdm3 -gedit -gedit-plugins -gnome-shell-extension-appindicator -gnome-shell-extension-arc-menu -gnome-shell-extension-desktop-icons-ng -gnome-shell-extension-dash-to-panel -gnome-remote-desktop -vino -vinagre -balena-etcher-electron -gnome-terminal -gnome-system-monitor -gnome-calculator -gnome-firmware -timeshift -neofetch -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -fwupd -bleachbit -dconf-editor -alacarte -gimp -gimp-data-extras -evince -eog -transmission-gtk -thunderbird -thunderbird-l10n-pt-br -thunderbird-l10n-pt-pt -thunderbird-l10n-de -thunderbird-l10n-en-gb -thunderbird-l10n-es-es -thunderbird-l10n-fr -thunderbird-l10n-it -firefox -firefox-l10n-de -firefox-l10n-en -firefox-l10n-es -firefox-l10n-it -firefox-l10n-br -firefox-l10n-pt -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -libreoffice-l10n-fr -libreoffice-l10n-it -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -brasero -qt5-style-plugins -qt5ct -calamares-settings-acoros -calamares -firmware-linux -firmware-linux-free -firmware-linux-nonfree -firmware-misc-nonfree -firmware-realtek -firmware-atheros -firmware-bnx2 -firmware-bnx2x -firmware-brcm80211 -firmware-intelwimax -firmware-iwlwifi -firmware-libertas -firmware-netxen -firmware-zd1211 -gdebi -f2fs-tools -xfsprogs -xfsdump -grub-pc - -" > $acorbuild/build/config/package-lists/packages.list.chroot - - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -efibootmgr -grub-common -grub2-common -grub-efi -grub-efi-amd64 -grub-efi-amd64-bin -grub-efi-amd64-signed -libefiboot1 -libefivar1 -mokutil -os-prober -shim-helpers-amd64-signed -shim-signed -shim-signed-common -shim-unsigned - -" > $acorbuild/build/config/package-lists/installer.list.binary - - -# Setup the chroot structure -mkdir -p $acorbuild/build/config/archives -mkdir -p $acorbuild/build/config/includes.binary -mkdir -p $acorbuild/build/config/hooks/live -mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders -mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications -mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info -mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates -mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins -mkdir -p $acorbuild/build/config/includes.chroot/usr/bin -mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin - -# Copy Configs to the chroot -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d -cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications -cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live -cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d - -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives -cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info - -# Place files unique to Testing builds here. -cp -r $acorbuild/acortesting/bootloaders/* $acorbuild/build/config/bootloaders -cp -r $acorbuild/acortesting/repos/* $acorbuild/build/config/archives - -#symlinks chroot -ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info -ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors -ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv -ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default - -# Build the ISO # -lb build #--debug --verbose - - diff --git a/AcorOS-kde/acortesting b/AcorOS-kde/acortesting deleted file mode 120000 index 336e72f..0000000 --- a/AcorOS-kde/acortesting +++ /dev/null @@ -1 +0,0 @@ -../acortesting \ No newline at end of file diff --git a/AcorOS-kde/acorunstable b/AcorOS-kde/acorunstable deleted file mode 120000 index d8d3786..0000000 --- a/AcorOS-kde/acorunstable +++ /dev/null @@ -1 +0,0 @@ -../acorunstable \ No newline at end of file diff --git a/AcorOS-budgie/acorapplication b/Budgie/acorapplication similarity index 100% rename from AcorOS-budgie/acorapplication rename to Budgie/acorapplication diff --git a/AcorOS-budgie/acorbootloaders b/Budgie/acorbootloaders similarity index 100% rename from AcorOS-budgie/acorbootloaders rename to Budgie/acorbootloaders diff --git a/AcorOS-budgie/acorcsv b/Budgie/acorcsv similarity index 100% rename from AcorOS-budgie/acorcsv rename to Budgie/acorcsv diff --git a/AcorOS-budgie/acorhooks/live/0030-user-setup b/Budgie/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-budgie/acorhooks/live/0030-user-setup rename to Budgie/acorhooks/live/0030-user-setup diff --git a/AcorOS-budgie/acorhooks/normal/0520-applications.hook.chroot b/Budgie/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-budgie/acorhooks/normal/0520-applications.hook.chroot rename to Budgie/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-budgie/acorhooks/normal/0560-calamares-packages.hook.chroot b/Budgie/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-budgie/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Budgie/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-budgie/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Budgie/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-budgie/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Budgie/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/AcorOS-budgie/acorlightdm b/Budgie/acorlightdm similarity index 100% rename from AcorOS-budgie/acorlightdm rename to Budgie/acorlightdm diff --git a/AcorOS-budgie/acorprofile b/Budgie/acorprofile similarity index 100% rename from AcorOS-budgie/acorprofile rename to Budgie/acorprofile diff --git a/AcorOS-budgie/acorrepos b/Budgie/acorrepos similarity index 100% rename from AcorOS-budgie/acorrepos rename to Budgie/acorrepos diff --git a/AcorOS-budgie/acoruserconfig b/Budgie/acoruserconfig similarity index 100% rename from AcorOS-budgie/acoruserconfig rename to Budgie/acoruserconfig diff --git a/AcorOS-budgie/budgiebuild-64.sh b/Budgie/build.sh similarity index 96% rename from AcorOS-budgie/budgiebuild-64.sh rename to Budgie/build.sh index 0cc7e65..c2ea200 100755 --- a/AcorOS-budgie/budgiebuild-64.sh +++ b/Budgie/build.sh @@ -95,7 +95,6 @@ libelf-dev htop package-update-indicator desktop-base -debian-system-adjustments gnome-packagekit acoros-translations acoroslocale @@ -267,20 +266,21 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/AcorOS-cinnamon/acorapplication b/Cinnamon/acorapplication similarity index 100% rename from AcorOS-cinnamon/acorapplication rename to Cinnamon/acorapplication diff --git a/AcorOS-cinnamon/acorbootloaders b/Cinnamon/acorbootloaders similarity index 100% rename from AcorOS-cinnamon/acorbootloaders rename to Cinnamon/acorbootloaders diff --git a/AcorOS-cinnamon/acorcsv b/Cinnamon/acorcsv similarity index 100% rename from AcorOS-cinnamon/acorcsv rename to Cinnamon/acorcsv diff --git a/AcorOS-cinnamon/acorhooks/live/0030-user-setup b/Cinnamon/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-cinnamon/acorhooks/live/0030-user-setup rename to Cinnamon/acorhooks/live/0030-user-setup diff --git a/AcorOS-cinnamon/acorhooks/normal/0520-applications.hook.chroot b/Cinnamon/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-cinnamon/acorhooks/normal/0520-applications.hook.chroot rename to Cinnamon/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-cinnamon/acorhooks/normal/0560-calamares-packages.hook.chroot b/Cinnamon/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-cinnamon/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Cinnamon/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-cinnamon/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Cinnamon/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-cinnamon/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Cinnamon/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/AcorOS-cinnamon/acorlightdm b/Cinnamon/acorlightdm similarity index 100% rename from AcorOS-cinnamon/acorlightdm rename to Cinnamon/acorlightdm diff --git a/AcorOS-cinnamon/acorprofile b/Cinnamon/acorprofile similarity index 100% rename from AcorOS-cinnamon/acorprofile rename to Cinnamon/acorprofile diff --git a/AcorOS-cinnamon/acorrepos b/Cinnamon/acorrepos similarity index 100% rename from AcorOS-cinnamon/acorrepos rename to Cinnamon/acorrepos diff --git a/AcorOS-cinnamon/acoruserconfig b/Cinnamon/acoruserconfig similarity index 100% rename from AcorOS-cinnamon/acoruserconfig rename to Cinnamon/acoruserconfig diff --git a/AcorOS-cinnamon/cinnamonbuild-64.sh b/Cinnamon/build.sh similarity index 96% rename from AcorOS-cinnamon/cinnamonbuild-64.sh rename to Cinnamon/build.sh index 5712ff3..a00825f 100755 --- a/AcorOS-cinnamon/cinnamonbuild-64.sh +++ b/Cinnamon/build.sh @@ -95,7 +95,6 @@ libelf-dev htop package-update-indicator desktop-base -debian-system-adjustments gnome-packagekit acoros-translations acoroslocale @@ -251,20 +250,20 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/AcorOS-gnome/BldHelper-release.sh b/Gnome/BldHelper-release.sh similarity index 100% rename from AcorOS-gnome/BldHelper-release.sh rename to Gnome/BldHelper-release.sh diff --git a/AcorOS-gnome/BldHelper-testing.sh b/Gnome/BldHelper-testing.sh similarity index 100% rename from AcorOS-gnome/BldHelper-testing.sh rename to Gnome/BldHelper-testing.sh diff --git a/AcorOS-gnome/BldHelper-unstable.sh b/Gnome/BldHelper-unstable.sh similarity index 100% rename from AcorOS-gnome/BldHelper-unstable.sh rename to Gnome/BldHelper-unstable.sh diff --git a/AcorOS-gnome/acorapplication b/Gnome/acorapplication similarity index 100% rename from AcorOS-gnome/acorapplication rename to Gnome/acorapplication diff --git a/AcorOS-gnome/acorbootloaders b/Gnome/acorbootloaders similarity index 100% rename from AcorOS-gnome/acorbootloaders rename to Gnome/acorbootloaders diff --git a/AcorOS-gnome/acorcsv b/Gnome/acorcsv similarity index 100% rename from AcorOS-gnome/acorcsv rename to Gnome/acorcsv diff --git a/AcorOS-gnome/acorhooks/live/0030-user-setup b/Gnome/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-gnome/acorhooks/live/0030-user-setup rename to Gnome/acorhooks/live/0030-user-setup diff --git a/AcorOS-gnome/acorhooks/normal/0520-applications.hook.chroot b/Gnome/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-gnome/acorhooks/normal/0520-applications.hook.chroot rename to Gnome/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-gnome/acorhooks/normal/0560-calamares-packages.hook.chroot b/Gnome/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-gnome/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Gnome/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-gnome/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Gnome/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-gnome/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Gnome/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/AcorOS-gnome/acorprofile b/Gnome/acorprofile similarity index 100% rename from AcorOS-gnome/acorprofile rename to Gnome/acorprofile diff --git a/AcorOS-gnome/acorrepos b/Gnome/acorrepos similarity index 100% rename from AcorOS-gnome/acorrepos rename to Gnome/acorrepos diff --git a/AcorOS-gnome/acoruserconfig b/Gnome/acoruserconfig similarity index 100% rename from AcorOS-gnome/acoruserconfig rename to Gnome/acoruserconfig diff --git a/AcorOS-gnome/gnomebuild-64.sh b/Gnome/build.sh similarity index 95% rename from AcorOS-gnome/gnomebuild-64.sh rename to Gnome/build.sh index 1564f37..a71663a 100755 --- a/AcorOS-gnome/gnomebuild-64.sh +++ b/Gnome/build.sh @@ -94,7 +94,6 @@ apt-config-auto-update libelf-dev htop desktop-base -debian-system-adjustments gnome-packagekit acoros-translations acoroslocale @@ -242,19 +241,21 @@ mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub + #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/AcorOS-kde/acorapplication b/Kde/acorapplication similarity index 100% rename from AcorOS-kde/acorapplication rename to Kde/acorapplication diff --git a/AcorOS-kde/acorbootloaders b/Kde/acorbootloaders similarity index 100% rename from AcorOS-kde/acorbootloaders rename to Kde/acorbootloaders diff --git a/AcorOS-kde/acorcsv b/Kde/acorcsv similarity index 100% rename from AcorOS-kde/acorcsv rename to Kde/acorcsv diff --git a/AcorOS-kde/acorhooks/live/0030-user-setup b/Kde/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-kde/acorhooks/live/0030-user-setup rename to Kde/acorhooks/live/0030-user-setup diff --git a/AcorOS-kde/acorhooks/normal/0520-applications.hook.chroot b/Kde/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-kde/acorhooks/normal/0520-applications.hook.chroot rename to Kde/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-kde/acorhooks/normal/0560-calamares-packages.hook.chroot b/Kde/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-kde/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Kde/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-kde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Kde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-kde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Kde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/AcorOS-kde/acorprofile b/Kde/acorprofile similarity index 100% rename from AcorOS-kde/acorprofile rename to Kde/acorprofile diff --git a/AcorOS-kde/acorrepos b/Kde/acorrepos similarity index 100% rename from AcorOS-kde/acorrepos rename to Kde/acorrepos diff --git a/AcorOS-kde/acorsddm/kde_settings.conf b/Kde/acorsddm/kde_settings.conf similarity index 100% rename from AcorOS-kde/acorsddm/kde_settings.conf rename to Kde/acorsddm/kde_settings.conf diff --git a/AcorOS-kde/acoruserconfig b/Kde/acoruserconfig similarity index 100% rename from AcorOS-kde/acoruserconfig rename to Kde/acoruserconfig diff --git a/AcorOS-gnome/gnomeunstablebuild-64.sh b/Kde/build.sh similarity index 78% rename from AcorOS-gnome/gnomeunstablebuild-64.sh rename to Kde/build.sh index 47c306d..fd59ef7 100755 --- a/AcorOS-gnome/gnomeunstablebuild-64.sh +++ b/Kde/build.sh @@ -15,6 +15,7 @@ for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm # 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. # Up above is the manual description of what options I used so far. + lb config noauto \ --binary-images iso-hybrid \ --mode debian \ @@ -47,9 +48,9 @@ lb config noauto \ "${@}" -# Install the Gnome Desktop +# Install the Kde Desktop mkdir -p $acorbuild/build/config/package-lists -echo gnome > $acorbuild/build/config/package-lists/desktop.list.chroot +echo plasma-desktop > $acorbuild/build/config/package-lists/desktop.list.chroot # Install software echo "# Install software to the squashfs for calamares to unpack to the OS. @@ -83,8 +84,10 @@ p7zip-full p7zip-rar zip unzip +ark pulseaudio -pavucontrol +pavucontrol-qt +pavucontrol-qt-l10n alsa-utils aptitude synaptic @@ -93,60 +96,76 @@ apt-config-auto-update libelf-dev htop desktop-base -debian-system-adjustments -gnome-packagekit acoros-translations acoroslocale +python3-gi-cairo +acorosstick gvfs-backends samba gnome-packagekit iso-flag-png network-manager -network-manager-gnome -bluez gufw acoros-icons -orchis-gtk-theme blue-papirus-icons brown-papirus-icons -darc-aurora-gtk-theme papirus-cyan-icons papirus-dark-grey papirus-icon-theme -yaru++-icons -plymouth -plymouth-themes +materia-gtk-theme +materia-kde +orchis-gtk-theme cups system-config-printer -acoros-gnome-configs -gdm3 -gedit -gedit-plugins -gnome-shell-extension-appindicator -gnome-shell-extension-arc-menu -gnome-shell-extension-desktop-icons-ng -gnome-shell-extension-dash-to-panel -gnome-remote-desktop -vino -vinagre -balena-etcher-electron -gnome-terminal -gnome-system-monitor -gnome-calculator -gnome-firmware -timeshift -neofetch -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -fwupd -bleachbit +plymouth +plymouth-themes +sddm +kde-config-sddm +acoros-kde-wallpapers +acoros-kde-configs +plasma-discover-backend-flatpak +konsole +dolphin dolphin-plugins +qtcurve +yakuake +bluedevil +kamera +kate +kcalc +kde-spectacle +kdeconnect +kmag +kscreen +okular +okular-extra-backends +partitionmanager +kmenuedit +plasma-browser-integration +print-manager +kfind +kdenetwork +kde-style-breeze +kde-style-oxygen-qt5 +kde-style-qtcurve-qt5 +gtk2-engines-qtcurve +kde-config-gtk-style +kde-config-gtk-style-preview +kde-config-screenlocker +kde-config-systemd +plasma-nm +gtk2-engines-oxygen +gtk2-engines-qtcurve +gtk2-engines +gtk3-engines-breeze +bleachbit dconf-editor -alacarte gimp gimp-data-extras -evince -eog +skanlite +digikam +balena-etcher-electron +neofetch +timeshift transmission-gtk thunderbird thunderbird-l10n-pt-br @@ -164,7 +183,8 @@ firefox-l10n-it firefox-l10n-br firefox-l10n-pt libreoffice -libreoffice-gtk3 +libreoffice-kf5 +libreoffice-qt5 libreoffice-l10n-pt libreoffice-l10n-pt-br libreoffice-l10n-de @@ -173,16 +193,13 @@ libreoffice-l10n-es libreoffice-l10n-fr libreoffice-l10n-it printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku +kmahjongg +2048-qt +ksudoku +dreamchess guvcview vlc -brasero -qt5-style-plugins -qt5ct -calamares-settings-acoros +calamares-settings-acoros-kde calamares firmware-linux firmware-linux-free @@ -241,22 +258,22 @@ mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/etc/sddm.conf.d +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +cp $acorbuild/acorsddm/* $acorbuild/build/config/includes.chroot/etc/sddm.conf.d +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info - - -# Place files unique to Unstable builds here. -cp -r $acorbuild/acorunstable/bootloaders/* $acorbuild/build/config/bootloaders -cp -r $acorbuild/acorunstable/repos/* $acorbuild/build/config/archives +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info @@ -264,6 +281,8 @@ ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-ap ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default + + # Build the ISO # lb build #--debug --verbose diff --git a/Lxde/acorapplication b/Lxde/acorapplication new file mode 120000 index 0000000..e2f9133 --- /dev/null +++ b/Lxde/acorapplication @@ -0,0 +1 @@ +../acorapplication \ No newline at end of file diff --git a/Lxde/acorbootloaders b/Lxde/acorbootloaders new file mode 120000 index 0000000..162ad0c --- /dev/null +++ b/Lxde/acorbootloaders @@ -0,0 +1 @@ +../acorbootloaders \ No newline at end of file diff --git a/Lxde/acorcsv b/Lxde/acorcsv new file mode 120000 index 0000000..799da98 --- /dev/null +++ b/Lxde/acorcsv @@ -0,0 +1 @@ +../acorcsv \ No newline at end of file diff --git a/AcorOS-lxde/acorhooks/live/0030-user-setup b/Lxde/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-lxde/acorhooks/live/0030-user-setup rename to Lxde/acorhooks/live/0030-user-setup diff --git a/AcorOS-lxde/acorhooks/normal/0520-applications.hook.chroot b/Lxde/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-lxde/acorhooks/normal/0520-applications.hook.chroot rename to Lxde/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-lxde/acorhooks/normal/0560-calamares-packages.hook.chroot b/Lxde/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-lxde/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Lxde/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-lxde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Lxde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-lxde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Lxde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/Lxde/acorlightdm b/Lxde/acorlightdm new file mode 120000 index 0000000..85c8ff7 --- /dev/null +++ b/Lxde/acorlightdm @@ -0,0 +1 @@ +../acorlightdm \ No newline at end of file diff --git a/Lxde/acorprofile b/Lxde/acorprofile new file mode 120000 index 0000000..29d1f75 --- /dev/null +++ b/Lxde/acorprofile @@ -0,0 +1 @@ +../acorprofile \ No newline at end of file diff --git a/Lxde/acorrepos b/Lxde/acorrepos new file mode 120000 index 0000000..c3e5c40 --- /dev/null +++ b/Lxde/acorrepos @@ -0,0 +1 @@ +../acorrepos \ No newline at end of file diff --git a/Lxde/acoruserconfig b/Lxde/acoruserconfig new file mode 120000 index 0000000..486688c --- /dev/null +++ b/Lxde/acoruserconfig @@ -0,0 +1 @@ +../acoruserconfig \ No newline at end of file diff --git a/AcorOS-cinnamon/cinnamontestbuild-64.sh b/Lxde/build.sh similarity index 86% rename from AcorOS-cinnamon/cinnamontestbuild-64.sh rename to Lxde/build.sh index ebbd38d..be39ecb 100755 --- a/AcorOS-cinnamon/cinnamontestbuild-64.sh +++ b/Lxde/build.sh @@ -48,9 +48,9 @@ lb config noauto \ "${@}" -# Install the Cinnamon Desktop +# Install the Lxde Desktop mkdir -p $acorbuild/build/config/package-lists -echo cinnamon > $acorbuild/build/config/package-lists/desktop.list.chroot +echo lxde > $acorbuild/build/config/package-lists/desktop.list.chroot # Install software echo "# Install software to the squashfs for calamares to unpack to the OS. @@ -95,7 +95,6 @@ libelf-dev htop package-update-indicator desktop-base -debian-system-adjustments gnome-packagekit acoros-translations acoroslocale @@ -104,19 +103,22 @@ gvfs-backends samba gnome-packagekit iso-flag-png +sambashare network-manager network-manager-gnome bluez blueman gufw acoros-icons +numix-gtk-theme orchis-gtk-theme -teja-gtk-theme darc-aurora-gtk-theme -tela-circle-icon-theme -tela-icon-theme -mcata-gtk-theme -acoros-backgrounds +blue-papirus-icons +brown-papirus-icons +papirus-dark-grey +papirus-icon-theme +gtk2-engines +acoros-backgrounds plymouth plymouth-themes cups @@ -124,28 +126,24 @@ system-config-printer lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings -acoros-cinnamon-sounds -nemo gir1.2-nemo-3.0 -nemo-fileroller -nemo-share -nemo-seahorse -nemo-image-converter -nemo-gtkhash -muffin -acoros-cinnamon-configs +acoros-lxde-configs +menulibre +mugshot xscreensaver xscreensaver-data xscreensaver-data-extra xscreensaver-gl xscreensaver-gl-extra -timeshift -gnome-screenshot -gnome-disk-utility balena-etcher-electron -gnome-terminal -gedit -gedit-plugins -gnome-calculator +gnome-system-tools +gnome-disk-utility +gnome-calculator +neofetch +accountsservice +catfish +timeshift +compton +compton-conf gnome-software gnome-software-plugin-flatpak gnome-software-plugin-snap @@ -154,8 +152,8 @@ bleachbit dconf-editor gimp gimp-data-extras -evince xsane -eog +evince +xsane transmission-gtk thunderbird thunderbird-l10n-pt-br @@ -188,6 +186,7 @@ gnome-mahjongg gnome-sudoku guvcview vlc +xfburn qt5-style-plugins qt5ct calamares-settings-acoros @@ -210,7 +209,6 @@ gdebi f2fs-tools xfsprogs xfsdump -numlockx grub-pc " > $acorbuild/build/config/package-lists/packages.list.chroot @@ -251,22 +249,21 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info - -# Place files unique to Testing builds here. -cp -r $acorbuild/acortesting/bootloaders/* $acorbuild/build/config/bootloaders -cp -r $acorbuild/acortesting/repos/* $acorbuild/build/config/archives +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info @@ -275,8 +272,6 @@ ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/a ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default - - # Build the ISO # lb build #--debug --verbose diff --git a/Lxde32/acorapplication b/Lxde32/acorapplication new file mode 120000 index 0000000..e2f9133 --- /dev/null +++ b/Lxde32/acorapplication @@ -0,0 +1 @@ +../acorapplication \ No newline at end of file diff --git a/Lxde32/acorbootloaders b/Lxde32/acorbootloaders new file mode 120000 index 0000000..162ad0c --- /dev/null +++ b/Lxde32/acorbootloaders @@ -0,0 +1 @@ +../acorbootloaders \ No newline at end of file diff --git a/Lxde32/acorcsv b/Lxde32/acorcsv new file mode 120000 index 0000000..799da98 --- /dev/null +++ b/Lxde32/acorcsv @@ -0,0 +1 @@ +../acorcsv \ No newline at end of file diff --git a/AcorOS-lxde32/acorhooks/live/0030-user-setup b/Lxde32/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-lxde32/acorhooks/live/0030-user-setup rename to Lxde32/acorhooks/live/0030-user-setup diff --git a/AcorOS-lxde32/acorhooks/normal/0520-applications.hook.chroot b/Lxde32/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-lxde32/acorhooks/normal/0520-applications.hook.chroot rename to Lxde32/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-lxde32/acorhooks/normal/0560-calamares-packages.hook.chroot b/Lxde32/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-lxde32/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Lxde32/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-lxde32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Lxde32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-lxde32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Lxde32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/Lxde32/acorlightdm b/Lxde32/acorlightdm new file mode 120000 index 0000000..85c8ff7 --- /dev/null +++ b/Lxde32/acorlightdm @@ -0,0 +1 @@ +../acorlightdm \ No newline at end of file diff --git a/Lxde32/acorprofile b/Lxde32/acorprofile new file mode 120000 index 0000000..29d1f75 --- /dev/null +++ b/Lxde32/acorprofile @@ -0,0 +1 @@ +../acorprofile \ No newline at end of file diff --git a/Lxde32/acorrepos b/Lxde32/acorrepos new file mode 120000 index 0000000..c3e5c40 --- /dev/null +++ b/Lxde32/acorrepos @@ -0,0 +1 @@ +../acorrepos \ No newline at end of file diff --git a/Lxde32/acoruserconfig b/Lxde32/acoruserconfig new file mode 120000 index 0000000..486688c --- /dev/null +++ b/Lxde32/acoruserconfig @@ -0,0 +1 @@ +../acoruserconfig \ No newline at end of file diff --git a/Lxde32/build.sh b/Lxde32/build.sh new file mode 100755 index 0000000..422e1e5 --- /dev/null +++ b/Lxde32/build.sh @@ -0,0 +1,275 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +acorbuild="$(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 +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 + + +# 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. +# Up above is the manual description of what options I used so far. + + lb config noauto \ + --binary-images iso-hybrid \ + --mode debian \ + --architectures i386 \ + --linux-flavours 686-pae \ + --distribution bullseye \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-chroot https://deb.debian.org/debian \ + --parent-mirror-chroot-security https://security.debian.org/debian-security \ + --parent-mirror-binary https://deb.debian.org/debian \ + --parent-mirror-binary-security https://security.debian.org/debian-security \ + --mirror-chroot https://deb.debian.org/debian \ + --mirror-chroot-security https://security.debian.org/debian-security \ + --uefi-secure-boot enable \ + --updates true \ + --security true \ + --backports false \ + --cache true \ + --apt-recommends true \ + --iso-application AcorOS \ + --win32-loader false \ + --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-volume AcorOS \ + --image-name "AcorOS" \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + "${@}" + +# Install the Lxde Desktop +mkdir -p $acorbuild/build/config/package-lists +echo lxde > $acorbuild/build/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +linux-headers-686-pae +locales +nala +dkms +dbus-x11 +ntp +deb-multimedia-keyring +acoros-keyring +xorg +xserver-xorg +xserver-xorg-input-synaptics +xserver-xorg-input-all +xserver-xorg-video-vmware +xserver-xorg-video-all +w32codecs +ffmpeg +sox +twolame +lame +faad +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-plugins-bad +gstreamer1.0-pulseaudio +unrar +rar +p7zip-full +p7zip-rar +zip +unzip +pulseaudio +pavucontrol +alsa-utils +aptitude +synaptic +gparted +apt-config-auto-update +libelf-dev +htop +package-update-indicator +desktop-base +gnome-packagekit +acoros-translations +acoroslocale +acorosstick +gvfs-backends +samba +gnome-packagekit +iso-flag-png +sambashare +network-manager +network-manager-gnome +bluez +blueman +gufw +acoros-icons +numix-gtk-theme +orchis-gtk-theme +darc-aurora-gtk-theme +blue-papirus-icons +brown-papirus-icons +papirus-dark-grey +papirus-icon-theme +gtk2-engines +acoros-backgrounds +plymouth +plymouth-themes +cups +system-config-printer +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +acoros-lxde-configs +menulibre +mugshot +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +gnome-system-tools +gnome-disk-utility +gnome-calculator +neofetch +accountsservice +catfish +timeshift +compton +compton-conf +gnome-software +gnome-software-plugin-flatpak +gnome-software-plugin-snap +fwupd +bleachbit +dconf-editor +gimp +gimp-data-extras +evince +xsane +transmission-gtk +thunderbird +thunderbird-l10n-pt-br +thunderbird-l10n-pt-pt +thunderbird-l10n-de +thunderbird-l10n-en-gb +thunderbird-l10n-es-es +thunderbird-l10n-fr +thunderbird-l10n-it +firefox +firefox-l10n-de +firefox-l10n-en +firefox-l10n-es +firefox-l10n-it +firefox-l10n-br +firefox-l10n-pt +libreoffice +libreoffice-gtk3 +libreoffice-l10n-pt +libreoffice-l10n-pt-br +libreoffice-l10n-de +libreoffice-l10n-en-gb +libreoffice-l10n-es +libreoffice-l10n-fr +libreoffice-l10n-it +printer-driver-cups-pdf +gnome-2048 +gnome-chess +gnome-mahjongg +gnome-sudoku +guvcview +vlc +xfburn +qt5-style-plugins +qt5ct +calamares-settings-acoros-32 +calamares +firmware-linux +firmware-linux-free +firmware-linux-nonfree +firmware-misc-nonfree +firmware-realtek +firmware-atheros +firmware-bnx2 +firmware-bnx2x +firmware-brcm80211 +firmware-intelwimax +firmware-iwlwifi +firmware-libertas +firmware-netxen +firmware-zd1211 +gdebi +f2fs-tools +xfsprogs +xfsdump +grub-pc + +" > $acorbuild/build/config/package-lists/packages.list.chroot + + +# Packages to be stored in /pool but not installed in the OS . +echo "# These packages are available to the installer, for offline use. +efibootmgr +grub2-common +grub-efi-ia32 +grub-efi-ia32-bin +grub-efi-ia32-signed +libefiboot1 +libefivar1 +mokutil +os-prober +shim-helpers-i386-signed +shim-signed +shim-signed-common +shim-unsigned + +" > $acorbuild/build/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $acorbuild/build/config/archives +mkdir -p $acorbuild/build/config/includes.binary +mkdir -p $acorbuild/build/config/hooks/live +mkdir -p $acorbuild/build/config/hooks/normal +mkdir -p $acorbuild/build/config/bootloaders +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications +mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info +mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates +mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins +mkdir -p $acorbuild/build/config/includes.chroot/usr/bin +mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default + +# Copy Configs to the chroot +cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications +cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live +cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal +cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default + +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives +cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub + +#symlinks chroot +ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info +ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors +ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv +ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default + + +# Build the ISO # +lb build #--debug --verbose + + diff --git a/Lxqt/acorapplication b/Lxqt/acorapplication new file mode 120000 index 0000000..e2f9133 --- /dev/null +++ b/Lxqt/acorapplication @@ -0,0 +1 @@ +../acorapplication \ No newline at end of file diff --git a/Lxqt/acorbootloaders b/Lxqt/acorbootloaders new file mode 120000 index 0000000..162ad0c --- /dev/null +++ b/Lxqt/acorbootloaders @@ -0,0 +1 @@ +../acorbootloaders \ No newline at end of file diff --git a/Lxqt/acorcsv b/Lxqt/acorcsv new file mode 120000 index 0000000..799da98 --- /dev/null +++ b/Lxqt/acorcsv @@ -0,0 +1 @@ +../acorcsv \ No newline at end of file diff --git a/AcorOS-lxqt/acorhooks/live/0030-user-setup b/Lxqt/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-lxqt/acorhooks/live/0030-user-setup rename to Lxqt/acorhooks/live/0030-user-setup diff --git a/AcorOS-lxqt/acorhooks/normal/0520-applications.hook.chroot b/Lxqt/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-lxqt/acorhooks/normal/0520-applications.hook.chroot rename to Lxqt/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-lxqt/acorhooks/normal/0560-calamares-packages.hook.chroot b/Lxqt/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-lxqt/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Lxqt/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-lxqt/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Lxqt/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-lxqt/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Lxqt/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/Lxqt/acorlightdm b/Lxqt/acorlightdm new file mode 120000 index 0000000..85c8ff7 --- /dev/null +++ b/Lxqt/acorlightdm @@ -0,0 +1 @@ +../acorlightdm \ No newline at end of file diff --git a/Lxqt/acorprofile b/Lxqt/acorprofile new file mode 120000 index 0000000..29d1f75 --- /dev/null +++ b/Lxqt/acorprofile @@ -0,0 +1 @@ +../acorprofile \ No newline at end of file diff --git a/Lxqt/acorrepos b/Lxqt/acorrepos new file mode 120000 index 0000000..c3e5c40 --- /dev/null +++ b/Lxqt/acorrepos @@ -0,0 +1 @@ +../acorrepos \ No newline at end of file diff --git a/Lxqt/acoruserconfig b/Lxqt/acoruserconfig new file mode 120000 index 0000000..486688c --- /dev/null +++ b/Lxqt/acoruserconfig @@ -0,0 +1 @@ +../acoruserconfig \ No newline at end of file diff --git a/Lxqt/build.sh b/Lxqt/build.sh new file mode 100755 index 0000000..fee05cd --- /dev/null +++ b/Lxqt/build.sh @@ -0,0 +1,272 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +acorbuild="$(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 +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 + + +# 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. +# Up above is the manual description of what options I used so far. + +lb config noauto \ + --binary-images iso-hybrid \ + --mode debian \ + --architectures amd64 \ + --linux-flavours amd64 \ + --distribution bullseye \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-chroot https://deb.debian.org/debian \ + --parent-mirror-chroot-security https://security.debian.org/debian-security \ + --parent-mirror-binary https://deb.debian.org/debian \ + --parent-mirror-binary-security https://security.debian.org/debian-security \ + --mirror-chroot https://deb.debian.org/debian \ + --mirror-chroot-security https://security.debian.org/debian-security \ + --updates true \ + --security true \ + --backports false \ + --cache true \ + --apt-recommends true \ + --iso-application AcorOS \ + --win32-loader false \ + --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-volume AcorOS \ + --image-name "AcorOS" \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + "${@}" + + +# Install the Lxqt Desktop +mkdir -p $acorbuild/build/config/package-lists +echo lxqt > $acorbuild/build/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +linux-headers-amd64 +locales +nala +dkms +dbus-x11 +ntp +deb-multimedia-keyring +acoros-keyring +xorg +xserver-xorg +xserver-xorg-input-synaptics +xserver-xorg-input-all +xserver-xorg-video-vmware +xserver-xorg-video-all +w64codecs +ffmpeg +sox +twolame +lame +faad +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-plugins-bad +gstreamer1.0-pulseaudio +unrar +rar +p7zip-full +p7zip-rar +zip +unzip +pulseaudio +pavucontrol-qt +alsa-utils +aptitude +synaptic +gparted +apt-config-auto-update +libelf-dev +htop +package-update-indicator +desktop-base +gnome-packagekit +acoros-translations +acoroslocale +acorosstick +gvfs-backends +samba +gnome-packagekit +iso-flag-png +sambashare +network-manager +network-manager-gnome +bluez +blueman +gufw +acoros-icons +orchis-gtk-theme +blue-papirus-icons +brown-papirus-icons +papirus-cyan-icons +papirus-dark-grey +papirus-icon-theme +gtk2-engines-aurora +gtk2-engines +oxygen-icon-theme +acoros-backgrounds +plymouth +plymouth-themes +cups +system-config-printer +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +acoros-lxqt-configs +dbus-tests +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +balena-etcher-electron +gnome-system-tools +gnome-disk-utility +gnome-calculator +neofetch +accountsservice +balena-etcher-electron +timeshift +gnome-software +gnome-software-plugin-flatpak +gnome-software-plugin-snap +fwupd +bleachbit +dconf-editor +gimp +gimp-data-extras +xsane +transmission-gtk +thunderbird +thunderbird-l10n-pt-br +thunderbird-l10n-pt-pt +thunderbird-l10n-de +thunderbird-l10n-en-gb +thunderbird-l10n-es-es +thunderbird-l10n-fr +thunderbird-l10n-it +firefox +firefox-l10n-de +firefox-l10n-en +firefox-l10n-es +firefox-l10n-it +firefox-l10n-br +firefox-l10n-pt +libreoffice +libreoffice-gtk3 +libreoffice-l10n-pt +libreoffice-l10n-pt-br +libreoffice-l10n-de +libreoffice-l10n-en-gb +libreoffice-l10n-es +libreoffice-l10n-fr +libreoffice-l10n-it +printer-driver-cups-pdf +gnome-2048 +gnome-chess +gnome-mahjongg +gnome-sudoku +guvcview +vlc +xfburn +calamares-settings-acoros +calamares +firmware-linux +firmware-linux-free +firmware-linux-nonfree +firmware-misc-nonfree +firmware-realtek +firmware-atheros +firmware-bnx2 +firmware-bnx2x +firmware-brcm80211 +firmware-intelwimax +firmware-iwlwifi +firmware-libertas +firmware-netxen +firmware-zd1211 +gdebi +f2fs-tools +xfsprogs +xfsdump +xterm +grub-pc + +" > $acorbuild/build/config/package-lists/packages.list.chroot + + +# Packages to be stored in /pool but not installed in the OS . +echo "# These packages are available to the installer, for offline use. +efibootmgr +grub-common +grub2-common +grub-efi +grub-efi-amd64 +grub-efi-amd64-bin +grub-efi-amd64-signed +libefiboot1 +libefivar1 +mokutil +os-prober +shim-helpers-amd64-signed +shim-signed +shim-signed-common +shim-unsigned + +" > $acorbuild/build/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $acorbuild/build/config/archives +mkdir -p $acorbuild/build/config/includes.binary +mkdir -p $acorbuild/build/config/hooks/live +mkdir -p $acorbuild/build/config/hooks/normal +mkdir -p $acorbuild/build/config/bootloaders +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications +mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info +mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates +mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins +mkdir -p $acorbuild/build/config/includes.chroot/usr/bin +mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm + +# Copy Configs to the chroot +cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications +cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live +cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal +cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default + +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives +cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub + +#symlinks chroot +ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info +ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors +ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv +ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default + + +# Build the ISO # +lb build #--debug --verbose + + diff --git a/Lxqt32/acorapplication b/Lxqt32/acorapplication new file mode 120000 index 0000000..e2f9133 --- /dev/null +++ b/Lxqt32/acorapplication @@ -0,0 +1 @@ +../acorapplication \ No newline at end of file diff --git a/Lxqt32/acorbootloaders b/Lxqt32/acorbootloaders new file mode 120000 index 0000000..162ad0c --- /dev/null +++ b/Lxqt32/acorbootloaders @@ -0,0 +1 @@ +../acorbootloaders \ No newline at end of file diff --git a/Lxqt32/acorcsv b/Lxqt32/acorcsv new file mode 120000 index 0000000..799da98 --- /dev/null +++ b/Lxqt32/acorcsv @@ -0,0 +1 @@ +../acorcsv \ No newline at end of file diff --git a/AcorOS-lxqt32/acorhooks/live/0030-user-setup b/Lxqt32/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-lxqt32/acorhooks/live/0030-user-setup rename to Lxqt32/acorhooks/live/0030-user-setup diff --git a/AcorOS-lxqt32/acorhooks/normal/0520-applications.hook.chroot b/Lxqt32/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-lxqt32/acorhooks/normal/0520-applications.hook.chroot rename to Lxqt32/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-lxqt32/acorhooks/normal/0560-calamares-packages.hook.chroot b/Lxqt32/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-lxqt32/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Lxqt32/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-lxqt32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Lxqt32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-lxqt32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Lxqt32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/Lxqt32/acorlightdm b/Lxqt32/acorlightdm new file mode 120000 index 0000000..85c8ff7 --- /dev/null +++ b/Lxqt32/acorlightdm @@ -0,0 +1 @@ +../acorlightdm \ No newline at end of file diff --git a/Lxqt32/acorprofile b/Lxqt32/acorprofile new file mode 120000 index 0000000..29d1f75 --- /dev/null +++ b/Lxqt32/acorprofile @@ -0,0 +1 @@ +../acorprofile \ No newline at end of file diff --git a/Lxqt32/acorrepos b/Lxqt32/acorrepos new file mode 120000 index 0000000..c3e5c40 --- /dev/null +++ b/Lxqt32/acorrepos @@ -0,0 +1 @@ +../acorrepos \ No newline at end of file diff --git a/Lxqt32/acoruserconfig b/Lxqt32/acoruserconfig new file mode 120000 index 0000000..486688c --- /dev/null +++ b/Lxqt32/acoruserconfig @@ -0,0 +1 @@ +../acoruserconfig \ No newline at end of file diff --git a/AcorOS-cinnamon/cinnamonunstablebuild-64.sh b/Lxqt32/build.sh similarity index 86% rename from AcorOS-cinnamon/cinnamonunstablebuild-64.sh rename to Lxqt32/build.sh index 9573866..f6917ee 100755 --- a/AcorOS-cinnamon/cinnamonunstablebuild-64.sh +++ b/Lxqt32/build.sh @@ -19,8 +19,8 @@ for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm lb config noauto \ --binary-images iso-hybrid \ --mode debian \ - --architectures amd64 \ - --linux-flavours amd64 \ + --architectures i386 \ + --linux-flavours 686-pae \ --distribution bullseye \ --archive-areas "main contrib non-free" \ --mirror-bootstrap https://deb.debian.org/debian \ @@ -31,6 +31,7 @@ lb config noauto \ --parent-mirror-binary-security https://security.debian.org/debian-security \ --mirror-chroot https://deb.debian.org/debian \ --mirror-chroot-security https://security.debian.org/debian-security \ + --uefi-secure-boot enable \ --updates true \ --security true \ --backports false \ @@ -46,15 +47,13 @@ lb config noauto \ --checksums sha512 \ --zsync false \ "${@}" - - -# Install the Cinnamon Desktop +# Install the Lxqt Desktop mkdir -p $acorbuild/build/config/package-lists -echo cinnamon > $acorbuild/build/config/package-lists/desktop.list.chroot +echo lxqt > $acorbuild/build/config/package-lists/desktop.list.chroot # Install software echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-amd64 +linux-headers-686-pae locales nala dkms @@ -68,7 +67,7 @@ xserver-xorg-input-synaptics xserver-xorg-input-all xserver-xorg-video-vmware xserver-xorg-video-all -w64codecs +w32codecs ffmpeg sox twolame @@ -85,7 +84,7 @@ p7zip-rar zip unzip pulseaudio -pavucontrol +pavucontrol-qt alsa-utils aptitude synaptic @@ -104,6 +103,7 @@ gvfs-backends samba gnome-packagekit iso-flag-png +sambashare network-manager network-manager-gnome bluez @@ -111,12 +111,15 @@ blueman gufw acoros-icons orchis-gtk-theme -teja-gtk-theme -darc-aurora-gtk-theme -tela-circle-icon-theme -tela-icon-theme -mcata-gtk-theme -acoros-backgrounds +blue-papirus-icons +brown-papirus-icons +papirus-cyan-icons +papirus-dark-grey +papirus-icon-theme +gtk2-engines-aurora +gtk2-engines +oxygen-icon-theme +acoros-backgrounds plymouth plymouth-themes cups @@ -124,28 +127,19 @@ system-config-printer lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings -acoros-cinnamon-sounds -nemo gir1.2-nemo-3.0 -nemo-fileroller -nemo-share -nemo-seahorse -nemo-image-converter -nemo-gtkhash -muffin -acoros-cinnamon-configs +acoros-lxqt-configs +dbus-tests xscreensaver xscreensaver-data xscreensaver-data-extra xscreensaver-gl xscreensaver-gl-extra -timeshift -gnome-screenshot -gnome-disk-utility -balena-etcher-electron -gnome-terminal -gedit -gedit-plugins +gnome-system-tools +gnome-disk-utility gnome-calculator +neofetch +accountsservice +timeshift gnome-software gnome-software-plugin-flatpak gnome-software-plugin-snap @@ -154,8 +148,7 @@ bleachbit dconf-editor gimp gimp-data-extras -evince xsane -eog +xsane transmission-gtk thunderbird thunderbird-l10n-pt-br @@ -188,9 +181,8 @@ gnome-mahjongg gnome-sudoku guvcview vlc -qt5-style-plugins -qt5ct -calamares-settings-acoros +xfburn +calamares-settings-acoros-32 calamares firmware-linux firmware-linux-free @@ -210,7 +202,7 @@ gdebi f2fs-tools xfsprogs xfsdump -numlockx +xterm grub-pc " > $acorbuild/build/config/package-lists/packages.list.chroot @@ -219,17 +211,15 @@ grub-pc # Packages to be stored in /pool but not installed in the OS . echo "# These packages are available to the installer, for offline use. efibootmgr -grub-common grub2-common -grub-efi -grub-efi-amd64 -grub-efi-amd64-bin -grub-efi-amd64-signed +grub-efi-ia32 +grub-efi-ia32-bin +grub-efi-ia32-signed libefiboot1 libefivar1 mokutil os-prober -shim-helpers-amd64-signed +shim-helpers-i386-signed shim-signed shim-signed-common shim-unsigned @@ -261,14 +251,11 @@ cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info - -# Place files unique to Unstable builds here. -cp -r $acorbuild/acorunstable/bootloaders/* $acorbuild/build/config/bootloaders -cp -r $acorbuild/acorunstable/repos/* $acorbuild/build/config/archives - #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors diff --git a/Master.UpdateIgnore b/Master.UpdateIgnore new file mode 100644 index 0000000..d84b9db --- /dev/null +++ b/Master.UpdateIgnore @@ -0,0 +1,48 @@ +# Files we don't want from other repositories. +.git +.gitignore +.UpdateIgnore +RepoUpdater +RepoUpdater.conf +LICENSE +README.md + +# Files & Directories in the Production Repo that shouldn't be touched. +budgiebuild.sh +cinnamonbuild.sh +gnomebuild.sh +kdebuild.sh +lxde32build.sh +lxdebuild.sh +lxqt32build.sh +lxqtbuild.sh +xfce32build.sh +xfcebuild.sh +Budgie +Cinnamon +Gnome +Kde +Lxde +Lxde32 +Lxqt +Lxqt32 +Mate +Xfce +Xfce32 + +# These should be in the minirepo in the mini-repo. +# Files in the dev repos not to be touched +build.sh +testbuild.sh +unstablebuild.sh +BldHelper-release.sh +BldHelper-testing.sh +BldHelper-unstable.sh + +# Directories in the dev repos not to be touched. +acortesting +acorunstable +build + +# Developers files not to be touched. + diff --git a/Mate/acorapplication b/Mate/acorapplication new file mode 120000 index 0000000..e2f9133 --- /dev/null +++ b/Mate/acorapplication @@ -0,0 +1 @@ +../acorapplication \ No newline at end of file diff --git a/Mate/acorbootloaders b/Mate/acorbootloaders new file mode 120000 index 0000000..162ad0c --- /dev/null +++ b/Mate/acorbootloaders @@ -0,0 +1 @@ +../acorbootloaders \ No newline at end of file diff --git a/Mate/acorcsv b/Mate/acorcsv new file mode 120000 index 0000000..799da98 --- /dev/null +++ b/Mate/acorcsv @@ -0,0 +1 @@ +../acorcsv \ No newline at end of file diff --git a/AcorOS-mate/acorhooks/live/0030-user-setup b/Mate/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-mate/acorhooks/live/0030-user-setup rename to Mate/acorhooks/live/0030-user-setup diff --git a/AcorOS-mate/acorhooks/normal/0520-applications.hook.chroot b/Mate/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-mate/acorhooks/normal/0520-applications.hook.chroot rename to Mate/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-mate/acorhooks/normal/0560-calamares-packages.hook.chroot b/Mate/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-mate/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Mate/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-mate/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Mate/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-mate/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Mate/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/Mate/acorlightdm b/Mate/acorlightdm new file mode 120000 index 0000000..85c8ff7 --- /dev/null +++ b/Mate/acorlightdm @@ -0,0 +1 @@ +../acorlightdm \ No newline at end of file diff --git a/Mate/acorprofile b/Mate/acorprofile new file mode 120000 index 0000000..29d1f75 --- /dev/null +++ b/Mate/acorprofile @@ -0,0 +1 @@ +../acorprofile \ No newline at end of file diff --git a/Mate/acorrepos b/Mate/acorrepos new file mode 120000 index 0000000..c3e5c40 --- /dev/null +++ b/Mate/acorrepos @@ -0,0 +1 @@ +../acorrepos \ No newline at end of file diff --git a/Mate/acoruserconfig b/Mate/acoruserconfig new file mode 120000 index 0000000..486688c --- /dev/null +++ b/Mate/acoruserconfig @@ -0,0 +1 @@ +../acoruserconfig \ No newline at end of file diff --git a/Mate/build.sh b/Mate/build.sh new file mode 100755 index 0000000..8610add --- /dev/null +++ b/Mate/build.sh @@ -0,0 +1,289 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +acorbuild="$(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 +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 + + +# 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. +# Up above is the manual description of what options I used so far. + +lb config noauto \ + --binary-images iso-hybrid \ + --mode debian \ + --architectures amd64 \ + --linux-flavours amd64 \ + --distribution bullseye \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-chroot https://deb.debian.org/debian \ + --parent-mirror-chroot-security https://security.debian.org/debian-security \ + --parent-mirror-binary https://deb.debian.org/debian \ + --parent-mirror-binary-security https://security.debian.org/debian-security \ + --mirror-chroot https://deb.debian.org/debian \ + --mirror-chroot-security https://security.debian.org/debian-security \ + --updates true \ + --security true \ + --backports false \ + --cache true \ + --apt-recommends true \ + --iso-application AcorOS \ + --win32-loader false \ + --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-volume AcorOS \ + --image-name "AcorOS" \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + "${@}" + + +# Install the Mate Desktop +mkdir -p $acorbuild/build/config/package-lists +echo mate > $acorbuild/build/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +linux-headers-amd64 +locales +nala +dkms +dbus-x11 +ntp +deb-multimedia-keyring +acoros-keyring +xorg +xserver-xorg +xserver-xorg-input-synaptics +xserver-xorg-input-all +xserver-xorg-video-vmware +xserver-xorg-video-all +w64codecs +ffmpeg +sox +twolame +lame +faad +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-plugins-bad +gstreamer1.0-pulseaudio +unrar +rar +p7zip-full +p7zip-rar +zip +unzip +pulseaudio +alsa-utils +aptitude +synaptic +gparted +apt-config-auto-update +libelf-dev +htop +package-update-indicator +desktop-base +gnome-packagekit +acoros-translations +acoroslocale +python3-gi-cairo +acorosstick +gvfs-backends +samba +iso-flag-png +network-manager +network-manager-gnome +bluez +blueman +gufw +acoros-icons +orchis-gtk-theme +blue-papirus-icons +brown-papirus-icons +papirus-cyan-icons +papirus-dark-grey +papirus-icon-theme +gtk2-engines-aurora +gtk2-engines +acoros-backgrounds +gnome-themes-extra +gnome-themes-extra-data +plymouth +plymouth-themes +cups +system-config-printer +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +mate-desktop +mate-desktop-environment +mate-desktop-environment-core +gstreamer1.0-tools +acoros-mate-configs +menulibre +caja-actions +caja-admin +caja-image-converter +caja-open-terminal +mate-hud +caja-sendto +caja-share +caja-wallpaper +caja-xattr-tags +mate-tweak +plank +tilda +caja-wallpaper +caja-share +caja-rename +caja-sendto +caja-mediainfo +balena-etcher-electron +gnome-system-tools +gnome-disk-utility +neofetch +timeshift +gnome-software +gnome-software-plugin-flatpak +gnome-software-plugin-snap +fwupd +bleachbit +dconf-editor +gimp +gimp-data-extras +xsane +transmission-gtk +thunderbird +thunderbird-l10n-pt-br +thunderbird-l10n-pt-pt +thunderbird-l10n-de +thunderbird-l10n-en-gb +thunderbird-l10n-es-es +thunderbird-l10n-fr +thunderbird-l10n-it +firefox +firefox-l10n-de +firefox-l10n-en +firefox-l10n-es +firefox-l10n-it +firefox-l10n-br +firefox-l10n-pt +libreoffice +libreoffice-gtk3 +libreoffice-l10n-pt +libreoffice-l10n-pt-br +libreoffice-l10n-de +libreoffice-l10n-en-gb +libreoffice-l10n-es +libreoffice-l10n-fr +libreoffice-l10n-it +printer-driver-cups-pdf +gnome-2048 +gnome-chess +gnome-mahjongg +gnome-sudoku +guvcview +vlc +brasero +qt5-style-plugins +qt5ct +calamares-settings-acoros +calamares +firmware-linux +firmware-linux-free +firmware-linux-nonfree +firmware-misc-nonfree +firmware-realtek +firmware-atheros +firmware-bnx2 +firmware-bnx2x +firmware-brcm80211 +firmware-intelwimax +firmware-iwlwifi +firmware-libertas +firmware-netxen +firmware-zd1211 +gdebi +f2fs-tools +xfsprogs +xfsdump +grub-pc + + +" > $acorbuild/build/config/package-lists/packages.list.chroot + + +# Packages to be stored in /pool but not installed in the OS . +echo "# These packages are available to the installer, for offline use. +efibootmgr +grub-common +grub2-common +grub-efi +grub-efi-amd64 +grub-efi-amd64-bin +grub-efi-amd64-signed +libefiboot1 +libefivar1 +mokutil +os-prober +shim-helpers-amd64-signed +shim-signed +shim-signed-common +shim-unsigned + +" > $acorbuild/build/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $acorbuild/build/config/archives +mkdir -p $acorbuild/build/config/includes.binary +mkdir -p $acorbuild/build/config/hooks/live +mkdir -p $acorbuild/build/config/hooks/normal +mkdir -p $acorbuild/build/config/bootloaders +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications +mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info +mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates +mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins +mkdir -p $acorbuild/build/config/includes.chroot/usr/bin +mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default + +# Copy Configs to the chroot +cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications +cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live +cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal +cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default + +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives +cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives +cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub + +#symlinks chroot +ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info +ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors +ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv +ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default + + +# Build the ISO # +lb build #--debug --verbose + + diff --git a/RepoUpdate.config b/RepoUpdate.config new file mode 100644 index 0000000..a717bb6 --- /dev/null +++ b/RepoUpdate.config @@ -0,0 +1,69 @@ +### Created and maintained for PeppermintOS by KsWoodsMan, 2022. +### This config file resides in the Repo holding common files for the rest of the builds. +### The script sourcing this file is intended to be ran just before build time for the ISOs. +### In the Dev repos this script is called from the working directory where pepbld.sh is located. +### In PepDistroConfigs, it's called from the base directory of the repository. Not from the minirepos. +### In PepDistroConfigs we need a separate config file and IgnoreFile to take in changes from the Dev repos. +### The script sourcing this config will update the local repo from any external repos listed in that section. +### The external repos are and should be common to all builds. Small exceptions are made for PepDistroConfigs. +### PepProTools & PepProPixMaps (and later PepUpdateManager)are pre-core, and get included into CoreFiles. +### This runs nightly, updating the Dev Repos, getting updates from the pre-core repos and CoreFiles. +### When updating CoreFiles, Dev repos and PepDistroConfigs we make a special case of PepCoreFiles. +### This special case is seen with the following , [ $_ExtRepo = "PepCoreFiles" ] && _localdir="" +### This small change does away with the recursive symlink. use of and need for a Bah-Dah-Bing ! +### We can remove the symlink PepCoreFiles from each of the Dev repos and the Production repo. +### This way we only have to keep one version of this script, and only a single config file. +### When updating the Production repo we call the scipt 2x. A first time updates the base. +### The second time our script's run, the command line options override the config file. + + +### List the location of the project files. +### This is expected to be a 'git' repository. +### Encapsulate the variable inside quotation marks. +### _ProjectLocation = "https://codeberg.org/Peppermint_OS" +_ProjectLocation="https://codeberg.org/Peppermint_OS" + +### "You can't dance while standing in one place" +### During the routine we cd to other repos and back. +### This returns us to the same repository we started from. +### This absolute path is from where the script was called from. +### Encapsulate the variable inside quotation marks. +### _myrepo = ${PWD} +_myrepo="${PWD}" + +### "Fault tolerance" ensures -X files for `diff` exist. +### Encapsulate the list inside quotation marks. +### _ignore = ".git .gitignore .UpdateIgnore LICENSE README.md" +_ignore=".git .gitignore .UpdateIgnore LICENSE README.md" + +########## *For PepDistroConfigs* ########## +### Do NOT list the precore repos here. Those were updated to here on the first run. +### This is for the second run to update the production repo from each build repo. +### List the Dev mini repos in this section to be updated for the release builds. +### List one or all of the Dev repos to be updated, prior to their release build. +### Defining the Dev repo from the command line will override what's listed here. +### Available options: -c use this config, -e minirepo to update, -i ignore file to use +### Encapsulate the list inside quotation marks. +### _ExtRepositories = "PepOSx86_64 PepOSx86_32 PepOSDevuan_32 PepOSDevuan_64 " +_ExtRepositories="PepOSx86_64 PepOSx86_32 PepOSDevuan_32 PepOSDevuan_64 " + +########## *For PepDistroConfigs* ########## +### This location will be local for the mini repositories. +### Set the relative location of the IgnoreFile used. +### Encapsulate the variable inside quotation marks. +### _IgnoreFile = ".MiniRepoIgnoreList" +_IgnoreFile=".MiniRepoIgnoreList" + + +### During the routine, we count the number of changes found. +### At the end we compare the number of steps made to the extra changes found. +### When there are no changes found count and commit increment at the same rate. +### At the end, if commit is greater than count we use `git` to push the changes. +### With the script in the current form there is no good reason to edit or change these. +### _commit = "0" ### increases as it finds changes. Used after all routines are completed. +### _count = "0" ### with each iteration of the `for` loop , _count will increment at $_step rate. +### _step = "1" ### _step = the number of nested `until` loops in the main `for` loop. +_commit="0" +_count="0" +_step="1" + diff --git a/RepoUpdater b/RepoUpdater new file mode 120000 index 0000000..e2af31a --- /dev/null +++ b/RepoUpdater @@ -0,0 +1 @@ +../core-files/RepoUpdater \ No newline at end of file diff --git a/AcorOS-xfce/acorapplication/gdebi.desktop b/Xfce/acorapplication/gdebi.desktop similarity index 100% rename from AcorOS-xfce/acorapplication/gdebi.desktop rename to Xfce/acorapplication/gdebi.desktop diff --git a/AcorOS-xfce/acorapplication/install-debian.desktop b/Xfce/acorapplication/install-debian.desktop similarity index 100% rename from AcorOS-xfce/acorapplication/install-debian.desktop rename to Xfce/acorapplication/install-debian.desktop diff --git a/AcorOS-xfce/acorapplication/nm-connection-editor.desktop b/Xfce/acorapplication/nm-connection-editor.desktop similarity index 100% rename from AcorOS-xfce/acorapplication/nm-connection-editor.desktop rename to Xfce/acorapplication/nm-connection-editor.desktop diff --git a/AcorOS-xfce/acorapplication/org.gnome.PackageUpdater.desktop b/Xfce/acorapplication/org.gnome.PackageUpdater.desktop similarity index 100% rename from AcorOS-xfce/acorapplication/org.gnome.PackageUpdater.desktop rename to Xfce/acorapplication/org.gnome.PackageUpdater.desktop diff --git a/AcorOS-xfce/acorapplication/org.gnome.Software.desktop b/Xfce/acorapplication/org.gnome.Software.desktop similarity index 100% rename from AcorOS-xfce/acorapplication/org.gnome.Software.desktop rename to Xfce/acorapplication/org.gnome.Software.desktop diff --git a/AcorOS-xfce/acorapplication/synaptic.desktop b/Xfce/acorapplication/synaptic.desktop similarity index 100% rename from AcorOS-xfce/acorapplication/synaptic.desktop rename to Xfce/acorapplication/synaptic.desktop diff --git a/AcorOS-xfce/acorapplication/system-config-printer.desktop b/Xfce/acorapplication/system-config-printer.desktop similarity index 100% rename from AcorOS-xfce/acorapplication/system-config-printer.desktop rename to Xfce/acorapplication/system-config-printer.desktop diff --git a/Xfce/acorbootloaders b/Xfce/acorbootloaders new file mode 120000 index 0000000..162ad0c --- /dev/null +++ b/Xfce/acorbootloaders @@ -0,0 +1 @@ +../acorbootloaders \ No newline at end of file diff --git a/Xfce/acorcsv b/Xfce/acorcsv new file mode 120000 index 0000000..799da98 --- /dev/null +++ b/Xfce/acorcsv @@ -0,0 +1 @@ +../acorcsv \ No newline at end of file diff --git a/AcorOS-xfce/acorhooks/live/0030-user-setup b/Xfce/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-xfce/acorhooks/live/0030-user-setup rename to Xfce/acorhooks/live/0030-user-setup diff --git a/AcorOS-xfce/acorhooks/normal/0520-applications.hook.chroot b/Xfce/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-xfce/acorhooks/normal/0520-applications.hook.chroot rename to Xfce/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-xfce/acorhooks/normal/0560-calamares-packages.hook.chroot b/Xfce/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-xfce/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Xfce/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-xfce/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Xfce/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-xfce/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Xfce/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/Xfce/acorlightdm b/Xfce/acorlightdm new file mode 120000 index 0000000..85c8ff7 --- /dev/null +++ b/Xfce/acorlightdm @@ -0,0 +1 @@ +../acorlightdm \ No newline at end of file diff --git a/Xfce/acorprofile b/Xfce/acorprofile new file mode 120000 index 0000000..29d1f75 --- /dev/null +++ b/Xfce/acorprofile @@ -0,0 +1 @@ +../acorprofile \ No newline at end of file diff --git a/Xfce/acorrepos b/Xfce/acorrepos new file mode 120000 index 0000000..c3e5c40 --- /dev/null +++ b/Xfce/acorrepos @@ -0,0 +1 @@ +../acorrepos \ No newline at end of file diff --git a/Xfce/acoruserconfig b/Xfce/acoruserconfig new file mode 120000 index 0000000..486688c --- /dev/null +++ b/Xfce/acoruserconfig @@ -0,0 +1 @@ +../acoruserconfig \ No newline at end of file diff --git a/Xfce/build.sh b/Xfce/build.sh new file mode 100755 index 0000000..47bd9af --- /dev/null +++ b/Xfce/build.sh @@ -0,0 +1,280 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +acorbuild="$(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 +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 + + +# 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. +# Up above is the manual description of what options I used so far. + +lb config noauto \ + --binary-images iso-hybrid \ + --mode debian \ + --architectures amd64 \ + --linux-flavours amd64 \ + --distribution bullseye \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-chroot https://deb.debian.org/debian \ + --parent-mirror-chroot-security https://security.debian.org/debian-security \ + --parent-mirror-binary https://deb.debian.org/debian \ + --parent-mirror-binary-security https://security.debian.org/debian-security \ + --mirror-chroot https://deb.debian.org/debian \ + --mirror-chroot-security https://security.debian.org/debian-security \ + --updates true \ + --security true \ + --backports false \ + --cache true \ + --apt-recommends true \ + --iso-application AcorOS \ + --win32-loader false \ + --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-volume AcorOS \ + --image-name "AcorOS" \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + "${@}" + + +# Install the Xfce Desktop +mkdir -p $acorbuild/build/config/package-lists +echo xfce4 xfce4-goodies > $acorbuild/build/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +linux-headers-amd64 +locales +nala +dkms +dbus-x11 +ntp +deb-multimedia-keyring +acoros-keyring +xorg +xserver-xorg +xserver-xorg-input-synaptics +xserver-xorg-input-all +xserver-xorg-video-vmware +xserver-xorg-video-all +w64codecs +ffmpeg +sox +twolame +lame +faad +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-plugins-bad +gstreamer1.0-pulseaudio +unrar +rar +p7zip-full +p7zip-rar +zip +unzip +pulseaudio +pavucontrol +alsa-utils +aptitude +synaptic +gparted +apt-config-auto-update +libelf-dev +htop +package-update-indicator +desktop-base +gnome-packagekit +acoros-translations +acoroslocale +acorosstick +gvfs-backends +samba +gnome-packagekit +iso-flag-png +sambashare +network-manager +network-manager-gnome +bluez +blueman +gufw +acoros-icons +orchis-gtk-theme +blue-papirus-icons +brown-papirus-icons +papirus-cyan-icons +papirus-dark-grey +papirus-icon-theme +gtk2-engines-aurora +gtk2-engines +acoros-backgrounds +plymouth +plymouth-themes +cups +system-config-printer +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +acoros-xfce-configs +menulibre +mugshot +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +balena-etcher-electron +gnome-system-tools +gnome-disk-utility +gnome-calculator +orca +neofetch +accountsservice +catfish +timeshift +gnome-software +gnome-software-plugin-flatpak +gnome-software-plugin-snap +fwupd +bleachbit +dconf-editor +gimp +gimp-data-extras +evince +xsane +transmission-gtk +thunderbird +thunderbird-l10n-pt-br +thunderbird-l10n-pt-pt +thunderbird-l10n-de +thunderbird-l10n-en-gb +thunderbird-l10n-es-es +thunderbird-l10n-fr +thunderbird-l10n-it +firefox +firefox-l10n-de +firefox-l10n-en +firefox-l10n-es +firefox-l10n-it +firefox-l10n-br +firefox-l10n-pt +libreoffice +libreoffice-gtk3 +libreoffice-l10n-pt +libreoffice-l10n-pt-br +libreoffice-l10n-de +libreoffice-l10n-en-gb +libreoffice-l10n-es +libreoffice-l10n-fr +libreoffice-l10n-it +printer-driver-cups-pdf +gnome-2048 +gnome-chess +gnome-mahjongg +gnome-sudoku +guvcview +vlc +qt5-style-plugins +qt5ct +calamares-settings-acoros +calamares +firmware-linux +firmware-linux-free +firmware-linux-nonfree +firmware-misc-nonfree +firmware-realtek +firmware-atheros +firmware-bnx2 +firmware-bnx2x +firmware-brcm80211 +firmware-intelwimax +firmware-iwlwifi +firmware-libertas +firmware-netxen +firmware-zd1211 +gdebi +f2fs-tools +xfsprogs +xfsdump +tumbler +tumbler-plugins-extra +ffmpegthumbnailer +xterm +grub-pc + +" > $acorbuild/build/config/package-lists/packages.list.chroot + + +# Packages to be stored in /pool but not installed in the OS . +echo "# These packages are available to the installer, for offline use. +efibootmgr +grub-common +grub2-common +grub-efi +grub-efi-amd64 +grub-efi-amd64-bin +grub-efi-amd64-signed +libefiboot1 +libefivar1 +mokutil +os-prober +shim-helpers-amd64-signed +shim-signed +shim-signed-common +shim-unsigned + +" > $acorbuild/build/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $acorbuild/build/config/archives +mkdir -p $acorbuild/build/config/includes.binary +mkdir -p $acorbuild/build/config/hooks/live +mkdir -p $acorbuild/build/config/hooks/normal +mkdir -p $acorbuild/build/config/bootloaders +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications +mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info +mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates +mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins +mkdir -p $acorbuild/build/config/includes.chroot/usr/bin +mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default + +# Copy Configs to the chroot +cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications +cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live +cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal +cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default + +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/pepgrub/themes $acorbuild/build/config/includes.chroot/boot/grub + +#symlinks chroot +ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info +ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors +ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv +ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default + + +# Build the ISO # +lb build #--debug --verbose + + diff --git a/AcorOS-xfce32/acorapplication/gdebi.desktop b/Xfce32/acorapplication/gdebi.desktop similarity index 100% rename from AcorOS-xfce32/acorapplication/gdebi.desktop rename to Xfce32/acorapplication/gdebi.desktop diff --git a/AcorOS-xfce32/acorapplication/install-debian.desktop b/Xfce32/acorapplication/install-debian.desktop similarity index 100% rename from AcorOS-xfce32/acorapplication/install-debian.desktop rename to Xfce32/acorapplication/install-debian.desktop diff --git a/AcorOS-xfce32/acorapplication/nm-connection-editor.desktop b/Xfce32/acorapplication/nm-connection-editor.desktop similarity index 100% rename from AcorOS-xfce32/acorapplication/nm-connection-editor.desktop rename to Xfce32/acorapplication/nm-connection-editor.desktop diff --git a/AcorOS-xfce32/acorapplication/org.gnome.PackageUpdater.desktop b/Xfce32/acorapplication/org.gnome.PackageUpdater.desktop similarity index 100% rename from AcorOS-xfce32/acorapplication/org.gnome.PackageUpdater.desktop rename to Xfce32/acorapplication/org.gnome.PackageUpdater.desktop diff --git a/AcorOS-xfce32/acorapplication/org.gnome.Software.desktop b/Xfce32/acorapplication/org.gnome.Software.desktop similarity index 100% rename from AcorOS-xfce32/acorapplication/org.gnome.Software.desktop rename to Xfce32/acorapplication/org.gnome.Software.desktop diff --git a/AcorOS-xfce32/acorapplication/synaptic.desktop b/Xfce32/acorapplication/synaptic.desktop similarity index 100% rename from AcorOS-xfce32/acorapplication/synaptic.desktop rename to Xfce32/acorapplication/synaptic.desktop diff --git a/AcorOS-xfce32/acorapplication/system-config-printer.desktop b/Xfce32/acorapplication/system-config-printer.desktop similarity index 100% rename from AcorOS-xfce32/acorapplication/system-config-printer.desktop rename to Xfce32/acorapplication/system-config-printer.desktop diff --git a/Xfce32/acorbootloaders b/Xfce32/acorbootloaders new file mode 120000 index 0000000..162ad0c --- /dev/null +++ b/Xfce32/acorbootloaders @@ -0,0 +1 @@ +../acorbootloaders \ No newline at end of file diff --git a/Xfce32/acorcsv b/Xfce32/acorcsv new file mode 120000 index 0000000..799da98 --- /dev/null +++ b/Xfce32/acorcsv @@ -0,0 +1 @@ +../acorcsv \ No newline at end of file diff --git a/AcorOS-xfce32/acorhooks/live/0030-user-setup b/Xfce32/acorhooks/live/0030-user-setup similarity index 100% rename from AcorOS-xfce32/acorhooks/live/0030-user-setup rename to Xfce32/acorhooks/live/0030-user-setup diff --git a/AcorOS-xfce32/acorhooks/normal/0520-applications.hook.chroot b/Xfce32/acorhooks/normal/0520-applications.hook.chroot similarity index 100% rename from AcorOS-xfce32/acorhooks/normal/0520-applications.hook.chroot rename to Xfce32/acorhooks/normal/0520-applications.hook.chroot diff --git a/AcorOS-xfce32/acorhooks/normal/0560-calamares-packages.hook.chroot b/Xfce32/acorhooks/normal/0560-calamares-packages.hook.chroot similarity index 100% rename from AcorOS-xfce32/acorhooks/normal/0560-calamares-packages.hook.chroot rename to Xfce32/acorhooks/normal/0560-calamares-packages.hook.chroot diff --git a/AcorOS-xfce32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Xfce32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot similarity index 100% rename from AcorOS-xfce32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot rename to Xfce32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot diff --git a/Xfce32/acorlightdm b/Xfce32/acorlightdm new file mode 120000 index 0000000..85c8ff7 --- /dev/null +++ b/Xfce32/acorlightdm @@ -0,0 +1 @@ +../acorlightdm \ No newline at end of file diff --git a/Xfce32/acorprofile b/Xfce32/acorprofile new file mode 120000 index 0000000..29d1f75 --- /dev/null +++ b/Xfce32/acorprofile @@ -0,0 +1 @@ +../acorprofile \ No newline at end of file diff --git a/Xfce32/acorrepos b/Xfce32/acorrepos new file mode 120000 index 0000000..c3e5c40 --- /dev/null +++ b/Xfce32/acorrepos @@ -0,0 +1 @@ +../acorrepos \ No newline at end of file diff --git a/Xfce32/acoruserconfig b/Xfce32/acoruserconfig new file mode 120000 index 0000000..486688c --- /dev/null +++ b/Xfce32/acoruserconfig @@ -0,0 +1 @@ +../acoruserconfig \ No newline at end of file diff --git a/Xfce32/build.sh b/Xfce32/build.sh new file mode 100755 index 0000000..0d52788 --- /dev/null +++ b/Xfce32/build.sh @@ -0,0 +1,279 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +acorbuild="$(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 +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 + + +# 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. +# Up above is the manual description of what options I used so far. + +lb config noauto \ + --binary-images iso-hybrid \ + --mode debian \ + --architectures i386 \ + --linux-flavours 686-pae \ + --distribution bullseye \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-bootstrap https://deb.debian.org/debian \ + --parent-mirror-chroot https://deb.debian.org/debian \ + --parent-mirror-chroot-security https://security.debian.org/debian-security \ + --parent-mirror-binary https://deb.debian.org/debian \ + --parent-mirror-binary-security https://security.debian.org/debian-security \ + --mirror-chroot https://deb.debian.org/debian \ + --mirror-chroot-security https://security.debian.org/debian-security \ + --uefi-secure-boot enable \ + --updates true \ + --security true \ + --backports false \ + --cache true \ + --apt-recommends true \ + --iso-application AcorOS \ + --win32-loader false \ + --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ + --iso-volume AcorOS \ + --image-name "AcorOS" \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + "${@}" + +# Install the Xfce Desktop +mkdir -p $acorbuild/build/config/package-lists +echo xfce4 xfce4-goodies > $acorbuild/build/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +linux-headers-686-pae +locales +nala +dkms +dbus-x11 +ntp +deb-multimedia-keyring +acoros-keyring +xorg +xserver-xorg +xserver-xorg-input-synaptics +xserver-xorg-input-all +xserver-xorg-video-vmware +xserver-xorg-video-all +w32codecs +ffmpeg +sox +twolame +lame +faad +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-plugins-bad +gstreamer1.0-pulseaudio +unrar +rar +p7zip-full +p7zip-rar +zip +unzip +pulseaudio +pavucontrol +alsa-utils +aptitude +synaptic +gparted +apt-config-auto-update +libelf-dev +htop +package-update-indicator +desktop-base +gnome-packagekit +acoros-translations +acoroslocale +acorosstick +gvfs-backends +samba +gnome-packagekit +iso-flag-png +sambashare +network-manager +network-manager-gnome +bluez +blueman +gufw +acoros-icons +orchis-gtk-theme +blue-papirus-icons +brown-papirus-icons +papirus-cyan-icons +papirus-dark-grey +papirus-icon-theme +gtk2-engines-aurora +gtk2-engines +acoros-backgrounds +plymouth +plymouth-themes +cups +system-config-printer +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +acoros-xfce-configs +menulibre +mugshot +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +gnome-system-tools +gnome-disk-utility +gnome-calculator +orca +neofetch +accountsservice +catfish +timeshift +gnome-software +gnome-software-plugin-flatpak +gnome-software-plugin-snap +fwupd +bleachbit +dconf-editor +gimp +gimp-data-extras +evince +xsane +transmission-gtk +thunderbird +thunderbird-l10n-pt-br +thunderbird-l10n-pt-pt +thunderbird-l10n-de +thunderbird-l10n-en-gb +thunderbird-l10n-es-es +thunderbird-l10n-fr +thunderbird-l10n-it +firefox +firefox-l10n-de +firefox-l10n-en +firefox-l10n-es +firefox-l10n-it +firefox-l10n-br +firefox-l10n-pt +libreoffice +libreoffice-gtk3 +libreoffice-l10n-pt +libreoffice-l10n-pt-br +libreoffice-l10n-de +libreoffice-l10n-en-gb +libreoffice-l10n-es +libreoffice-l10n-fr +libreoffice-l10n-it +printer-driver-cups-pdf +gnome-2048 +gnome-mahjongg +gnome-chess +gnome-sudoku +guvcview +vlc +qt5-style-plugins +qt5ct +calamares-settings-acoros-32 +calamares +firmware-linux +firmware-linux-free +firmware-linux-nonfree +firmware-misc-nonfree +firmware-realtek +firmware-atheros +firmware-bnx2 +firmware-bnx2x +firmware-brcm80211 +firmware-intelwimax +firmware-iwlwifi +firmware-libertas +firmware-netxen +firmware-zd1211 +gdebi +f2fs-tools +xfsprogs +xfsdump +tumbler +tumbler-plugins-extra +ffmpegthumbnailer +xterm +grub-pc + +" > $acorbuild/build/config/package-lists/packages.list.chroot + + +# Packages to be stored in /pool but not installed in the OS . +echo "# These packages are available to the installer, for offline use. +efibootmgr +grub2-common +grub-efi-ia32 +grub-efi-ia32-bin +grub-efi-ia32-signed +libefiboot1 +libefivar1 +mokutil +os-prober +shim-helpers-i386-signed +shim-signed +shim-signed-common +shim-unsigned + +" > $acorbuild/build/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $acorbuild/build/config/archives +mkdir -p $acorbuild/build/config/includes.binary +mkdir -p $acorbuild/build/config/hooks/live +mkdir -p $acorbuild/build/config/hooks/normal +mkdir -p $acorbuild/build/config/bootloaders +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications +mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info +mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates +mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins +mkdir -p $acorbuild/build/config/includes.chroot/usr/bin +mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default + +# Copy Configs to the chroot +cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d +cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications +cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live +cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal +/includes.chroot/usr/local/bin +cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/pepgrub/grub $acorbuild/build/config/includes.chroot/etc/default + +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives +cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info +cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub + +#symlinks chroot +ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info +ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors +ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv +ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default + + + +# Build the ISO # +lb build #--debug --verbose + + diff --git a/acortesting/bootloaders/grub-pc/dejavu-bold-14.pf2 b/acortesting/bootloaders/grub-pc/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b2..0000000 Binary files a/acortesting/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ diff --git a/acortesting/bootloaders/grub-pc/dejavu-bold-16.pf2 b/acortesting/bootloaders/grub-pc/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7a..0000000 Binary files a/acortesting/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ diff --git a/acortesting/bootloaders/grub-pc/font.pf2 b/acortesting/bootloaders/grub-pc/font.pf2 deleted file mode 100644 index 59e8ffa..0000000 Binary files a/acortesting/bootloaders/grub-pc/font.pf2 and /dev/null differ diff --git a/acortesting/bootloaders/grub-pc/grub.cfg b/acortesting/bootloaders/grub-pc/grub.cfg deleted file mode 100644 index 342aac4..0000000 --- a/acortesting/bootloaders/grub-pc/grub.cfg +++ /dev/null @@ -1,69 +0,0 @@ -if loadfont $prefix/font.pf2 ; then - set gfxmode=1024x768 - set gfxpayload=keep - insmod efi_gop - insmod efi_uga - insmod video_bochs - insmod video_cirrus - insmod gfxterm - insmod png - terminal_output gfxterm -fi - -if background_image /isolinux/splash.png; then - set color_normal=light-gray/black - set color_highlight=white/black -elif background_image /splash.png; then - set color_normal=light-gray/black - set color_highlight=white/black -else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue -fi - -insmod play -play 960 440 1 0 4 440 1 -if [ ${iso_path} ] ; then -set loopback="findiso=${iso_path}" -export loopback -fi - -menuentry "AcorOS 5.3 Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "AcorOS 5.3 Live (fail-safe mode)" { - linux /live/initrd.img boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal - initrd /live/initrd.img -} -submenu "AcorOS 5.3 Live with Localisation Support" { -menuentry "Portuguese (pt)" { - linux /live/vmlinuz boot=live components locales=pt_PT.UTF-8 quiet splash keyboard-layouts=pt username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Portuguese (Brazil) (pt_BR)" { - linux /live/vmlinuz boot=live components locales=pt_BR.UTF-8 quiet splash keyboard-layouts=br username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "English (en)" { - linux /live/vmlinuz boot=live components locales=en_US.UTF-8 quiet splash keyboard-layouts=en username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "French (fr)" { - linux /live/vmlinuz boot=live components locales=fr_FR.UTF-8 quiet splash keyboard-layouts=fr username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "German (de)" { - linux /live/vmlinuz boot=live components locales=de_DE.UTF-8 quiet splash keyboard-layouts=de username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Italian (it)" { - linux /live/vmlinuz boot=live components locales=it_IT.UTF-8 quiet splash keyboard-layouts=it username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Spanish (es)" { - linux /live/vmlinuz boot=live components locales=es_ES.UTF-8 quiet splash keyboard-layouts=es username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -} - diff --git a/acortesting/bootloaders/grub-pc/live-theme/theme.txt b/acortesting/bootloaders/grub-pc/live-theme/theme.txt deleted file mode 100644 index 4ceef4b..0000000 --- a/acortesting/bootloaders/grub-pc/live-theme/theme.txt +++ /dev/null @@ -1,51 +0,0 @@ -desktop-image: "../splash.png" -title-color: "#ffffff" -title-font: "DejaVu Sans Bold 16" -title-text: "Live Boot Menu with GRUB" -message-font: "Unifont Regular 16" -terminal-font: "Unifont Regular 16" - -#help bar at the bottom -+ label { - top = 100%-50 - left = 0 - width = 100% - height = 20 - text = "@KEYMAP_SHORT@" - align = "center" - color = "#ffffff" - font = "DejaVu Sans Bold 14" -} - -#boot menu -+ boot_menu { - left = 10% - width = 80% - top = 52% - height = 48%-80 - item_color = "#a8a8a8" - item_font = "DejaVu Sans Bold 14" - selected_item_color= "#ffffff" - selected_item_font = "DejaVu Sans Bold 14" - item_height = 16 - item_padding = 0 - item_spacing = 4 - icon_width = 0 - icon_heigh = 0 - item_icon_space = 0 -} - -#progress bar -+ progress_bar { - id = "__timeout__" - left = 15% - top = 100%-80 - height = 16 - width = 70% - font = "DejaVu Sans Regular 14" - text_color = "#000000" - fg_color = "#ffffff" - bg_color = "#a8a8a8" - border_color = "#ffffff" - text = "@TIMEOUT_NOTIFICATION_LONG@" -} diff --git a/acortesting/bootloaders/grub-pc/loopback.cfg b/acortesting/bootloaders/grub-pc/loopback.cfg deleted file mode 100644 index b8e3b21..0000000 --- a/acortesting/bootloaders/grub-pc/loopback.cfg +++ /dev/null @@ -1 +0,0 @@ -source /boot/grub/grub.cfg \ No newline at end of file diff --git a/acortesting/bootloaders/grub-pc/memtest.cfg b/acortesting/bootloaders/grub-pc/memtest.cfg deleted file mode 100644 index 454804b..0000000 --- a/acortesting/bootloaders/grub-pc/memtest.cfg +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "Memory Diagnostic Tool (@MEMTEST_VERSION@)" --hotkey=m { - linux16 @MEMTEST_BIN@ -} diff --git a/acortesting/bootloaders/grub-pc/splash.png b/acortesting/bootloaders/grub-pc/splash.png deleted file mode 100644 index 262ddef..0000000 Binary files a/acortesting/bootloaders/grub-pc/splash.png and /dev/null differ diff --git a/acortesting/bootloaders/isolinux/chain.c32 b/acortesting/bootloaders/isolinux/chain.c32 deleted file mode 100644 index a9d6e0e..0000000 Binary files a/acortesting/bootloaders/isolinux/chain.c32 and /dev/null differ diff --git a/acortesting/bootloaders/isolinux/isolinux.cfg b/acortesting/bootloaders/isolinux/isolinux.cfg deleted file mode 100644 index e5d0290..0000000 --- a/acortesting/bootloaders/isolinux/isolinux.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# D-I config version 2.0 -# search path for the c32 support libraries (libcom32, libutil etc.) -path -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/acortesting/bootloaders/isolinux/live.cfg.in b/acortesting/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/acortesting/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/acortesting/bootloaders/isolinux/menu.cfg b/acortesting/bootloaders/isolinux/menu.cfg deleted file mode 100644 index 47ab6ba..0000000 --- a/acortesting/bootloaders/isolinux/menu.cfg +++ /dev/null @@ -1,61 +0,0 @@ -INCLUDE stdmenu.cfg -MENU title Main Menu -DEFAULT AcorOS 5.3 Live -LABEL AcorOS 5.3 Live - SAY "Booting AcorOS 5.3 Live..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=acoros hostname=acoros timezone=atlantic/azores - -LABEL AcorOS 5.3 livefailsafe - menu label AcorOS 5.3 Live failsafe - kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config noapic noapm nodma nomce nolapic pci=nomsi nomodeset radeon.modeset=0 nouveau.modeset=0 nosmp vga=normal autologin - -LABEL hd - menu label Boot the first hard disk - COM32 chain.c32 - APPEND hd0 - -MENU begin advanced -MENU title AcorOS 5.3 Live with Localisation Support -LABEL Portuguese (pt) - SAY "Booting Portuguese (pt)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_PT.UTF-8 username=acoros hostname=acoros keyboard-layouts=pt quiet splash - -LABEL Portuguese (Brazil) (pt_BR) - SAY "Booting Portuguese (Brazil) (pt_BR)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_BR.UTF-8 username=acoros hostname=acoros keyboard-layouts=br quiet splash - -LABEL English (en) - SAY "Booting English (en)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=en_US.UTF-8 username=acoros hostname=acoros keyboard-layouts=en quiet splash - -LABEL French (fr) - SAY "Booting French (fr)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=fr_FR.UTF-8 username=acoros hostname=acoros keyboard-layouts=fr quiet splash - -LABEL German (de) - SAY "Booting German (de)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=de_DE.UTF-8 username=acoros hostname=acoros keyboard-layouts=de quiet splash - -LABEL Italian (it) - SAY "Booting Italian (it)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=it_IT.UTF-8 username=acoros hostname=acoros keyboard-layouts=it quiet splash - -LABEL Spanish (es) - SAY "Booting Spanish (es)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=es_ES.UTF-8 username=acoros hostname=acoros keyboard-layouts=es quiet splash - - LABEL mainmenu - MENU label Back - MENU exit - MENU end - -INCLUDE utilities.cfg diff --git a/acortesting/bootloaders/isolinux/splash.png b/acortesting/bootloaders/isolinux/splash.png deleted file mode 100644 index 262ddef..0000000 Binary files a/acortesting/bootloaders/isolinux/splash.png and /dev/null differ diff --git a/acortesting/bootloaders/isolinux/stdmenu.cfg b/acortesting/bootloaders/isolinux/stdmenu.cfg deleted file mode 100644 index 3913469..0000000 --- a/acortesting/bootloaders/isolinux/stdmenu.cfg +++ /dev/null @@ -1,19 +0,0 @@ -menu background splash.png -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none -# XXX When adjusting vshift, take care that rows is set to a small -# enough value so any possible menu will fit on the screen, -# rather than falling off the bottom. -menu vshift 8 -menu rows 8 -# The help line must be at least one line from the bottom. -menu helpmsgrow 14 -# The command line must be at least one line from the help line. -menu cmdlinerow 16 -menu timeoutrow 16 -menu tabmsgrow 18 -menu tabmsg Press ENTER to boot or TAB to edit a menu entry diff --git a/acortesting/bootloaders/isolinux/utilities.cfg b/acortesting/bootloaders/isolinux/utilities.cfg deleted file mode 100644 index d600a4c..0000000 --- a/acortesting/bootloaders/isolinux/utilities.cfg +++ /dev/null @@ -1,4 +0,0 @@ -label hdt - menu label ^Hardware Detection Tool (HDT) - com32 hdt.c32 - diff --git a/acortesting/repos/acoros.list.binary b/acortesting/repos/acoros.list.binary deleted file mode 100755 index d7515b0..0000000 --- a/acortesting/repos/acoros.list.binary +++ /dev/null @@ -1,5 +0,0 @@ -deb http://acoroslinux.tk/testing/ acoros main contrib non-free - - - - diff --git a/acortesting/repos/acoros.list.chroot b/acortesting/repos/acoros.list.chroot deleted file mode 100755 index 308cbbf..0000000 --- a/acortesting/repos/acoros.list.chroot +++ /dev/null @@ -1 +0,0 @@ -deb http://acoroslinux.tk/testing/ acoros main contrib non-free diff --git a/acortesting/repos/multimedia.list.binary b/acortesting/repos/multimedia.list.binary deleted file mode 100644 index cc38b74..0000000 --- a/acortesting/repos/multimedia.list.binary +++ /dev/null @@ -1,2 +0,0 @@ -deb https://www.deb-multimedia.org bullseye main non-free -deb-src https://www.deb-multimedia.org bullseye main non-free diff --git a/acortesting/repos/multimedia.list.chroot b/acortesting/repos/multimedia.list.chroot deleted file mode 100644 index cc38b74..0000000 --- a/acortesting/repos/multimedia.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb https://www.deb-multimedia.org bullseye main non-free -deb-src https://www.deb-multimedia.org bullseye main non-free diff --git a/acorunstable/bootloaders/grub-pc/dejavu-bold-14.pf2 b/acorunstable/bootloaders/grub-pc/dejavu-bold-14.pf2 deleted file mode 100644 index 9b093b2..0000000 Binary files a/acorunstable/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ diff --git a/acorunstable/bootloaders/grub-pc/dejavu-bold-16.pf2 b/acorunstable/bootloaders/grub-pc/dejavu-bold-16.pf2 deleted file mode 100644 index 11e7f7a..0000000 Binary files a/acorunstable/bootloaders/grub-pc/dejavu-bold-16.pf2 and /dev/null differ diff --git a/acorunstable/bootloaders/grub-pc/font.pf2 b/acorunstable/bootloaders/grub-pc/font.pf2 deleted file mode 100644 index 59e8ffa..0000000 Binary files a/acorunstable/bootloaders/grub-pc/font.pf2 and /dev/null differ diff --git a/acorunstable/bootloaders/grub-pc/grub.cfg b/acorunstable/bootloaders/grub-pc/grub.cfg deleted file mode 100644 index fa16d57..0000000 --- a/acorunstable/bootloaders/grub-pc/grub.cfg +++ /dev/null @@ -1,69 +0,0 @@ -if loadfont $prefix/font.pf2 ; then - set gfxmode=1024x768 - set gfxpayload=keep - insmod efi_gop - insmod efi_uga - insmod video_bochs - insmod video_cirrus - insmod gfxterm - insmod png - terminal_output gfxterm -fi - -if background_image /isolinux/splash.png; then - set color_normal=light-gray/black - set color_highlight=white/black -elif background_image /splash.png; then - set color_normal=light-gray/black - set color_highlight=white/black -else - set menu_color_normal=cyan/blue - set menu_color_highlight=white/blue -fi - -insmod play -play 960 440 1 0 4 440 1 -if [ ${iso_path} ] ; then -set loopback="findiso=${iso_path}" -export loopback -fi - -menuentry "AcorOS unstable Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "AcorOS unstable Live (fail-safe mode)" { - linux /live/initrd.img boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal - initrd /live/initrd.img -} -submenu "AcorOS unstable Live with Localisation Support" { -menuentry "Portuguese (pt)" { - linux /live/vmlinuz boot=live components locales=pt_PT.UTF-8 quiet splash keyboard-layouts=pt username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Portuguese (Brazil) (pt_BR)" { - linux /live/vmlinuz boot=live components locales=pt_BR.UTF-8 quiet splash keyboard-layouts=br username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "English (en)" { - linux /live/vmlinuz boot=live components locales=en_US.UTF-8 quiet splash keyboard-layouts=en username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "French (fr)" { - linux /live/vmlinuz boot=live components locales=fr_FR.UTF-8 quiet splash keyboard-layouts=fr username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "German (de)" { - linux /live/vmlinuz boot=live components locales=de_DE.UTF-8 quiet splash keyboard-layouts=de username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Italian (it)" { - linux /live/vmlinuz boot=live components locales=it_IT.UTF-8 quiet splash keyboard-layouts=it username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -menuentry "Spanish (es)" { - linux /live/vmlinuz boot=live components locales=es_ES.UTF-8 quiet splash keyboard-layouts=es username=acoros hostname=acoros timezone=atlantic/azores autologin "${loopback}" - initrd /live/initrd.img -} -} - diff --git a/acorunstable/bootloaders/grub-pc/live-theme/theme.txt b/acorunstable/bootloaders/grub-pc/live-theme/theme.txt deleted file mode 100644 index 4ceef4b..0000000 --- a/acorunstable/bootloaders/grub-pc/live-theme/theme.txt +++ /dev/null @@ -1,51 +0,0 @@ -desktop-image: "../splash.png" -title-color: "#ffffff" -title-font: "DejaVu Sans Bold 16" -title-text: "Live Boot Menu with GRUB" -message-font: "Unifont Regular 16" -terminal-font: "Unifont Regular 16" - -#help bar at the bottom -+ label { - top = 100%-50 - left = 0 - width = 100% - height = 20 - text = "@KEYMAP_SHORT@" - align = "center" - color = "#ffffff" - font = "DejaVu Sans Bold 14" -} - -#boot menu -+ boot_menu { - left = 10% - width = 80% - top = 52% - height = 48%-80 - item_color = "#a8a8a8" - item_font = "DejaVu Sans Bold 14" - selected_item_color= "#ffffff" - selected_item_font = "DejaVu Sans Bold 14" - item_height = 16 - item_padding = 0 - item_spacing = 4 - icon_width = 0 - icon_heigh = 0 - item_icon_space = 0 -} - -#progress bar -+ progress_bar { - id = "__timeout__" - left = 15% - top = 100%-80 - height = 16 - width = 70% - font = "DejaVu Sans Regular 14" - text_color = "#000000" - fg_color = "#ffffff" - bg_color = "#a8a8a8" - border_color = "#ffffff" - text = "@TIMEOUT_NOTIFICATION_LONG@" -} diff --git a/acorunstable/bootloaders/grub-pc/loopback.cfg b/acorunstable/bootloaders/grub-pc/loopback.cfg deleted file mode 100644 index b8e3b21..0000000 --- a/acorunstable/bootloaders/grub-pc/loopback.cfg +++ /dev/null @@ -1 +0,0 @@ -source /boot/grub/grub.cfg \ No newline at end of file diff --git a/acorunstable/bootloaders/grub-pc/memtest.cfg b/acorunstable/bootloaders/grub-pc/memtest.cfg deleted file mode 100644 index 454804b..0000000 --- a/acorunstable/bootloaders/grub-pc/memtest.cfg +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "Memory Diagnostic Tool (@MEMTEST_VERSION@)" --hotkey=m { - linux16 @MEMTEST_BIN@ -} diff --git a/acorunstable/bootloaders/grub-pc/splash.png b/acorunstable/bootloaders/grub-pc/splash.png deleted file mode 100644 index 262ddef..0000000 Binary files a/acorunstable/bootloaders/grub-pc/splash.png and /dev/null differ diff --git a/acorunstable/bootloaders/isolinux/chain.c32 b/acorunstable/bootloaders/isolinux/chain.c32 deleted file mode 100644 index a9d6e0e..0000000 Binary files a/acorunstable/bootloaders/isolinux/chain.c32 and /dev/null differ diff --git a/acorunstable/bootloaders/isolinux/isolinux.cfg b/acorunstable/bootloaders/isolinux/isolinux.cfg deleted file mode 100644 index e5d0290..0000000 --- a/acorunstable/bootloaders/isolinux/isolinux.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# D-I config version 2.0 -# search path for the c32 support libraries (libcom32, libutil etc.) -path -include menu.cfg -default vesamenu.c32 -prompt 0 -timeout 0 diff --git a/acorunstable/bootloaders/isolinux/live.cfg.in b/acorunstable/bootloaders/isolinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/acorunstable/bootloaders/isolinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -label live-@FLAVOUR@ - menu label ^Live (@FLAVOUR@) - menu default - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE@ - -label live-@FLAVOUR@-failsafe - menu label ^Live (@FLAVOUR@ failsafe) - linux @LINUX@ - initrd @INITRD@ - append @APPEND_LIVE_FAILSAFE@ diff --git a/acorunstable/bootloaders/isolinux/menu.cfg b/acorunstable/bootloaders/isolinux/menu.cfg deleted file mode 100644 index 7b0f834..0000000 --- a/acorunstable/bootloaders/isolinux/menu.cfg +++ /dev/null @@ -1,61 +0,0 @@ -INCLUDE stdmenu.cfg -MENU title Main Menu -DEFAULT AcorOS unstable Live -LABEL AcorOS unstable Live - SAY "Booting AcorOS unstable Live..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=acoros hostname=acoros timezone=atlantic/azores - -LABEL AcorOS unstable livefailsafe - menu label AcorOS unstable Live failsafe - kernel /live/vmlinuz - append initrd=/live/initrd.img boot=live config noapic noapm nodma nomce nolapic pci=nomsi nomodeset radeon.modeset=0 nouveau.modeset=0 nosmp vga=normal autologin - -LABEL hd - menu label Boot the first hard disk - COM32 chain.c32 - APPEND hd0 - -MENU begin advanced -MENU title AcorOS unstable Live with Localisation Support -LABEL Portuguese (pt) - SAY "Booting Portuguese (pt)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_PT.UTF-8 username=acoros hostname=acoros keyboard-layouts=pt quiet splash - -LABEL Portuguese (Brazil) (pt_BR) - SAY "Booting Portuguese (Brazil) (pt_BR)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=pt_BR.UTF-8 username=acoros hostname=acoros keyboard-layouts=br quiet splash - -LABEL English (en) - SAY "Booting English (en)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=en_US.UTF-8 username=acoros hostname=acoros keyboard-layouts=en quiet splash - -LABEL French (fr) - SAY "Booting French (fr)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=fr_FR.UTF-8 username=acoros hostname=acoros keyboard-layouts=fr quiet splash - -LABEL German (de) - SAY "Booting German (de)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=de_DE.UTF-8 username=acoros hostname=acoros keyboard-layouts=de quiet splash - -LABEL Italian (it) - SAY "Booting Italian (it)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=it_IT.UTF-8 username=acoros hostname=acoros keyboard-layouts=it quiet splash - -LABEL Spanish (es) - SAY "Booting Spanish (es)..." - linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components locales=es_ES.UTF-8 username=acoros hostname=acoros keyboard-layouts=es quiet splash - - LABEL mainmenu - MENU label Back - MENU exit - MENU end - -INCLUDE utilities.cfg diff --git a/acorunstable/bootloaders/isolinux/splash.png b/acorunstable/bootloaders/isolinux/splash.png deleted file mode 100644 index 262ddef..0000000 Binary files a/acorunstable/bootloaders/isolinux/splash.png and /dev/null differ diff --git a/acorunstable/bootloaders/isolinux/stdmenu.cfg b/acorunstable/bootloaders/isolinux/stdmenu.cfg deleted file mode 100644 index 3913469..0000000 --- a/acorunstable/bootloaders/isolinux/stdmenu.cfg +++ /dev/null @@ -1,19 +0,0 @@ -menu background splash.png -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none -# XXX When adjusting vshift, take care that rows is set to a small -# enough value so any possible menu will fit on the screen, -# rather than falling off the bottom. -menu vshift 8 -menu rows 8 -# The help line must be at least one line from the bottom. -menu helpmsgrow 14 -# The command line must be at least one line from the help line. -menu cmdlinerow 16 -menu timeoutrow 16 -menu tabmsgrow 18 -menu tabmsg Press ENTER to boot or TAB to edit a menu entry diff --git a/acorunstable/bootloaders/isolinux/utilities.cfg b/acorunstable/bootloaders/isolinux/utilities.cfg deleted file mode 100644 index d600a4c..0000000 --- a/acorunstable/bootloaders/isolinux/utilities.cfg +++ /dev/null @@ -1,4 +0,0 @@ -label hdt - menu label ^Hardware Detection Tool (HDT) - com32 hdt.c32 - diff --git a/acorunstable/repos/acoros.list.binary b/acorunstable/repos/acoros.list.binary deleted file mode 100755 index 24e1b10..0000000 --- a/acorunstable/repos/acoros.list.binary +++ /dev/null @@ -1 +0,0 @@ -deb http://acoroslinux.tk/unstable/ acoros main contrib non-free diff --git a/acorunstable/repos/acoros.list.chroot b/acorunstable/repos/acoros.list.chroot deleted file mode 100755 index 4a69273..0000000 --- a/acorunstable/repos/acoros.list.chroot +++ /dev/null @@ -1,4 +0,0 @@ -deb http://acoroslinux.tk/unstable/ acoros main contrib non-free - - - diff --git a/acorunstable/repos/multimedia.list.binary b/acorunstable/repos/multimedia.list.binary deleted file mode 100644 index cc38b74..0000000 --- a/acorunstable/repos/multimedia.list.binary +++ /dev/null @@ -1,2 +0,0 @@ -deb https://www.deb-multimedia.org bullseye main non-free -deb-src https://www.deb-multimedia.org bullseye main non-free diff --git a/acorunstable/repos/multimedia.list.chroot b/acorunstable/repos/multimedia.list.chroot deleted file mode 100644 index cc38b74..0000000 --- a/acorunstable/repos/multimedia.list.chroot +++ /dev/null @@ -1,2 +0,0 @@ -deb https://www.deb-multimedia.org bullseye main non-free -deb-src https://www.deb-multimedia.org bullseye main non-free diff --git a/budgiebuild.sh b/budgiebuild.sh new file mode 100755 index 0000000..b065aae --- /dev/null +++ b/budgiebuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS ISO from our CI|CD pipeline. + + +[ -x ./Budgie/build.sh ] && (cd Budgie ; sudo ./build.sh ; cd ../) + diff --git a/cinnamonbuild.sh b/cinnamonbuild.sh new file mode 100755 index 0000000..3678805 --- /dev/null +++ b/cinnamonbuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Cinnamon/build.sh ] && (cd Cinnamon ; sudo ./build.sh ; cd ../) + diff --git a/gnomebuild.sh b/gnomebuild.sh new file mode 100755 index 0000000..0618e2c --- /dev/null +++ b/gnomebuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./gnome/build.sh ] && (cd Gnome ; sudo ./build.sh ; cd ../) + diff --git a/kdebuild.sh b/kdebuild.sh new file mode 100755 index 0000000..454d9a0 --- /dev/null +++ b/kdebuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Kde/build.sh ] && (cd Kde ; sudo ./build.sh ; cd ../) + diff --git a/lxde32build.sh b/lxde32build.sh new file mode 100755 index 0000000..e8f8eb3 --- /dev/null +++ b/lxde32build.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Lxde32/build.sh ] && (cd Lxde32 ; sudo ./build.sh ; cd ../) + diff --git a/lxdebuild.sh b/lxdebuild.sh new file mode 100755 index 0000000..bc471d9 --- /dev/null +++ b/lxdebuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Lxde/build.sh ] && (cd Lxde ; sudo ./build.sh ; cd ../) + diff --git a/lxqt32build.sh b/lxqt32build.sh new file mode 100755 index 0000000..7376a2a --- /dev/null +++ b/lxqt32build.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Lxqt32/build.sh ] && (cd Lxqt32 ; sudo ./build.sh ; cd ../) + diff --git a/lxqtbuild.sh b/lxqtbuild.sh new file mode 100755 index 0000000..b097654 --- /dev/null +++ b/lxqtbuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Lxqt/build.sh ] && (cd Lxqt ; sudo ./build.sh ; cd ../) + diff --git a/xfce32build.sh b/xfce32build.sh new file mode 100755 index 0000000..e1b1fcf --- /dev/null +++ b/xfce32build.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Xfce32/build.sh ] && (cd Xfce32 ; sudo ./build.sh ; cd ../) + diff --git a/xfcebuild.sh b/xfcebuild.sh new file mode 100755 index 0000000..c49703b --- /dev/null +++ b/xfcebuild.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# This is a helper script used to do the actual build. +# By running this script , as "sudo" you can easily build a new AçorOS from our CI|CD pipeline. + + +[ -x ./Xfce/build.sh ] && (cd Xfce ; sudo ./build.sh ; cd ../) +