diff --git a/build-iso.sh b/build-all.sh similarity index 79% rename from build-iso.sh rename to build-all.sh index e15098fa..06119435 100755 --- a/build-iso.sh +++ b/build-all.sh @@ -14,4 +14,6 @@ git pull --ff # this script will build the 7 isos sequencialy -./BldHelper.sh +./my-distro-ubuntu-20.04-lts/BldHelper.sh +./my-distro-ubuntu-22.04-lts/BldHelper.sh +./my-distro-ubuntu-23.04/BldHelper.sh diff --git a/BldHelper.sh b/my-distro-ubuntu-20.04-lts/BldHelper.sh similarity index 82% rename from BldHelper.sh rename to my-distro-ubuntu-20.04-lts/BldHelper.sh index cdb3b0b6..35608b51 100755 --- a/BldHelper.sh +++ b/my-distro-ubuntu-20.04-lts/BldHelper.sh @@ -11,15 +11,15 @@ # Set environment variables PREFIX=My-distro-ubuntu SUFFIX=amd64 -BUILD=ubuntu-64 +BUILD=ubuntu-20.04-lts FileName="${PREFIX}-${SUFFIX}" LOCATION="/home/$SUDO_USER/out/${BUILD}" LogDir="/home/$SUDO_USER/logs" -WorkingDir="/home/$SUDO_USER/My-distro-configs-ubuntu/" +WorkingDir="/home/$SUDO_USER/My-distro-configs-ubuntu/my-distro-ubuntu-20.04-lts" # Execute the ISO building script cd ${WorkingDir} -./build.sh +./build.sh &> /tmp/build_log.txt # Move and rename the ISO file cd build @@ -38,8 +38,9 @@ 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/${PREFIX}${SUFFIX}.out ]; then - mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log +if [ -f /tmp/build_log.txt ]; then + LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log" + mv /tmp/build_log.txt ${LogDir}/${LogFileName} fi # Clean the build folder diff --git a/my-distro-ubuntu-20.04-lts/applications b/my-distro-ubuntu-20.04-lts/applications new file mode 120000 index 00000000..32c37e2d --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/applications @@ -0,0 +1 @@ +../applications \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/backgrounds b/my-distro-ubuntu-20.04-lts/backgrounds new file mode 120000 index 00000000..bddeeb98 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/backgrounds @@ -0,0 +1 @@ +../backgrounds \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/bootloader-config b/my-distro-ubuntu-20.04-lts/bootloader-config new file mode 120000 index 00000000..aa339ad0 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/bootloader-config @@ -0,0 +1 @@ +../bootloader-config \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/bootloaders b/my-distro-ubuntu-20.04-lts/bootloaders new file mode 120000 index 00000000..20e5e5b1 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/bootloaders @@ -0,0 +1 @@ +../bootloaders \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/build.sh b/my-distro-ubuntu-20.04-lts/build.sh new file mode 100755 index 00000000..66e74778 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/build.sh @@ -0,0 +1,270 @@ +#!/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 focal \ + --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 Xfce Desktop +mkdir -p $build/build/config/package-lists +echo xfce4 xfce4-goodies > $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 +locales +language-selector-gnome +#update-manager +gnome-packagekit +adwaita-icon-theme-full +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 +menulibre +mugshot +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +gnome-system-tools +gnome-disk-utility +gnome-calculator +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 +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 +tumbler +tumbler-plugins-extra +ffmpegthumbnailer +linux-firmware +xterm +grub-pc +spice-vdagent +console-setup + +" > $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/share/applications +mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds +mkdir -p $build/build/config/includes.chroot/etc/calamares +mkdir -p $build/build/config/includes.chroot/usr/share/icons +mkdir -p $build/build/config/includes.chroot/usr/share/themes +mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $build/build/config/includes.chroot/usr/sbin +mkdir -p $build/build/config/includes.chroot/etc/lightdm +mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps +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/hooks/live +cp $build/hooks/normal/* $build/build/config/hooks/normal +cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps +cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/bootloader-config/* $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 + + + +# Build the ISO # +lb build #--debug --verbose + diff --git a/my-distro-ubuntu-20.04-lts/calamares b/my-distro-ubuntu-20.04-lts/calamares new file mode 120000 index 00000000..5ad393d3 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/calamares @@ -0,0 +1 @@ +../calamares \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/Thunar/accels.scm b/my-distro-ubuntu-20.04-lts/configs/skel/.config/Thunar/accels.scm new file mode 100644 index 00000000..dc9ec62e --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/Thunar/accels.scm @@ -0,0 +1,84 @@ +; Thunar GtkAccelMap rc-file -*- scheme -*- +; this file is an automated accelerator map dump +; +; (gtk_accel_path "/ThunarStandardView/invert-selection" "") +; (gtk_accel_path "/ThunarLauncher/open-in-new-tab" "p") +; (gtk_accel_path "/ThunarWindow/zoom-in" "plus") +; (gtk_accel_path "/ThunarWindow/reload" "r") +; (gtk_accel_path "/ThunarLauncher/open" "o") +; (gtk_accel_path "/ThunarWindow/empty-trash" "") +; (gtk_accel_path "/ThunarWindow/zoom-in-alt" "equal") +; (gtk_accel_path "/ThunarWindow/view-side-pane-menu" "") +; (gtk_accel_path "/ThunarStandardView/sort-ascending" "") +; (gtk_accel_path "/ThunarWindow/open-network" "") +; (gtk_accel_path "/ThunarActions/uca-action-1699649221921047-3" "") +; (gtk_accel_path "/ThunarWindow/switch-next-tab" "Page_Down") +; (gtk_accel_path "/ThunarWindow/view-as-compact-list" "3") +; (gtk_accel_path "/ThunarWindow/about" "") +; (gtk_accel_path "/ThunarLauncher/open-with-menu" "") +; (gtk_accel_path "/ThunarWindow/open-file-system" "") +; (gtk_accel_path "/ThunarWindow/open-parent" "Up") +; (gtk_accel_path "/ThunarWindow/view-menu" "") +; (gtk_accel_path "/ThunarStandardView/properties" "Return") +; (gtk_accel_path "/ThunarLauncher/open-in-new-window" "o") +; (gtk_accel_path "/ThunarStandardView/back" "Left") +; (gtk_accel_path "/ThunarWindow/sendto-menu" "") +; (gtk_accel_path "/ThunarStandardView/delete" "") +; (gtk_accel_path "/ThunarActions/uca-action-1699645920036592-1" "") +; (gtk_accel_path "/ThunarStandardView/select-by-pattern" "s") +; (gtk_accel_path "/ThunarWindow/close-tab" "w") +; (gtk_accel_path "/ThunarWindow/view-side-pane-tree" "e") +; (gtk_accel_path "/ThunarShortcutsPane/sendto-shortcuts" "") +; (gtk_accel_path "/ThunarWindow/help-menu" "") +; (gtk_accel_path "/ThunarActions/uca-action-1699649302169021-4" "") +; (gtk_accel_path "/ThunarWindow/open-location-alt" "d") +; (gtk_accel_path "/ThunarWindow/open-home" "Home") +; (gtk_accel_path "/ThunarLauncher/open-with-other-in-menu" "") +; (gtk_accel_path "/ThunarActions/uca-action-1699649053291613-2" "") +; (gtk_accel_path "/ThunarWindow/open-templates" "") +; (gtk_accel_path "/ThunarStandardView/rename" "F2") +; (gtk_accel_path "/ThunarStandardView/paste" "v") +; (gtk_accel_path "/ThunarStandardView/duplicate" "") +; (gtk_accel_path "/ThunarWindow/zoom-out" "minus") +; (gtk_accel_path "/ThunarLauncher/sendto-desktop" "") +; (gtk_accel_path "/ThunarWindow/view-location-selector-toolbar" "") +; (gtk_accel_path "/ThunarStandardView/select-all-files" "") +; (gtk_accel_path "/ThunarLauncher/open-with-other" "") +; (gtk_accel_path "/ThunarWindow/preferences" "") +; (gtk_accel_path "/ThunarWindow/edit-menu" "") +; (gtk_accel_path "/ThunarWindow/view-side-pane-shortcuts" "b") +; (gtk_accel_path "/ThunarWindow/contents" "F1") +; (gtk_accel_path "/ThunarWindow/close-window" "q") +; (gtk_accel_path "/ThunarStandardView/cut" "x") +; (gtk_accel_path "/ThunarWindow/switch-previous-tab" "Page_Up") +; (gtk_accel_path "/ThunarActions/uca-action-1699648910982267-1" "") +; (gtk_accel_path "/ThunarStandardView/sort-by-type" "") +; (gtk_accel_path "/ThunarWindow/close-all-windows" "w") +; (gtk_accel_path "/ThunarWindow/view-location-selector-menu" "") +; (gtk_accel_path "/ThunarWindow/view-statusbar" "") +; (gtk_accel_path "/ThunarStandardView/copy" "c") +; (gtk_accel_path "/ThunarWindow/open-trash" "") +; (gtk_accel_path "/ThunarWindow/open-desktop" "") +; (gtk_accel_path "/ThunarStandardView/paste-into-folder" "") +; (gtk_accel_path "/ThunarWindow/open-location" "l") +; (gtk_accel_path "/ThunarWindow/new-window" "n") +; (gtk_accel_path "/ThunarWindow/view-menubar" "m") +; (gtk_accel_path "/ThunarStandardView/create-folder" "n") +; (gtk_accel_path "/ThunarWindow/view-as-detailed-list" "2") +; (gtk_accel_path "/ThunarStandardView/arrange-items-menu" "") +; (gtk_accel_path "/ThunarWindow/view-as-icons" "1") +; (gtk_accel_path "/ThunarStandardView/forward" "Right") +; (gtk_accel_path "/ThunarStandardView/restore" "") +; (gtk_accel_path "/ThunarWindow/file-menu" "") +; (gtk_accel_path "/ThunarStandardView/make-link" "") +; (gtk_accel_path "/ThunarStandardView/sort-descending" "") +; (gtk_accel_path "/ThunarWindow/new-tab" "t") +; (gtk_accel_path "/ThunarWindow/go-menu" "") +; (gtk_accel_path "/ThunarStandardView/sort-by-size" "") +; (gtk_accel_path "/ThunarStandardView/sort-by-mtime" "") +; (gtk_accel_path "/ThunarWindow/show-hidden" "h") +; (gtk_accel_path "/ThunarWindow/view-location-selector-pathbar" "") +; (gtk_accel_path "/ThunarWindow/zoom-reset" "0") +; (gtk_accel_path "/ThunarStandardView/move-to-trash" "") +; (gtk_accel_path "/ThunarStandardView/sort-by-name" "") +; (gtk_accel_path "/ThunarWindow/detach-tab" "") diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/Thunar/uca.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/Thunar/uca.xml new file mode 100644 index 00000000..4c6f40e6 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/Thunar/uca.xml @@ -0,0 +1,49 @@ + + + + utilities-terminal + Open terminal here + 1699645920036592-1 + exo-open --working-directory %f --launch TerminalEmulator + Exemple of a custom action + * + + + + + file-manager + Open as root + 1699649053291613-2 + pkexec thunar %f + Open as root + * + + + + preferences-system-search + Search for files + 1699648910982267-1 + catfish --path=%f + Find files and folders + * + + + + accessories-text-editor + Edit as root + 1699649221921047-3 + pkexec mousepad %f + Edit as root + * + + + + x-office-document-template + Open in terminal + 1699649302169021-4 + xfce4-terminal -x nano %f + Open in terminal + * + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/panel/whiskermenu-7.rc b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/panel/whiskermenu-7.rc new file mode 100644 index 00000000..ae6d55aa --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/panel/whiskermenu-7.rc @@ -0,0 +1,81 @@ +favorites=firefox.desktop,thunderbird.desktop,thunar.desktop,xfce4-terminal.desktop +recent= +button-title=My-distro +button-icon=debian-logo +button-single-row=false +show-button-title=true +show-button-icon=true +launcher-show-name=true +launcher-show-description=true +launcher-show-tooltip=true +item-icon-size=3 +hover-switch-category=true +category-show-name=true +category-icon-size=1 +load-hierarchy=false +view-as-icons=true +recent-items-max=10 +favorites-in-recent=true +display-recent-default=false +position-search-alternate=true +position-commands-alternate=true +position-categories-alternate=true +stay-on-focus-out=false +confirm-session-command=true +menu-width=662 +menu-height=523 +menu-opacity=100 +command-settings=xfce4-settings-manager +show-command-settings=true +command-lockscreen=xflock4 +show-command-lockscreen=true +command-switchuser=dm-tool switch-to-greeter +show-command-switchuser=false +command-logoutuser=xfce4-session-logout --logout --fast +show-command-logoutuser=false +command-restart=xfce4-session-logout --reboot --fast +show-command-restart=false +command-shutdown=xfce4-session-logout --halt --fast +show-command-shutdown=false +command-suspend=xfce4-session-logout --suspend +show-command-suspend=false +command-hibernate=xfce4-session-logout --hibernate +show-command-hibernate=false +command-logout=xfce4-session-logout +show-command-logout=true +command-menueditor=menulibre +show-command-menueditor=true +command-profile=mugshot +show-command-profile=true +search-actions=5 + +[action0] +name=Manual +pattern=# +command=exo-open --launch TerminalEmulator man %s +regex=false + +[action1] +name=Pesquisa web +pattern=? +command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u +regex=false + +[action2] +name=Wikipédia +pattern=!w +command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u +regex=false + +[action3] +name=Executar no terminal +pattern=! +command=exo-open --launch TerminalEmulator %s +regex=false + +[action4] +name=Abrir URI +pattern=^(file|http|https):\\/\\/(.*)$ +command=exo-open \\0 +regex=true + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml new file mode 100644 index 00000000..c3b514d9 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml new file mode 100644 index 00000000..9fd09d61 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml new file mode 100644 index 00000000..781e4e71 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/ristretto.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml new file mode 100644 index 00000000..ec7e8bce --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml new file mode 100644 index 00000000..d5ccf15a --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml new file mode 100644 index 00000000..e90d5791 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml new file mode 100644 index 00000000..f68fb191 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml new file mode 100644 index 00000000..2c4e1da0 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml new file mode 100644 index 00000000..4fdf554c --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml new file mode 100644 index 00000000..881b0c2e --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml new file mode 100644 index 00000000..96aa3ed4 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-manager.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml new file mode 100644 index 00000000..adcada69 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml new file mode 100644 index 00000000..545b7bb6 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.face b/my-distro-ubuntu-20.04-lts/configs/skel/.face new file mode 100644 index 00000000..0a05a7ce Binary files /dev/null and b/my-distro-ubuntu-20.04-lts/configs/skel/.face differ diff --git a/my-distro-ubuntu-20.04-lts/configs/skel/.profile b/my-distro-ubuntu-20.04-lts/configs/skel/.profile new file mode 100644 index 00000000..32dc3749 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/configs/skel/.profile @@ -0,0 +1,32 @@ +# ~/.profile: executed by the command interpreter for login shells. +# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login +# exists. +# see /usr/share/doc/bash/examples/startup-files for examples. +# the files are located in the bash-doc package. + +# the default umask is set in /etc/profile; for setting the umask +# for ssh logins, install and configure the libpam-umask package. +#umask 022 + +# if running bash +if [ -n "$BASH_VERSION" ]; then + # include .bashrc if it exists + if [ -f "$HOME/.bashrc" ]; then + . "$HOME/.bashrc" + fi +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/bin" ] ; then + PATH="$HOME/bin:$PATH" +fi + +# set PATH so it includes user's private bin if it exists +if [ -d "$HOME/.local/bin" ] ; then + PATH="$HOME/.local/bin:$PATH" +fi + +# set PATH so it includes /snap/bin if it exists +if [ -d "/snap/bin" ] ; then + PATH="/snap/bin:$PATH" +fi diff --git a/my-distro-ubuntu-20.04-lts/grub b/my-distro-ubuntu-20.04-lts/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/hooks b/my-distro-ubuntu-20.04-lts/hooks new file mode 120000 index 00000000..f631275e --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/hooks @@ -0,0 +1 @@ +../hooks \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/icons b/my-distro-ubuntu-20.04-lts/icons new file mode 120000 index 00000000..3cfd4cb1 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/icons @@ -0,0 +1 @@ +../icons \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/install-debian b/my-distro-ubuntu-20.04-lts/install-debian new file mode 120000 index 00000000..f4895317 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/install-debian @@ -0,0 +1 @@ +../install-debian \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/lightdm b/my-distro-ubuntu-20.04-lts/lightdm new file mode 120000 index 00000000..b55b63f5 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/lightdm @@ -0,0 +1 @@ +../lightdm \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/packages b/my-distro-ubuntu-20.04-lts/packages new file mode 120000 index 00000000..a16c4050 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/packages @@ -0,0 +1 @@ +../packages \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/sources-final/sources-final b/my-distro-ubuntu-20.04-lts/sources-final/sources-final new file mode 100755 index 00000000..b70cd614 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/sources-final/sources-final @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Writes the final sources.list file +# + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") +RELEASE="focal" + +cat << EOF > $CHROOT/etc/apt/sources.list +# See https://wiki.debian.org/SourcesList for more information. + +deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse +#deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse + +deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse +#deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse + +deb http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse +#deb-src http://security.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse + +#deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse +#deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse + +EOF + +exit 0 diff --git a/my-distro-ubuntu-20.04-lts/sources-final/sources-media b/my-distro-ubuntu-20.04-lts/sources-final/sources-media new file mode 100755 index 00000000..b2f05835 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/sources-final/sources-media @@ -0,0 +1,25 @@ +#!/bin/sh + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") +MEDIUM_PATH="/run/live/medium" +RELEASE="focal" + +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-20.04-lts/themes b/my-distro-ubuntu-20.04-lts/themes new file mode 120000 index 00000000..de900312 --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/themes @@ -0,0 +1 @@ +../themes \ No newline at end of file diff --git a/my-distro-ubuntu-20.04-lts/userconfig b/my-distro-ubuntu-20.04-lts/userconfig new file mode 120000 index 00000000..8d7a939b --- /dev/null +++ b/my-distro-ubuntu-20.04-lts/userconfig @@ -0,0 +1 @@ +../userconfig \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/BldHelper.sh b/my-distro-ubuntu-22.04-lts/BldHelper.sh new file mode 100755 index 00000000..e6fbd0a1 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/BldHelper.sh @@ -0,0 +1,51 @@ +#!/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 +SUFFIX=amd64 +BUILD=ubuntu-22.04-lts +FileName="${PREFIX}-${SUFFIX}" +LOCATION="/home/$SUDO_USER/out/${BUILD}" +LogDir="/home/$SUDO_USER/logs" +WorkingDir="/home/$SUDO_USER/My-distro-configs-ubuntu/my-distro-ubuntu-22.04-lts" + +# Execute the ISO building script +cd ${WorkingDir} +./build.sh &> /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-22.04-lts/applications b/my-distro-ubuntu-22.04-lts/applications new file mode 120000 index 00000000..32c37e2d --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/applications @@ -0,0 +1 @@ +../applications \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/backgrounds b/my-distro-ubuntu-22.04-lts/backgrounds new file mode 120000 index 00000000..bddeeb98 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/backgrounds @@ -0,0 +1 @@ +../backgrounds \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/bootloader-config b/my-distro-ubuntu-22.04-lts/bootloader-config new file mode 120000 index 00000000..aa339ad0 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/bootloader-config @@ -0,0 +1 @@ +../bootloader-config \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/bootloaders b/my-distro-ubuntu-22.04-lts/bootloaders new file mode 120000 index 00000000..20e5e5b1 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/bootloaders @@ -0,0 +1 @@ +../bootloaders \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/build.sh b/my-distro-ubuntu-22.04-lts/build.sh new file mode 100755 index 00000000..4550aa4f --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/build.sh @@ -0,0 +1,270 @@ +#!/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 Xfce Desktop +mkdir -p $build/build/config/package-lists +echo xfce4 xfce4-goodies > $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 +locales +language-selector-gnome +#update-manager +gnome-packagekit +adwaita-icon-theme-full +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 +menulibre +mugshot +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +gnome-system-tools +gnome-disk-utility +gnome-calculator +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 +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 +tumbler +tumbler-plugins-extra +ffmpegthumbnailer +linux-firmware +xterm +grub-pc +spice-vdagent +console-setup + +" > $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/share/applications +mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds +mkdir -p $build/build/config/includes.chroot/etc/calamares +mkdir -p $build/build/config/includes.chroot/usr/share/icons +mkdir -p $build/build/config/includes.chroot/usr/share/themes +mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $build/build/config/includes.chroot/usr/sbin +mkdir -p $build/build/config/includes.chroot/etc/lightdm +mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps +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/hooks/live +cp $build/hooks/normal/* $build/build/config/hooks/normal +cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps +cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/bootloader-config/* $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 + + + +# Build the ISO # +lb build #--debug --verbose + diff --git a/my-distro-ubuntu-22.04-lts/calamares b/my-distro-ubuntu-22.04-lts/calamares new file mode 120000 index 00000000..5ad393d3 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/calamares @@ -0,0 +1 @@ +../calamares \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/configs b/my-distro-ubuntu-22.04-lts/configs new file mode 120000 index 00000000..271eaab3 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/configs @@ -0,0 +1 @@ +../configs \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/grub b/my-distro-ubuntu-22.04-lts/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/hooks b/my-distro-ubuntu-22.04-lts/hooks new file mode 120000 index 00000000..f631275e --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/hooks @@ -0,0 +1 @@ +../hooks \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/icons b/my-distro-ubuntu-22.04-lts/icons new file mode 120000 index 00000000..3cfd4cb1 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/icons @@ -0,0 +1 @@ +../icons \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/install-debian b/my-distro-ubuntu-22.04-lts/install-debian new file mode 120000 index 00000000..f4895317 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/install-debian @@ -0,0 +1 @@ +../install-debian \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/lightdm b/my-distro-ubuntu-22.04-lts/lightdm new file mode 120000 index 00000000..b55b63f5 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/lightdm @@ -0,0 +1 @@ +../lightdm \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/packages b/my-distro-ubuntu-22.04-lts/packages new file mode 120000 index 00000000..a16c4050 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/packages @@ -0,0 +1 @@ +../packages \ No newline at end of file diff --git a/sources-final/sources-final b/my-distro-ubuntu-22.04-lts/sources-final/sources-final similarity index 100% rename from sources-final/sources-final rename to my-distro-ubuntu-22.04-lts/sources-final/sources-final diff --git a/sources-final/sources-media b/my-distro-ubuntu-22.04-lts/sources-final/sources-media similarity index 100% rename from sources-final/sources-media rename to my-distro-ubuntu-22.04-lts/sources-final/sources-media diff --git a/my-distro-ubuntu-22.04-lts/themes b/my-distro-ubuntu-22.04-lts/themes new file mode 120000 index 00000000..de900312 --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/themes @@ -0,0 +1 @@ +../themes \ No newline at end of file diff --git a/my-distro-ubuntu-22.04-lts/userconfig b/my-distro-ubuntu-22.04-lts/userconfig new file mode 120000 index 00000000..8d7a939b --- /dev/null +++ b/my-distro-ubuntu-22.04-lts/userconfig @@ -0,0 +1 @@ +../userconfig \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/BldHelper.sh b/my-distro-ubuntu-23.04/BldHelper.sh new file mode 100755 index 00000000..6289c7a7 --- /dev/null +++ b/my-distro-ubuntu-23.04/BldHelper.sh @@ -0,0 +1,51 @@ +#!/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-23.04 +FileName="${PREFIX}-${SUFFIX}" +LOCATION="/home/$SUDO_USER/out/${BUILD}" +LogDir="/home/$SUDO_USER/logs" +WorkingDir="/home/$SUDO_USER/My-distro-configs-ubuntu/my-distro-ubuntu-23.04" + +# Execute the ISO building script +cd ${WorkingDir} +./build.sh &> /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 new file mode 120000 index 00000000..32c37e2d --- /dev/null +++ b/my-distro-ubuntu-23.04/applications @@ -0,0 +1 @@ +../applications \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/backgrounds b/my-distro-ubuntu-23.04/backgrounds new file mode 120000 index 00000000..bddeeb98 --- /dev/null +++ b/my-distro-ubuntu-23.04/backgrounds @@ -0,0 +1 @@ +../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 new file mode 120000 index 00000000..aa339ad0 --- /dev/null +++ b/my-distro-ubuntu-23.04/bootloader-config @@ -0,0 +1 @@ +../bootloader-config \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/bootloaders b/my-distro-ubuntu-23.04/bootloaders new file mode 120000 index 00000000..20e5e5b1 --- /dev/null +++ b/my-distro-ubuntu-23.04/bootloaders @@ -0,0 +1 @@ +../bootloaders \ No newline at end of file diff --git a/build.sh b/my-distro-ubuntu-23.04/build.sh similarity index 99% rename from build.sh rename to my-distro-ubuntu-23.04/build.sh index c3de99c4..db458d9e 100755 --- a/build.sh +++ b/my-distro-ubuntu-23.04/build.sh @@ -30,7 +30,7 @@ lb config noauto \ --mode ubuntu \ --architectures amd64 \ --linux-flavours generic \ - --distribution jammy \ + --distribution lunar \ --archive-areas "main multiverse restricted universe" \ --mirror-bootstrap http://archive.ubuntu.com/ubuntu \ --parent-mirror-bootstrap http://archive.ubuntu.com/ubuntu \ diff --git a/my-distro-ubuntu-23.04/calamares b/my-distro-ubuntu-23.04/calamares new file mode 120000 index 00000000..5ad393d3 --- /dev/null +++ b/my-distro-ubuntu-23.04/calamares @@ -0,0 +1 @@ +../calamares \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/configs b/my-distro-ubuntu-23.04/configs new file mode 120000 index 00000000..271eaab3 --- /dev/null +++ b/my-distro-ubuntu-23.04/configs @@ -0,0 +1 @@ +../configs \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/grub b/my-distro-ubuntu-23.04/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-ubuntu-23.04/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/hooks b/my-distro-ubuntu-23.04/hooks new file mode 120000 index 00000000..f631275e --- /dev/null +++ b/my-distro-ubuntu-23.04/hooks @@ -0,0 +1 @@ +../hooks \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/icons b/my-distro-ubuntu-23.04/icons new file mode 120000 index 00000000..3cfd4cb1 --- /dev/null +++ b/my-distro-ubuntu-23.04/icons @@ -0,0 +1 @@ +../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 new file mode 120000 index 00000000..f4895317 --- /dev/null +++ b/my-distro-ubuntu-23.04/install-debian @@ -0,0 +1 @@ +../install-debian \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/lightdm b/my-distro-ubuntu-23.04/lightdm new file mode 120000 index 00000000..b55b63f5 --- /dev/null +++ b/my-distro-ubuntu-23.04/lightdm @@ -0,0 +1 @@ +../lightdm \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/packages b/my-distro-ubuntu-23.04/packages new file mode 120000 index 00000000..a16c4050 --- /dev/null +++ b/my-distro-ubuntu-23.04/packages @@ -0,0 +1 @@ +../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 new file mode 100755 index 00000000..a3e2c5d1 --- /dev/null +++ b/my-distro-ubuntu-23.04/sources-final/sources-final @@ -0,0 +1,26 @@ +#!/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 new file mode 100755 index 00000000..3049e862 --- /dev/null +++ b/my-distro-ubuntu-23.04/sources-final/sources-media @@ -0,0 +1,25 @@ +#!/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 new file mode 120000 index 00000000..de900312 --- /dev/null +++ b/my-distro-ubuntu-23.04/themes @@ -0,0 +1 @@ +../themes \ No newline at end of file diff --git a/my-distro-ubuntu-23.04/userconfig b/my-distro-ubuntu-23.04/userconfig new file mode 120000 index 00000000..8d7a939b --- /dev/null +++ b/my-distro-ubuntu-23.04/userconfig @@ -0,0 +1 @@ +../userconfig \ No newline at end of file