diff --git a/my-distro-ubuntu-23.04/BldHelper.sh b/my-distro-ubuntu-23.04/BldHelper.sh deleted file mode 100755 index be1be94e..00000000 --- a/my-distro-ubuntu-23.04/BldHelper.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -################################################################################ -# Title: Bldhelper.sh -# Description: Script to build My-distro ISO image -# Author: manuel rosa -# Date: Outubro 29, 2023 -# License: GPL-3.0-or-later -################################################################################ - -# Set environment variables -PREFIX=My-distro-ubuntu-23.04 -SUFFIX=amd64 -BUILD=ubuntu-openbox-23.04 -TODAY=$(date -u +"%Y-%m-%d") -FileName="${PREFIX}-${SUFFIX}" -LOCATION="/home/$SUDO_USER/out/${BUILD}" -LogDir="/home/$SUDO_USER/logs" -WorkingDir="/home/$SUDO_USER/My-distro-configs-ubuntu-openbox/my-distro-ubuntu-23.04" - -# Execute the ISO building script -cd ${WorkingDir} -./build.sh 2>&1 | tee /tmp/build_log.txt - -# Move and rename the ISO file -cd build -mv *.iso ${FileName}-${TODAY}.iso - -# Create the checksum file for the ISO -sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum - -# Remove old ISO and checksum files from the desired location -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -# Move the ISO and checksum files to the desired location -mkdir -p ${LOCATION} -mv ${FileName}-${TODAY}.iso ${LOCATION} -mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} - -# Move the log file to the log directory (if it exists) -if [ -f /tmp/build_log.txt ]; then - LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log" - mv /tmp/build_log.txt ${LogDir}/${LogFileName} -fi - -# Clean the build folder -lb clean - -# Remove the "build" directory and its contents -cd .. -rm -rf build diff --git a/my-distro-ubuntu-23.04/applications b/my-distro-ubuntu-23.04/applications deleted file mode 120000 index 32c37e2d..00000000 --- a/my-distro-ubuntu-23.04/applications +++ /dev/null @@ -1 +0,0 @@ -../applications \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/backgrounds b/my-distro-ubuntu-23.04/backgrounds deleted file mode 120000 index bddeeb98..00000000 --- a/my-distro-ubuntu-23.04/backgrounds +++ /dev/null @@ -1 +0,0 @@ -../backgrounds \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/bootloader-config b/my-distro-ubuntu-23.04/bootloader-config deleted file mode 120000 index aa339ad0..00000000 --- a/my-distro-ubuntu-23.04/bootloader-config +++ /dev/null @@ -1 +0,0 @@ -../bootloader-config \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/bootloaders b/my-distro-ubuntu-23.04/bootloaders deleted file mode 120000 index 20e5e5b1..00000000 --- a/my-distro-ubuntu-23.04/bootloaders +++ /dev/null @@ -1 +0,0 @@ -../bootloaders \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/build.sh b/my-distro-ubuntu-23.04/build.sh deleted file mode 100755 index 7debf047..00000000 --- a/my-distro-ubuntu-23.04/build.sh +++ /dev/null @@ -1,293 +0,0 @@ -#!/bin/bash - -################################################################################ -# Title: build.sh -# Description: Script to build My-distro ISO image -# Author: manuel rosa -# Date: Outubro 29, 2023 -# License: GPL-3.0-or-later -################################################################################ - -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -build="$(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 ; 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 ubuntu \ - --architectures amd64 \ - --linux-flavours generic \ - --distribution lunar \ - --archive-areas "main multiverse restricted universe" \ - --mirror-bootstrap http://archive.ubuntu.com/ubuntu \ - --parent-mirror-bootstrap http://archive.ubuntu.com/ubuntu \ - --parent-mirror-chroot http://archive.ubuntu.com/ubuntu \ - --parent-mirror-chroot-security http://security.ubuntu.com/ubuntu \ - --parent-mirror-binary http://archive.ubuntu.com/ubuntu \ - --parent-mirror-binary-security http://security.ubuntu.com/ubuntu \ - --mirror-chroot http://archive.ubuntu.com/ubuntu \ - --mirror-chroot-security http://security.ubuntu.com/ubuntu \ - --updates true \ - --security true \ - --cache true \ - --apt-recommends true \ - --firmware-binary true \ - --firmware-chroot true \ - --iso-application "My-distro" \ - --win32-loader false \ - --iso-volume "My-distro-amd64" \ - --iso-publisher "Manuel rosa" \ - --image-name "My-distro" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Openbox window manager -mkdir -p $build/build/config/package-lists -echo openbox > $build/build/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-generic -tint2 -thunar -thunar-archive-plugin -desktop-base -mousepad -lxpolkit -pnmixer -#pasystray -alsa-utils -gmrun -git -curl -#rofi -fonts-cantarell -nitrogen -compton -compton-conf -xarchiver -lxsession-logout -jgmenu -orchis-gtk-theme -locales -language-selector-gnome -#update-manager -gnome-packagekit -dkms -dbus-x11 -ntp -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -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 -gvfs-backends -samba -network-manager -network-manager-gnome -network-manager-pptp-gnome -bluez -blueman -gufw -gtk2-engines -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -lightdm-autologin-greeter -gnome-system-tools -gnome-disk-utility -galculator -neofetch -accountsservice -catfish -fuseiso -timeshift -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -software-properties-gtk -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -nano -baobab -language-pack-de -language-pack-en -language-pack-fr -language-pack-pt -language-pack-it -language-pack-gnome-de -language-pack-gnome-es -language-pack-gnome-fr -language-pack-gnome-pt -language-pack-gnome-it -transmission-gtk -thunderbird -thunderbird-locale-pt-pt -thunderbird-locale-pt-br -thunderbird-locale-de -thunderbird-locale-en -thunderbird-locale-en-us -thunderbird-locale-es -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -qt5-style-plugins -qt5ct -gdebi -f2fs-tools -xfsprogs -xfsdump -ffmpegthumbnailer -linux-firmware -grub-pc -spice-vdagent -console-setup -xdg-user-dirs-gtk -cbatticon -dunst -xfce4-clipman -xfce4-screenshooter -xfce4-power-manager -xfce4-settings -xfce4-terminal -plank -gnome-screensaver -ristretto - -" > $build/build/config/package-lists/packages.list.chroot - -echo "# Installer packages to install the system to disk. -calamares -calamares-settings-debian - -" > $build/build/config/package-lists/installer.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. -b43-fwcutter -bcmwl-kernel-source -iucode-tool -setserial -user-setup -efibootmgr -grub-efi -secureboot-db -grub-efi-amd64 -grub-efi-amd64-bin -grub-efi-amd64-signed -shim -shim-signed - -" > $build/build/config/package-lists/installer.list.binary - - -# Setup the chroot structure -mkdir -p $build/build/config/includes.binary -mkdir -p $build/build/config/hooks/live -mkdir -p $build/build/config/hooks/normal -mkdir -p $build/build/config/bootloaders -mkdir -p $build/build/config/packages.chroot -mkdir -p $build/build/config/includes.chroot/etc -mkdir -p $build/build/config/includes.chroot/usr/lib/live/config -mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d -mkdir -p $build/build/config/includes.chroot/usr/share/applications -mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds -mkdir -p $build/build/config/includes.chroot/etc/calamares -mkdir -p $build/build/config/includes.chroot/usr/share/icons -mkdir -p $build/build/config/includes.chroot/usr/share/themes -mkdir -p $build/build/config/includes.chroot/usr/sbin -mkdir -p $build/build/config/includes.chroot/etc/lightdm -mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps -mkdir -p $build/build/config/includes.chroot/usr/share/plymouth -mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base -mkdir -p $build/build/config/includes.chroot/etc/default -mkdir -p $build/build/config/includes.chroot/boot/grub/themes - -# Copy Configs to the chroot -cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d -cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications -cp $build/hooks/live/* $build/build/config/includes.chroot/usr/lib/live/config -cp $build/hooks/normal/* $build/build/config/hooks/normal -cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps -cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin -cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin -cp $build/grub/grub $build/build/config/includes.chroot/etc/default - -cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/includes.binary -cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds -cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares -cp -r $build/configs/* $build/build/config/includes.chroot/etc/ -cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons -cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes -#cp -r $build/packages/* $build/build/config/packages.chroot -cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes -cp -r $build/packages/* $build/build/config/packages.chroot - - - -# Build the ISO # -lb build #--debug --verbose - diff --git a/my-distro-ubuntu-23.04/calamares b/my-distro-ubuntu-23.04/calamares deleted file mode 120000 index 5ad393d3..00000000 --- a/my-distro-ubuntu-23.04/calamares +++ /dev/null @@ -1 +0,0 @@ -../calamares \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/configs b/my-distro-ubuntu-23.04/configs deleted file mode 120000 index 271eaab3..00000000 --- a/my-distro-ubuntu-23.04/configs +++ /dev/null @@ -1 +0,0 @@ -../configs \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/grub b/my-distro-ubuntu-23.04/grub deleted file mode 120000 index c807ca0d..00000000 --- a/my-distro-ubuntu-23.04/grub +++ /dev/null @@ -1 +0,0 @@ -../grub \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/hooks b/my-distro-ubuntu-23.04/hooks deleted file mode 120000 index f631275e..00000000 --- a/my-distro-ubuntu-23.04/hooks +++ /dev/null @@ -1 +0,0 @@ -../hooks \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/icons b/my-distro-ubuntu-23.04/icons deleted file mode 120000 index 3cfd4cb1..00000000 --- a/my-distro-ubuntu-23.04/icons +++ /dev/null @@ -1 +0,0 @@ -../icons \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/install-debian b/my-distro-ubuntu-23.04/install-debian deleted file mode 120000 index f4895317..00000000 --- a/my-distro-ubuntu-23.04/install-debian +++ /dev/null @@ -1 +0,0 @@ -../install-debian \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/lightdm b/my-distro-ubuntu-23.04/lightdm deleted file mode 120000 index b55b63f5..00000000 --- a/my-distro-ubuntu-23.04/lightdm +++ /dev/null @@ -1 +0,0 @@ -../lightdm \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/packages b/my-distro-ubuntu-23.04/packages deleted file mode 120000 index a16c4050..00000000 --- a/my-distro-ubuntu-23.04/packages +++ /dev/null @@ -1 +0,0 @@ -../packages \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/sources-final/sources-final b/my-distro-ubuntu-23.04/sources-final/sources-final deleted file mode 100755 index a3e2c5d1..00000000 --- a/my-distro-ubuntu-23.04/sources-final/sources-final +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Writes the final sources.list file -# - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -RELEASE="lunar" - -cat << EOF > $CHROOT/etc/apt/sources.list -# See https://wiki.debian.org/SourcesList for more information. - -deb http://archive.ubuntu.com/ubuntu/ lunar main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu/ lunar main restricted universe multiverse - -deb http://archive.ubuntu.com/ubuntu/ lunar-updates main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu/ lunar-updates main restricted universe multiverse - -deb http://security.ubuntu.com/ubuntu/ lunar-security main restricted universe multiverse -#deb-src http://security.ubuntu.com/ubuntu/ lunar-security main restricted universe multiverse - -#deb http://archive.ubuntu.com/ubuntu/ lunar-backports main restricted universe multiverse -#deb http://archive.ubuntu.com/ubuntu/ lunar-backports main restricted universe multiverse - -EOF - -exit 0 diff --git a/my-distro-ubuntu-23.04/sources-final/sources-media b/my-distro-ubuntu-23.04/sources-final/sources-media deleted file mode 100755 index 3049e862..00000000 --- a/my-distro-ubuntu-23.04/sources-final/sources-media +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -MEDIUM_PATH="/run/live/medium" -RELEASE="lunar" - -if [ "$1" = "-u" ]; then - umount $CHROOT/$MEDIUM_PATH - rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list - chroot $CHROOT apt-get update - exit 0 -fi - -# Remove the base sources, we will configure sources in a later phase -rm -f $CHROOT/etc/apt/sources.list.d/base.list - -mkdir -p $CHROOT/$MEDIUM_PATH -mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH -echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list -chroot $CHROOT apt-get update -# Attempt safest way to remove cruft -rmdir $CHROOT/run/live/medium -rmdir $CHROOT/run/live - -exit 0 diff --git a/my-distro-ubuntu-23.04/themes b/my-distro-ubuntu-23.04/themes deleted file mode 120000 index de900312..00000000 --- a/my-distro-ubuntu-23.04/themes +++ /dev/null @@ -1 +0,0 @@ -../themes \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/userconfig b/my-distro-ubuntu-23.04/userconfig deleted file mode 120000 index 8d7a939b..00000000 --- a/my-distro-ubuntu-23.04/userconfig +++ /dev/null @@ -1 +0,0 @@ -../userconfig \ No newline at end of file