diff --git a/pepbld.sh b/PepBld-nightly-86x32.sh similarity index 82% rename from pepbld.sh rename to PepBld-nightly-86x32.sh index 60c5a18f0..1224b43fd 100755 --- a/pepbld.sh +++ b/PepBld-nightly-86x32.sh @@ -5,44 +5,61 @@ PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" uchinanchu="$(pwd)" -# This cleanup might be better served in the BldHelper*.sh script. # Create the build folder, move into it removing stale mountpoints and files there. [ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato cd fusato + +# This cleanup might be better served in the BldHelper*.sh script. +# Within the build, can be layered mounts inside multiple chroots. umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done +#for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done # Set of the structure to be used for the ISO and Live system. # See /usr/lib/live/build/config for a full list of examples. # Up above is the manual description of what options I used so far. -lb config \ ---clean \ ---color \ ---quiet \ ---archive-areas "main contrib non-free" \ ---architectures i386 \ ---apt-recommends true \ ---backports true \ ---binary-images iso-hybrid \ ---cache true \ ---mode debian \ ---distribution bullseye \ ---firmware-binary true \ ---firmware-chroot true \ ---iso-application "PeppermintOS" \ ---iso-preparer "PeppermintOS-https://peppermintos.com/" \ ---iso-publisher "Peppermint OS Team" \ ---iso-volume "PeppermintOS" \ ---image-name "PepOS" \ ---linux-flavours 686-pae \ ---security true \ ---updates true \ ---win32-loader false \ ---checksums sha512 \ ---zsync false \ +lb config noauto \ + --clean \ + --color \ + --quiet \ + --archive-areas "main contrib non-free" \ + --architectures i686 \ + --apt-recommends true \ + --binary-images iso-hybrid \ + --cache false \ + --mode debian \ + --firmware-binary true \ + --firmware-chroot true \ + --distribution chimaera \ + --initsystem sysvinit \ + --memtest memtest86+ \ + --mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-chroot http://deb.devuan.org/merged \ + --parent-mirror-chroot-security http://deb.devuan.org/merged \ + --parent-mirror-binary http://deb.devuan.org/merged \ + --parent-mirror-binary-security http://deb.devuan.org/merged \ + --mirror-chroot http://deb.devuan.org/merged \ + --mirror-chroot-security http://deb.devuan.org/merged \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "PeppermintOS" \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PeppermintOS" \ + --image-name "PepOS" \ + --linux-flavours 686-pae \ + --security true \ + --updates true \ + --backports true \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ +# Trying to get LUKS encrypted installs working on / partition +echo -e "cryptsetup \ncryptsetup-initramfs" > $uchinanchu/fusato/config/package-lists/encryption.list.chroot + # Install the XFCE Desktop mkdir -p $uchinanchu/fusato/config/package-lists/ echo xfce4 > $uchinanchu/fusato/config/package-lists/desktop.list.chroot @@ -50,38 +67,22 @@ echo xfce4 > $uchinanchu/fusato/config/package-lists/desktop.list.chroot # Install software echo "# Install software to the squashfs for calamares to unpack to the OS. adwaita-icon-theme -alsa-utils arandr arc-theme bluez bluez-firmware calamares-settings-debian calamares -cups curl +cups dconf-editor dkms dbus-x11 efibootmgr -firmware-linux -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 -firmware-ralink fonts-cantarell fonts-liberation gdebi gir1.2-webkit2-4.0 -git gparted gnome-disk-utility gnome-system-tools @@ -89,8 +90,7 @@ grub-pc gvfs-backends inputattach inxi -locales -locales-all +locales menulibre nemo neofetch @@ -102,15 +102,14 @@ python3-tk python3-bs4 python3-requests python3-ttkthemes -python3-pyqt5 python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-pyqt5.qtwebengine python3-apt -screenfetch -simple-scan -smartmontools smbclient +samba +screenfetch +smartmontools sqlite3 synaptic system-config-printer @@ -124,9 +123,13 @@ xfce4-screenshooter xfce4-whiskermenu-plugin yad wireless-tools -wget +wget +alsa-utils f2fs-tools xfsprogs +lightdm +lightdm-gtk-greeter +plymouth " > $uchinanchu/fusato/config/package-lists/packages.list.chroot @@ -149,6 +152,7 @@ shim-signed shim-signed-common shim-unsigned + " > $uchinanchu/fusato/config/package-lists/installer.list.binary @@ -199,7 +203,6 @@ mkdir -p $uchinanchu/fusato/config/packages.chroot # Copy single files to the chroot cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases cp $uchinanchu/pepcal/adddesktopicon/add-calamares-desktop-icon $uchinanchu/fusato/config/includes.chroot/usr/bin -cp $uchinanchu/pepcal/calamares/netinstall-* $uchinanchu/fusato/config/includes.chroot/etc/calamares cp $uchinanchu/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares cp $uchinanchu/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin cp $uchinanchu/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin @@ -207,7 +210,6 @@ cp $uchinanchu/peplightdm/lightdm.conf $uchinanchu/fusato/config/includes.chroot cp $uchinanchu/peplightdm/lightdm-gtk-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm cp $uchinanchu/pepplymouth/plymouthd.conf $uchinanchu/fusato/config/includes.chroot/etc/plymouth cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt/pepconf -cp $uchinanchu/../MakePackageLists.sh $uchinanchu/fusato/config/includes.chroot/usr/local/bin cp $uchinanchu/PepProTools/xDaily $uchinanchu/fusato/config/includes.chroot/usr/local/bin cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart @@ -226,8 +228,7 @@ cp $uchinanchu/pepmultimedia/* $uchinanchu/fusato/config/archives cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib cp $uchinanchu/peppackages/* $uchinanchu/fusato/config/packages.chroot -cp $uchinanchu/peppackages/deb-multimedia*.deb $uchinanchu/fusato/config/packages.chroot -cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +#cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep cp $uchinanchu/pepdb/* $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep @@ -259,14 +260,15 @@ cp -r $uchinanchu/pepplymouth/plymouth $uchinanchu/fusato/config/includes.chroot cp -r $uchinanchu/pepxfce/xfce4 $uchinanchu/fusato/config/includes.chroot/etc/skel/.config -# Resolves Synaptics issue. Might be better in a conf hook. +# Place files unique to Nightly builds here. mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates -ln -s Debian.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info -ln -s Debian.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors -ln -s debian.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv +cp -r $uchinanchu/pepinfo/devuan/* $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +ln -s Devuan.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info +ln -s Devuan.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors +ln -s devuan.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv # Build the ISO # -lb build #--debug --verbose +lb build noauto #--debug --verbose diff --git a/PepBld-nightly-86x64.sh b/PepBld-nightly-86x64.sh new file mode 100755 index 000000000..92afdd2aa --- /dev/null +++ b/PepBld-nightly-86x64.sh @@ -0,0 +1,272 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +uchinanchu="$(pwd)" + + +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato +cd fusato + +# This cleanup might be better served in the BldHelper*.sh script. +# Within the build, can be layered mounts inside multiple chroots. +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 \ + --clean \ + --color \ + --quiet \ + --archive-areas "main contrib non-free" \ + --architectures amd64 \ + --apt-recommends true \ + --binary-images iso-hybrid \ + --cache false \ + --mode debian \ + --firmware-binary true \ + --firmware-chroot true \ + --distribution chimaera \ + --initsystem sysvinit \ + --memtest memtest86+ \ + --mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-chroot http://deb.devuan.org/merged \ + --parent-mirror-chroot-security http://deb.devuan.org/merged \ + --parent-mirror-binary http://deb.devuan.org/merged \ + --parent-mirror-binary-security http://deb.devuan.org/merged \ + --mirror-chroot http://deb.devuan.org/merged \ + --mirror-chroot-security http://deb.devuan.org/merged \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "PeppermintOS" \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PeppermintOS" \ + --image-name "PepOS" \ + --linux-flavours amd64 \ + --security true \ + --updates true \ + --backports true \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + +# Trying to get LUKS encrypted installs working on / partition +echo -e "cryptsetup \ncryptsetup-initramfs" > $uchinanchu/fusato/config/package-lists/encryption.list.chroot + +# Install the XFCE Desktop +mkdir -p $uchinanchu/fusato/config/package-lists/ +echo xfce4 > $uchinanchu/fusato/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +adwaita-icon-theme +arandr +arc-theme +bluez +bluez-firmware +calamares-settings-debian +calamares +curl +cups +dconf-editor +dkms +dbus-x11 +efibootmgr +fonts-cantarell +fonts-liberation +gdebi +gir1.2-webkit2-4.0 +gparted +gnome-disk-utility +gnome-system-tools +grub-pc +gvfs-backends +inputattach +inxi +locales +menulibre +nemo +neofetch +network-manager-gnome +ntp +os-prober +python3-pip +python3-tk +python3-bs4 +python3-requests +python3-ttkthemes +python3-pyqt5.qtsvg +python3-pyqt5.qtwebkit +python3-pyqt5.qtwebengine +python3-apt +smbclient +samba +screenfetch +smartmontools +sqlite3 +synaptic +system-config-printer +mousepad +xfce4-battery-plugin +xfce4-clipman-plugin +xfce4-power-manager +xfce4-taskmanager +xfce4-terminal +xfce4-screenshooter +xfce4-whiskermenu-plugin +yad +wireless-tools +wget +alsa-utils +f2fs-tools +xfsprogs +lightdm +lightdm-gtk-greeter +plymouth + +" > $uchinanchu/fusato/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 and 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 + +" > $uchinanchu/fusato/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $uchinanchu/fusato/config/includes.binary +mkdir -p $uchinanchu/fusato/config/includes.bootstrap/etc/apt +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/local/bin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/applications +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/desktop-base +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/icons/default +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/themes +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/peppermint +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/plymouth +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/ice/locale +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/fonts/pepconf +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/bin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/sbin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/peppermint/ice +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/sources.list.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/calamares +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/default +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/lightdm +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/plymouth +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.local/share +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/Desktop +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/startpep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pepconf + +mkdir -p $uchinanchu/fusato/config/archives +#mkdir -p $uchinanchu/fusato/config/hooks/live +mkdir -p $uchinanchu/fusato/config/hooks/normal +mkdir -p $uchinanchu/fusato/config/packages.chroot + + +# Copy single files to the chroot +cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases +cp $uchinanchu/pepcal/adddesktopicon/add-calamares-desktop-icon $uchinanchu/fusato/config/includes.chroot/usr/bin +cp $uchinanchu/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp $uchinanchu/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin +cp $uchinanchu/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin +cp $uchinanchu/peplightdm/lightdm.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm +cp $uchinanchu/peplightdm/lightdm-gtk-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm +cp $uchinanchu/pepplymouth/plymouthd.conf $uchinanchu/fusato/config/includes.chroot/etc/plymouth +cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/PepProTools/xDaily $uchinanchu/fusato/config/includes.chroot/usr/local/bin +cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart + +# Copy directory contents to the chroot +cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.chroot/usr/share/applications +cp $uchinanchu/pepdeffileman/xfce4/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 +cp $uchinanchu/pepdeffileman/helpers/* $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers +cp $uchinanchu/pepfont/* $uchinanchu/fusato/config/includes.chroot/usr/share/fonts/pepconf +cp $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.chroot/etc/default +cp $uchinanchu/pephooks/live/* $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.bootstrap/etc +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/etc +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/pepmultimedia/* $uchinanchu/fusato/config/archives +cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib +cp $uchinanchu/peppackages/* $uchinanchu/fusato/config/packages.chroot +#cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions +cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep +cp $uchinanchu/pepdb/* $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep +cp $uchinanchu/pepuserconfig/* $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d +cp $uchinanchu/pepwallpaper/* $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds +cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep + +# Copy recursive files and sub-directories, containing symlinks. +cp -dr $uchinanchu/pepicons/Numix $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/pepicons/Pepirus $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/pepicons/Pepirus-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/peptheme/Arc-Red $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Green $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Blue $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Green-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Teal-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Peppermint-10-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes + +cp -r $uchinanchu/pepcal/calamares/branding $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp -r $uchinanchu/pepcal/calamares/modules $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp -r $uchinanchu/pepdesktopbase/desktop-base $uchinanchu/fusato/config/includes.chroot/usr/share/ +cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/pepmenu/menus $uchinanchu/fusato/config/includes.chroot/etc/skel/.config +cp -r $uchinanchu/pepnemo/nemo $uchinanchu/fusato/config/includes.chroot/etc/skel/.config +cp -r $uchinanchu/pepplymouth/plymouth $uchinanchu/fusato/config/includes.chroot/usr/share/ +cp -r $uchinanchu/pepxfce/xfce4 $uchinanchu/fusato/config/includes.chroot/etc/skel/.config + + +# Place files unique to Nightly builds here. +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +cp -r $uchinanchu/pepinfo/devuan/* $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +ln -s Devuan.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info +ln -s Devuan.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors +ln -s devuan.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv + + +# Build the ISO # +lb build noauto #--debug --verbose + diff --git a/PepBld-testing.sh b/PepBld-testing-86x32.sh similarity index 77% rename from PepBld-testing.sh rename to PepBld-testing-86x32.sh index a272e9fe9..ff256425f 100755 --- a/PepBld-testing.sh +++ b/PepBld-testing-86x32.sh @@ -12,38 +12,50 @@ cd fusato # Within the build, can be layered mounts inside multiple chroots. umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ./cache/bootstrap ./cache/contents.chroot ; do [ $i = ./cache ] && continue || rm -rf $i ; done +for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done -#exit # 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 \ ---clean \ ---color \ ---quiet \ ---archive-areas "main contrib non-free" \ ---architectures i386 \ ---apt-recommends true \ ---backports true \ ---binary-images iso-hybrid \ ---cache true \ ---mode debian \ ---distribution bullseye \ ---firmware-binary true \ ---firmware-chroot true \ ---iso-application "PeppermintOS" \ ---iso-preparer "PeppermintOS-https://peppermintos.com/" \ ---iso-publisher "Peppermint OS Team" \ ---iso-volume "PeppermintOS" \ ---image-name "PepOS" \ ---linux-flavours 686-pae \ ---security true \ ---updates true \ ---win32-loader false \ ---checksums sha512 \ ---zsync false \ +lb config noauto \ + --clean \ + --color \ + --quiet \ + --archive-areas "main contrib non-free" \ + --architectures i686 \ + --apt-recommends true \ + --binary-images iso-hybrid \ + --cache false \ + --mode debian \ + --firmware-binary true \ + --firmware-chroot true \ + --distribution chimaera \ + --initsystem sysvinit \ + --memtest memtest86+ \ + --mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-chroot http://deb.devuan.org/merged \ + --parent-mirror-chroot-security http://deb.devuan.org/merged \ + --parent-mirror-binary http://deb.devuan.org/merged \ + --parent-mirror-binary-security http://deb.devuan.org/merged \ + --mirror-chroot http://deb.devuan.org/merged \ + --mirror-chroot-security http://deb.devuan.org/merged \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "PeppermintOS" \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PeppermintOS" \ + --image-name "PepOS" \ + --linux-flavours 686-pae \ + --security true \ + --updates true \ + --backports true \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + # Trying to get LUKS encrypted installs working on / partition echo -e "cryptsetup \ncryptsetup-initramfs" > $uchinanchu/fusato/config/package-lists/encryption.list.chroot @@ -67,20 +79,6 @@ dconf-editor dkms dbus-x11 efibootmgr -firmware-linux -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 -firmware-ralink fonts-cantarell fonts-liberation gdebi @@ -93,7 +91,6 @@ gvfs-backends inputattach inxi locales -locales-all menulibre nemo neofetch @@ -110,6 +107,7 @@ python3-pyqt5.qtwebkit python3-pyqt5.qtwebengine python3-apt smbclient +samba screenfetch smartmontools sqlite3 @@ -129,6 +127,9 @@ wget alsa-utils f2fs-tools xfsprogs +lightdm +lightdm-gtk-greeter +plymouth " > $uchinanchu/fusato/config/package-lists/packages.list.chroot @@ -175,7 +176,7 @@ mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/sbin mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/peppermint/ice mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt -mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +#mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/sources.list.d mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/calamares mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/default @@ -192,24 +193,23 @@ mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/startpep mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pepconf mkdir -p $uchinanchu/fusato/config/archives + #mkdir -p $uchinanchu/fusato/config/hooks/live mkdir -p $uchinanchu/fusato/config/hooks/normal mkdir -p $uchinanchu/fusato/config/packages.chroot -# Copy Distro tools and files common to all builds -cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps -cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart -cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep +# Copy common Production files from outside this repo to this build +cp ../../PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +cp ../../PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart +cp ../../PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep # Copy Configs to the chroot cp $uchinanchu/pepcal/adddesktopicon/add-calamares-desktop-icon $uchinanchu/fusato/config/includes.chroot/usr/bin -cp $uchinanchu/pepcal/calamares/netinstall-* $uchinanchu/fusato/config/includes.chroot/etc/calamares cp $uchinanchu/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares cp $uchinanchu/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin cp $uchinanchu/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin cp $uchinanchu/peplightdm/lightdm.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm cp $uchinanchu/peplightdm/lightdm-gtk-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm -cp $uchinanchu/../MakePackageLists.sh $uchinanchu/fusato/config/includes.chroot/usr/local/bin cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.chroot/usr/share/applications cp $uchinanchu/pepdeffileman/xfce4/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 @@ -224,7 +224,7 @@ cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/etc cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib -cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +#cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions cp $uchinanchu/pepsources/* $uchinanchu/fusato/config/includes.chroot/opt cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep @@ -234,6 +234,7 @@ cp $uchinanchu/pepwallpaper/* $uchinanchu/fusato/config/includes.chroot/usr/shar cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt + # Copy recursive files and sub-directories cp -dr $uchinanchu/pepicons/Numix $uchinanchu/fusato/config/includes.chroot/usr/share/icons cp -dr $uchinanchu/pepicons/Pepirus $uchinanchu/fusato/config/includes.chroot/usr/share/icons @@ -257,22 +258,18 @@ cp -r $uchinanchu/pepnemo/nemo $uchinanchu/fusato/config/includes.chroot/etc/ske cp -r $uchinanchu/pepplymouth/plymouth $uchinanchu/fusato/config/includes.chroot/usr/share/ cp -r $uchinanchu/pepxfce/* $uchinanchu/fusato/config/includes.chroot/etc/skel/.config + # Place files unique to Testing builds here. mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates -ln -s Debian.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info -ln -s Debian.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors -ln -s debian.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv +cp -s $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +ln -s Devuan.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info +ln -s Devuan.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors +ln -s devuan.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv + +cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases -cp $uchinanchu/peptesting/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases -cp $uchinanchu/peptesting/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin -cp $uchinanchu/peptesting/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares -cp $uchinanchu/peptesting/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin -cp $uchinanchu/peptesting/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d -cp -r $uchinanchu/peptesting/pepcal/calamares/modules $uchinanchu/fusato/config/includes.chroot/etc/calamares -cp -r $uchinanchu/peptesting/peploadersplash/boot $uchinanchu/fusato/config/includes.binary -cp -r $uchinanchu/peptesting/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary # Build the ISO # -lb build #--debug --verbose +lb build noauto #--debug --verbose diff --git a/PepBld-testing-86x64.sh b/PepBld-testing-86x64.sh new file mode 100755 index 000000000..7327d06bb --- /dev/null +++ b/PepBld-testing-86x64.sh @@ -0,0 +1,279 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +uchinanchu="$(pwd)" + + +# This cleanup might be better served in the BldHelper*.sh script. +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato +cd fusato + +# Within the build, can be layered mounts inside multiple chroots. +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 \ + --clean \ + --color \ + --quiet \ + --archive-areas "main contrib non-free" \ + --architectures amd64 \ + --apt-recommends true \ + --binary-images iso-hybrid \ + --cache false \ + --mode debian \ + --firmware-binary true \ + --firmware-chroot true \ + --distribution chimaera \ + --initsystem sysvinit \ + --memtest memtest86+ \ + --mirror-bootstrap https://dev.beard.ly/devuan \ + --parent-mirror-bootstrap https://dev.beard.ly/devuan \ + --parent-mirror-chroot https://dev.beard.ly/devuan \ + --parent-mirror-chroot-security https://dev.beard.ly/devuan \ + --parent-mirror-binary https://ddev.beard.ly/devuan \ + --parent-mirror-binary-security https://dev.beard.ly/devuan \ + --mirror-chroot https://dev.beard.ly/devuan \ + --mirror-chroot-security https://dev.beard.ly/devuan \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "PeppermintOS" \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PeppermintOS" \ + --image-name "PepOS" \ + --linux-flavours amd64 \ + --security true \ + --updates true \ + --backports true \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + +# Trying to get LUKS encrypted installs working on / partition +echo -e "cryptsetup \ncryptsetup-initramfs" > $uchinanchu/fusato/config/package-lists/encryption.list.chroot + +# Install the XFCE Desktop +mkdir -p $uchinanchu/fusato/config/package-lists/ +echo xfce4 > $uchinanchu/fusato/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +adwaita-icon-theme +peppermint-keyring +nala +ca-certificates +arandr +arc-theme +bluez +bluez-firmware +calamares-settings-debian +calamares +curl +cups +dconf-editor +dkms +dbus-x11 +efibootmgr +fonts-cantarell +fonts-liberation +gdebi +gir1.2-webkit2-4.0 +gparted +gnome-disk-utility +gnome-system-tools +grub-pc +gvfs-backends +inputattach +inxi +locales +menulibre +nemo +neofetch +network-manager-gnome +ntp +os-prober +python3-pip +python3-tk +python3-bs4 +python3-requests +python3-ttkthemes +python3-pyqt5.qtsvg +python3-pyqt5.qtwebkit +python3-pyqt5.qtwebengine +python3-apt +smbclient +samba +screenfetch +smartmontools +sqlite3 +synaptic +system-config-printer +mousepad +xfce4-battery-plugin +xfce4-clipman-plugin +xfce4-power-manager +xfce4-taskmanager +xfce4-terminal +xfce4-screenshooter +xfce4-whiskermenu-plugin +yad +wireless-tools +wget +alsa-utils +f2fs-tools +xfsprogs +lightdm +lightdm-gtk-greeter +plymouth + +" > $uchinanchu/fusato/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 and 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 + +" > $uchinanchu/fusato/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $uchinanchu/fusato/config/includes.binary +mkdir -p $uchinanchu/fusato/config/includes.bootstrap/etc/apt +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/local/bin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/applications +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/desktop-base +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/icons/default +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/themes +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/peppermint +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/plymouth +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/ice/locale +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/fonts/pepconf +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/bin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/sbin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/peppermint/ice +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/sources.list.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/calamares +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/default +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/lightdm +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/plymouth +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.local/share +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/Desktop +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/startpep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pepconf +mkdir -p $uchinanchu/fusato/config/packages.chroot + +mkdir -p $uchinanchu/fusato/config/archives +#mkdir -p $uchinanchu/fusato/config/hooks/live +mkdir -p $uchinanchu/fusato/config/hooks/normal +mkdir -p $uchinanchu/fusato/config/packages.chroot + + +# Copy single files to the chroot +cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases +cp $uchinanchu/pepcal/adddesktopicon/add-calamares-desktop-icon $uchinanchu/fusato/config/includes.chroot/usr/bin +cp $uchinanchu/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp $uchinanchu/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin +cp $uchinanchu/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin +cp $uchinanchu/peplightdm/lightdm.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm +cp $uchinanchu/peplightdm/lightdm-gtk-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm +cp $uchinanchu/pepplymouth/plymouthd.conf $uchinanchu/fusato/config/includes.chroot/etc/plymouth +cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/PepProTools/xDaily $uchinanchu/fusato/config/includes.chroot/usr/local/bin +cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart + +# Copy directory contents to the chroot +cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.chroot/usr/share/applications +cp $uchinanchu/pepdeffileman/xfce4/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 +cp $uchinanchu/pepdeffileman/helpers/* $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers +cp $uchinanchu/pepfont/* $uchinanchu/fusato/config/includes.chroot/usr/share/fonts/pepconf +cp $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.chroot/etc/default +cp $uchinanchu/pephooks/live/* $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.bootstrap/etc +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/etc +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/peprepos/* $uchinanchu/fusato/config/archives +cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib +cp $uchinanchu/peppackages/ca-certificates*.deb $uchinanchu/fusato/config/packages.chroot +#cp $uchinanchu/peppackages/* $uchinanchu/fusato/config/packages.chroot +#cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions +cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep +cp $uchinanchu/pepdb/* $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep +cp $uchinanchu/pepuserconfig/* $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d +cp $uchinanchu/pepwallpaper/* $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds +cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep + +# Copy recursive files and sub-directories, containing symlinks. +cp -dr $uchinanchu/pepicons/Numix $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/pepicons/Pepirus $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/pepicons/Pepirus-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/peptheme/Arc-Red $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Green $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Blue $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Green-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Teal-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Peppermint-10-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes + +cp -r $uchinanchu/pepcal/calamares/branding $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp -r $uchinanchu/pepcal/calamares/modules $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp -r $uchinanchu/pepdesktopbase/desktop-base $uchinanchu/fusato/config/includes.chroot/usr/share/ +cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/pepmenu/menus $uchinanchu/fusato/config/includes.chroot/etc/skel/.config +cp -r $uchinanchu/pepnemo/nemo $uchinanchu/fusato/config/includes.chroot/etc/skel/.config +cp -r $uchinanchu/pepplymouth/plymouth $uchinanchu/fusato/config/includes.chroot/usr/share/ +cp -r $uchinanchu/pepxfce/xfce4 $uchinanchu/fusato/config/includes.chroot/etc/skel/.config + + +# Place files unique to Testing builds here. +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +cp -s $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +ln -s Devuan.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info +ln -s Devuan.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors +ln -s devuan.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv + +cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases + + +# Build the ISO # +lb build noauto #--debug --verbose + diff --git a/PepBld-nightly.sh b/pepbld-86x32.sh similarity index 75% rename from PepBld-nightly.sh rename to pepbld-86x32.sh index 0f7d23df7..89f53b8dd 100755 --- a/PepBld-nightly.sh +++ b/pepbld-86x32.sh @@ -5,80 +5,83 @@ PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" uchinanchu="$(pwd)" +# This cleanup might be better served in the BldHelper*.sh script. # Create the build folder, move into it removing stale mountpoints and files there. [ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato cd fusato + +# Within the build, can be layered mounts inside multiple chroots. umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ./cache/bootstrap ./cache/contents.chroot ; do [ $i = ./cache ] && continue || rm -rf $i ; done +for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done # Set of the structure to be used for the ISO and Live system. # See /usr/lib/live/build/config for a full list of examples. # Up above is the manual description of what options I used so far. -lb config \ ---clean \ ---color \ ---quiet \ ---archive-areas "main contrib non-free" \ ---architectures i386 \ ---apt-recommends true \ ---backports true \ ---binary-images iso-hybrid \ ---cache true \ ---mode debian \ ---distribution bullseye \ ---firmware-binary true \ ---firmware-chroot true \ ---iso-application "PeppermintOS" \ ---iso-preparer "PeppermintOS-https://peppermintos.com/" \ ---iso-publisher "Peppermint OS Team" \ ---iso-volume "PeppermintOS" \ ---image-name "PepOS" \ ---linux-flavours 686-pae \ ---security true \ ---updates true \ ---win32-loader false \ ---checksums sha512 \ ---zsync false \ +lb config noauto \ + --clean \ + --color \ + --quiet \ + --variant=minbase \ + --archive-areas "main contrib non-free" \ + --architectures i686 \ + --apt-recommends true \ + --binary-images iso-hybrid \ + --cache false \ + --mode debian \ + --firmware-binary true \ + --firmware-chroot true \ + --distribution chimaera \ + --initsystem sysvinit \ + --memtest memtest86+ \ + --mirror-bootstrap https://dev.beard.ly/devuan \ + --parent-mirror-bootstrap https://dev.beard.ly/devuan \ + --parent-mirror-chroot https://dev.beard.ly/devuan \ + --parent-mirror-chroot-security https://dev.beard.ly/devuan \ + --parent-mirror-binary https://ddev.beard.ly/devuan \ + --parent-mirror-binary-security https://dev.beard.ly/devuan \ + --mirror-chroot https://dev.beard.ly/devuan \ + --mirror-chroot-security https://dev.beard.ly/devuan \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "PeppermintOS" \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PeppermintOS" \ + --image-name "PepOS" \ + --linux-flavours 686-pae \ + --security true \ + --updates true \ + --backports true \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ +# Trying to get LUKS encrypted installs working on / partition +echo -e "cryptsetup \ncryptsetup-initramfs" > $uchinanchu/fusato/config/package-lists/encryption.list.chroot + # Install the XFCE Desktop mkdir -p $uchinanchu/fusato/config/package-lists/ echo xfce4 > $uchinanchu/fusato/config/package-lists/desktop.list.chroot # Install software echo "# Install software to the squashfs for calamares to unpack to the OS. +peppermint-keyring +nala adwaita-icon-theme -alsa-utils arandr arc-theme bluez bluez-firmware calamares-settings-debian calamares -cryptsetup -cryptsetup-initramfs curl cups dconf-editor dkms dbus-x11 efibootmgr -f2fs-tools -firmware-linux -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 -firmware-ralink fonts-cantarell fonts-liberation gdebi @@ -90,8 +93,7 @@ grub-pc gvfs-backends inputattach inxi -locales -locales-all +locales menulibre nemo neofetch @@ -108,6 +110,7 @@ python3-pyqt5.qtwebkit python3-pyqt5.qtwebengine python3-apt smbclient +samba screenfetch smartmontools sqlite3 @@ -123,9 +126,13 @@ xfce4-screenshooter xfce4-whiskermenu-plugin yad wireless-tools -wget +wget +alsa-utils f2fs-tools xfsprogs +lightdm +lightdm-gtk-greeter +plymouth " > $uchinanchu/fusato/config/package-lists/packages.list.chroot @@ -147,14 +154,13 @@ shim-helpers-i386-signed shim-signed shim-signed-common shim-unsigned - " > $uchinanchu/fusato/config/package-lists/installer.list.binary # Setup the chroot structure mkdir -p $uchinanchu/fusato/config/includes.binary mkdir -p $uchinanchu/fusato/config/includes.bootstrap/etc/apt -mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/local/bin mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/applications mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/desktop-base @@ -173,10 +179,12 @@ mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/peppermint/ice mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/sources.list.d mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/calamares mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/default mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/lightdm mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/plymouth mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.local/share mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/Desktop @@ -186,28 +194,27 @@ mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/startpep mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pepconf -mkdir -p $uchinanchu/fusato/config/archives +mkdir -p $uchinanchu/fusato/config/archives #mkdir -p $uchinanchu/fusato/config/hooks/live mkdir -p $uchinanchu/fusato/config/hooks/normal mkdir -p $uchinanchu/fusato/config/packages.chroot -# Copy Distro tools and files common to all builds -cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps -cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart -cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep -# Copy Configs to the chroot +# Copy single files to the chroot +cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases cp $uchinanchu/pepcal/adddesktopicon/add-calamares-desktop-icon $uchinanchu/fusato/config/includes.chroot/usr/bin -cp $uchinanchu/pepcal/calamares/netinstall-* $uchinanchu/fusato/config/includes.chroot/etc/calamares cp $uchinanchu/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares cp $uchinanchu/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin cp $uchinanchu/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin cp $uchinanchu/peplightdm/lightdm.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm cp $uchinanchu/peplightdm/lightdm-gtk-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm -cp $uchinanchu/../MakePackageLists.sh $uchinanchu/fusato/config/includes.chroot/usr/local/bin +cp $uchinanchu/pepplymouth/plymouthd.conf $uchinanchu/fusato/config/includes.chroot/etc/plymouth +cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/PepProTools/xDaily $uchinanchu/fusato/config/includes.chroot/usr/local/bin +cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart -cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases +# Copy directory contents to the chroot cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.chroot/usr/share/applications cp $uchinanchu/pepdeffileman/xfce4/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 cp $uchinanchu/pepdeffileman/helpers/* $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers @@ -218,20 +225,20 @@ cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.bootstrap/etc cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/etc cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/peprepos/* $uchinanchu/fusato/config/archives cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib -cp $uchinanchu/peppackages/* $uchinanchu/fusato/config/packages.chroot -cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +#cp $uchinanchu/peppackages/* $uchinanchu/fusato/config/packages.chroot +#cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions -cp $uchinanchu/pepsources/* $uchinanchu/fusato/config/includes.chroot/opt cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep cp $uchinanchu/pepdb/* $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep cp $uchinanchu/pepuserconfig/* $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d cp $uchinanchu/pepwallpaper/* $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds -cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt +cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep - -# Copy recursive files and sub-directories +# Copy recursive files and sub-directories, containing symlinks. cp -dr $uchinanchu/pepicons/Numix $uchinanchu/fusato/config/includes.chroot/usr/share/icons cp -dr $uchinanchu/pepicons/Pepirus $uchinanchu/fusato/config/includes.chroot/usr/share/icons cp -dr $uchinanchu/pepicons/Pepirus-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/icons @@ -243,7 +250,6 @@ cp -dr $uchinanchu/peptheme/Arc-Teal-Dark $uchinanchu/fusato/config/includes.chr cp -dr $uchinanchu/peptheme/Arc-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes cp -dr $uchinanchu/peptheme/Peppermint-10-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes -cp -r $uchinanchu/pepmultimedia/* $uchinanchu/fusato/config/archives cp -r $uchinanchu/pepcal/calamares/branding $uchinanchu/fusato/config/includes.chroot/etc/calamares cp -r $uchinanchu/pepcal/calamares/modules $uchinanchu/fusato/config/includes.chroot/etc/calamares cp -r $uchinanchu/pepdesktopbase/desktop-base $uchinanchu/fusato/config/includes.chroot/usr/share/ @@ -252,24 +258,18 @@ cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.b cp -r $uchinanchu/pepmenu/menus $uchinanchu/fusato/config/includes.chroot/etc/skel/.config cp -r $uchinanchu/pepnemo/nemo $uchinanchu/fusato/config/includes.chroot/etc/skel/.config cp -r $uchinanchu/pepplymouth/plymouth $uchinanchu/fusato/config/includes.chroot/usr/share/ -cp -r $uchinanchu/pepxfce/* $uchinanchu/fusato/config/includes.chroot/etc/skel/.config +cp -r $uchinanchu/pepxfce/xfce4 $uchinanchu/fusato/config/includes.chroot/etc/skel/.config -# Place files unique to Release builds here. + +# Place files unique to builds from this repository here. mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates -ln -s Debian.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info -ln -s Debian.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors -ln -s debian.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv +cp -r $uchinanchu/pepinfo/devuan/* $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +ln -s Devuan.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info +ln -s Devuan.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors +ln -s devuan.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv -# Place files unique to Nightly builds here. -cp $uchinanchu/pepnightly/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases -cp $uchinanchu/pepnightly/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin -cp $uchinanchu/pepnightly/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin -cp $uchinanchu/pepnightly/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d -cp -r $uchinanchu/pepnightly/peploadersplash/boot $uchinanchu/fusato/config/includes.binary -cp -r $uchinanchu/pepnightly/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary - # Build the ISO # -lb build #--debug --verbose +lb build noauto #--debug --verbose diff --git a/pepbld-86x64.sh b/pepbld-86x64.sh new file mode 100755 index 000000000..742e57005 --- /dev/null +++ b/pepbld-86x64.sh @@ -0,0 +1,278 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +uchinanchu="$(pwd)" + + +# This cleanup might be better served in the BldHelper*.sh script. +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato +cd fusato + +# Within the build, can be layered mounts inside multiple chroots. +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 \ + --clean \ + --color \ + --quiet \ + --archive-areas "main contrib non-free" \ + --architectures amd64 \ + --apt-recommends true \ + --binary-images iso-hybrid \ + --cache false \ + --mode debian \ + --firmware-binary true \ + --firmware-chroot true \ + --distribution chimaera \ + --initsystem sysvinit \ + --memtest memtest86+ \ + --mirror-bootstrap https://mirror.vpgrp.io/devuan \ + --parent-mirror-bootstrap https://mirror.vpgrp.io/devuan \ + --parent-mirror-chroot https://mirror.vpgrp.io/devuan \ + --parent-mirror-chroot-security https://mirror.vpgrp.io/devuan \ + --parent-mirror-binary https://mirror.vpgrp.io/devuan \ + --parent-mirror-binary-security https://mirror.vpgrp.io/devuan \ + --mirror-chroot https://mirror.vpgrp.io/devuan \ + --mirror-chroot-security https://mirror.vpgrp.io/devuan \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "PeppermintOS" \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PeppermintOS" \ + --image-name "PepOS" \ + --linux-flavours amd64 \ + --security true \ + --updates true \ + --backports true \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + +# Trying to get LUKS encrypted installs working on / partition +mkdir -p $uchinanchu/fusato/config/package-lists/ +echo -e "cryptsetup \ncryptsetup-initramfs" > $uchinanchu/fusato/config/package-lists/encryption.list.chroot + +# Install the XFCE Desktop +mkdir -p $uchinanchu/fusato/config/package-lists/ +echo xfce4 > $uchinanchu/fusato/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +peppermint-keyring +nala +ca-certificates +adwaita-icon-theme +arandr +arc-theme +bluez +bluez-firmware +calamares-settings-debian +calamares +curl +cups +dconf-editor +dkms +dbus-x11 +efibootmgr +fonts-cantarell +fonts-liberation +gdebi +gir1.2-webkit2-4.0 +gparted +gnome-disk-utility +gnome-system-tools +grub-pc +gvfs-backends +inputattach +inxi +locales +menulibre +nemo +neofetch +network-manager-gnome +ntp +os-prober +python3-pip +python3-tk +python3-bs4 +python3-requests +python3-ttkthemes +python3-pyqt5.qtsvg +python3-pyqt5.qtwebkit +python3-pyqt5.qtwebengine +python3-apt +smbclient +samba +screenfetch +smartmontools +sqlite3 +synaptic +system-config-printer +mousepad +xfce4-battery-plugin +xfce4-clipman-plugin +xfce4-power-manager +xfce4-taskmanager +xfce4-terminal +xfce4-screenshooter +xfce4-whiskermenu-plugin +yad +wireless-tools +wget +alsa-utils +f2fs-tools +xfsprogs +lightdm +lightdm-gtk-greeter +plymouth + +" > $uchinanchu/fusato/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 and 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 + +" > $uchinanchu/fusato/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $uchinanchu/fusato/config/includes.binary +mkdir -p $uchinanchu/fusato/config/includes.bootstrap/etc/apt +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/local/bin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/applications +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/desktop-base +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/icons/default +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/themes +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/peppermint +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/plymouth +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/ice/locale +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/fonts/pepconf +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/bin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/sbin +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/lib/peppermint/ice +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/apt/sources.list.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/calamares +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/default +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/lightdm +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/plymouth +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/.local/share +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/skel/Desktop +mkdir -p $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/startpep +mkdir -p $uchinanchu/fusato/config/includes.chroot/opt/pepconf +mkdir -p $uchinanchu/fusato/config/packages.chroot + +mkdir -p $uchinanchu/fusato/config/archives +#mkdir -p $uchinanchu/fusato/config/hooks/live +mkdir -p $uchinanchu/fusato/config/hooks/normal +mkdir -p $uchinanchu/fusato/config/packages.chroot + + +# Copy single files to the chroot +cp $uchinanchu/pepaliases/bash_aliases $uchinanchu/fusato/config/includes.chroot/etc/skel/.bash_aliases +cp $uchinanchu/pepcal/adddesktopicon/add-calamares-desktop-icon $uchinanchu/fusato/config/includes.chroot/usr/bin +cp $uchinanchu/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp $uchinanchu/pepcal/install-peppermint $uchinanchu/fusato/config/includes.chroot/usr/bin +cp $uchinanchu/pepcal/sources-final $uchinanchu/fusato/config/includes.chroot/usr/sbin +cp $uchinanchu/peplightdm/lightdm.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm +cp $uchinanchu/peplightdm/lightdm-gtk-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm +cp $uchinanchu/pepplymouth/plymouthd.conf $uchinanchu/fusato/config/includes.chroot/etc/plymouth +cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/PepProTools/xDaily $uchinanchu/fusato/config/includes.chroot/usr/local/bin +cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/autostart + +# Copy directory contents to the chroot +cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.chroot/usr/share/applications +cp $uchinanchu/pepdeffileman/xfce4/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 +cp $uchinanchu/pepdeffileman/helpers/* $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers +cp $uchinanchu/pepfont/* $uchinanchu/fusato/config/includes.chroot/usr/share/fonts/pepconf +cp $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.chroot/etc/default +cp $uchinanchu/pephooks/live/* $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.bootstrap/etc +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/etc +cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/peprepos/* $uchinanchu/fusato/config/archives +cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf +cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib +cp $uchinanchu/peppackages/ca-certificates*.deb $uchinanchu/fusato/config/packages.chroot +#cp $uchinanchu/peppackages/* $uchinanchu/fusato/config/packages.chroot +#cp $uchinanchu/peppinunstable/* $uchinanchu/fusato/config/includes.chroot/etc/apt/preferences.d +cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions +cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep +cp $uchinanchu/pepdb/* $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep +cp $uchinanchu/pepuserconfig/* $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d +cp $uchinanchu/pepwallpaper/* $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds +cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps +cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep + +# Copy recursive files and sub-directories, containing symlinks. +cp -dr $uchinanchu/pepicons/Numix $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/pepicons/Pepirus $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/pepicons/Pepirus-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/icons +cp -dr $uchinanchu/peptheme/Arc-Red $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Green $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Blue $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Green-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Teal-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Arc-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes +cp -dr $uchinanchu/peptheme/Peppermint-10-Red-Dark $uchinanchu/fusato/config/includes.chroot/usr/share/themes + +cp -r $uchinanchu/pepcal/calamares/branding $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp -r $uchinanchu/pepcal/calamares/modules $uchinanchu/fusato/config/includes.chroot/etc/calamares +cp -r $uchinanchu/pepdesktopbase/desktop-base $uchinanchu/fusato/config/includes.chroot/usr/share/ +cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/pepmenu/menus $uchinanchu/fusato/config/includes.chroot/etc/skel/.config +cp -r $uchinanchu/pepnemo/nemo $uchinanchu/fusato/config/includes.chroot/etc/skel/.config +cp -r $uchinanchu/pepplymouth/plymouth $uchinanchu/fusato/config/includes.chroot/usr/share/ +cp -r $uchinanchu/pepxfce/xfce4 $uchinanchu/fusato/config/includes.chroot/etc/skel/.config + + +# Place files unique to builds from this repository here. +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info +mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +cp -r $uchinanchu/pepinfo/devuan/* $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates +ln -s Devuan.info $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.info +ln -s Devuan.mirrors $uchinanchu/fusato/config/includes.chroot/usr/share/python-apt/templates/Peppermint.mirrors +ln -s devuan.csv $uchinanchu/fusato/config/includes.chroot/usr/share/distro-info/peppermint.csv + + +# Build the ISO # +lb build noauto #--debug --verbose + diff --git a/peppackages/deb-multimedia-keyring_2016.8.1_all.deb b/peppackages/deb-multimedia-keyring_2016.8.1_all.deb new file mode 100644 index 000000000..26131680f Binary files /dev/null and b/peppackages/deb-multimedia-keyring_2016.8.1_all.deb differ diff --git a/peppackages/nala_0.10.0_all.deb b/peppackages/nala_0.10.0_all.deb new file mode 100644 index 000000000..c34bdb799 Binary files /dev/null and b/peppackages/nala_0.10.0_all.deb differ diff --git a/peppackages/python3-anyio_3.6.1-1_all.deb b/peppackages/python3-anyio_3.6.1-1_all.deb new file mode 100644 index 000000000..770d86446 Binary files /dev/null and b/peppackages/python3-anyio_3.6.1-1_all.deb differ diff --git a/peppackages/python3-click_8.0.3-1_all.deb b/peppackages/python3-click_8.0.3-1_all.deb new file mode 100644 index 000000000..1e60adb1d Binary files /dev/null and b/peppackages/python3-click_8.0.3-1_all.deb differ diff --git a/peppackages/python3-colorama_0.4.5-1_all.deb b/peppackages/python3-colorama_0.4.5-1_all.deb new file mode 100644 index 000000000..0aed85f90 Binary files /dev/null and b/peppackages/python3-colorama_0.4.5-1_all.deb differ diff --git a/peppackages/python3-commonmark_0.9.1-4_all.deb b/peppackages/python3-commonmark_0.9.1-4_all.deb new file mode 100644 index 000000000..adcfe110b Binary files /dev/null and b/peppackages/python3-commonmark_0.9.1-4_all.deb differ diff --git a/peppackages/python3-h11_0.13.0-2_all.deb b/peppackages/python3-h11_0.13.0-2_all.deb new file mode 100644 index 000000000..edd19d0f4 Binary files /dev/null and b/peppackages/python3-h11_0.13.0-2_all.deb differ diff --git a/peppackages/python3-httpcore_0.15.0-1_all.deb b/peppackages/python3-httpcore_0.15.0-1_all.deb new file mode 100644 index 000000000..d581f87fb Binary files /dev/null and b/peppackages/python3-httpcore_0.15.0-1_all.deb differ diff --git a/peppackages/python3-httpx_0.23.0-1_all.deb b/peppackages/python3-httpx_0.23.0-1_all.deb new file mode 100644 index 000000000..c7dccf728 Binary files /dev/null and b/peppackages/python3-httpx_0.23.0-1_all.deb differ diff --git a/peppackages/python3-pexpect_4.8.0-3_all.deb b/peppackages/python3-pexpect_4.8.0-3_all.deb new file mode 100644 index 000000000..8a8eb4eb8 Binary files /dev/null and b/peppackages/python3-pexpect_4.8.0-3_all.deb differ diff --git a/peppackages/python3-ptyprocess_0.7.0-3_all.deb b/peppackages/python3-ptyprocess_0.7.0-3_all.deb new file mode 100644 index 000000000..74158a06e Binary files /dev/null and b/peppackages/python3-ptyprocess_0.7.0-3_all.deb differ diff --git a/peppackages/python3-pygments_2.12.0+dfsg-2_all.deb b/peppackages/python3-pygments_2.12.0+dfsg-2_all.deb new file mode 100644 index 000000000..bf1d33982 Binary files /dev/null and b/peppackages/python3-pygments_2.12.0+dfsg-2_all.deb differ diff --git a/peppackages/python3-rfc3986_1.5.0-2_all.deb b/peppackages/python3-rfc3986_1.5.0-2_all.deb new file mode 100644 index 000000000..0bd131bc5 Binary files /dev/null and b/peppackages/python3-rfc3986_1.5.0-2_all.deb differ diff --git a/peppackages/python3-rich_12.4.4-1_all.deb b/peppackages/python3-rich_12.4.4-1_all.deb new file mode 100644 index 000000000..6905f03ca Binary files /dev/null and b/peppackages/python3-rich_12.4.4-1_all.deb differ diff --git a/peppackages/python3-sniffio_1.2.0-1_all.deb b/peppackages/python3-sniffio_1.2.0-1_all.deb new file mode 100644 index 000000000..98ea96f27 Binary files /dev/null and b/peppackages/python3-sniffio_1.2.0-1_all.deb differ diff --git a/peppackages/python3-socksio_1.0.0-2_all.deb b/peppackages/python3-socksio_1.0.0-2_all.deb new file mode 100644 index 000000000..46efa7697 Binary files /dev/null and b/peppackages/python3-socksio_1.0.0-2_all.deb differ diff --git a/peppackages/python3-tomli_2.0.1-1_all.deb b/peppackages/python3-tomli_2.0.1-1_all.deb new file mode 100644 index 000000000..65c5bbdc5 Binary files /dev/null and b/peppackages/python3-tomli_2.0.1-1_all.deb differ diff --git a/peppackages/python3-typer_0.4.1-1_all.deb b/peppackages/python3-typer_0.4.1-1_all.deb new file mode 100644 index 000000000..53af55a50 Binary files /dev/null and b/peppackages/python3-typer_0.4.1-1_all.deb differ diff --git a/peppackages/python3-typing-extensions_3.10.0.2-1_all.deb b/peppackages/python3-typing-extensions_3.10.0.2-1_all.deb new file mode 100644 index 000000000..b8a0d1f18 Binary files /dev/null and b/peppackages/python3-typing-extensions_3.10.0.2-1_all.deb differ diff --git a/peprepos/deb-multimedia-keyring.key.binary b/peprepos/deb-multimedia-keyring.key.binary new file mode 100644 index 000000000..a4f2b1006 Binary files /dev/null and b/peprepos/deb-multimedia-keyring.key.binary differ diff --git a/peprepos/deb-multimedia-keyring.key.chroot b/peprepos/deb-multimedia-keyring.key.chroot new file mode 100644 index 000000000..a4f2b1006 Binary files /dev/null and b/peprepos/deb-multimedia-keyring.key.chroot differ diff --git a/peprepos/multimedia.list.binary b/peprepos/multimedia.list.binary new file mode 100644 index 000000000..bd2181efd --- /dev/null +++ b/peprepos/multimedia.list.binary @@ -0,0 +1,2 @@ +deb http://www.deb-multimedia.org bullseye main non-free +#deb-src http://www.deb-multimedia.org bullseye main non-free diff --git a/peprepos/multimedia.list.chroot b/peprepos/multimedia.list.chroot new file mode 100644 index 000000000..bd2181efd --- /dev/null +++ b/peprepos/multimedia.list.chroot @@ -0,0 +1,2 @@ +deb http://www.deb-multimedia.org bullseye main non-free +#deb-src http://www.deb-multimedia.org bullseye main non-free diff --git a/peprepos/peppermint-keyring.key.binary b/peprepos/peppermint-keyring.key.binary new file mode 100644 index 000000000..87f923f4a Binary files /dev/null and b/peprepos/peppermint-keyring.key.binary differ diff --git a/peprepos/peppermint-keyring.key.chroot b/peprepos/peppermint-keyring.key.chroot new file mode 100644 index 000000000..87f923f4a Binary files /dev/null and b/peprepos/peppermint-keyring.key.chroot differ diff --git a/peprepos/peppermint.list.binary b/peprepos/peppermint.list.binary new file mode 100644 index 000000000..e345fa0da --- /dev/null +++ b/peprepos/peppermint.list.binary @@ -0,0 +1,2 @@ +deb http://codeberg.org/Peppermint_OS/PePack/raw/branch/master/ peppermint main contrib non-free +#deb-src http://codeberg.org/Peppermint_OS/PePack/raw/branch/master/ peppermint main contrib non-free diff --git a/peprepos/peppermint.list.chroot b/peprepos/peppermint.list.chroot new file mode 100644 index 000000000..f361547ce --- /dev/null +++ b/peprepos/peppermint.list.chroot @@ -0,0 +1,2 @@ +deb http://codeberg.org/Peppermint_OS/PePack/raw/branch/master/ peppermint main contrib non-free +deb-src http://codeberg.org/Peppermint_OS/PePack/raw/branch/master/ peppermint main contrib non-free