From a52e021f192780dd8253b439eab01ff330c323b2 Mon Sep 17 00:00:00 2001 From: Manuel Date: Mon, 3 Apr 2023 18:59:20 +0000 Subject: [PATCH] update build scripts and files --- PepDeb32/pepbld.sh | 22 +++++---- PepDeb32/pephooks | 1 + PepDeb64/pepbld.sh | 23 +++++---- PepDeb64/pephooks | 1 + PepDeb_arm64/pepbld.sh | 20 ++++---- PepDeb_arm64/pephooks | 1 + PepDev32/pepbld.sh | 42 ++++++++-------- PepDev32/pephooks | 1 + PepDev64/pepbld.sh | 42 ++++++++-------- PepDev64/pephooks | 1 + PepDev_arm64/pepbld.sh | 46 +++++++++--------- PepDev_arm64/pephooks | 1 + .../normal/0950-final-cleanup-hook.binary | 9 ++++ pepinstaller/preseed/preseed.cfg | 17 +++++-- peprepo/peppermint-keyring.key.chroot | Bin 2308 -> 0 bytes peprepo/peppermint.list.binary | 4 +- peprepo/peppermint.list.chroot | 9 ---- 17 files changed, 136 insertions(+), 104 deletions(-) create mode 120000 PepDeb32/pephooks create mode 120000 PepDeb64/pephooks create mode 120000 PepDeb_arm64/pephooks create mode 120000 PepDev32/pephooks create mode 120000 PepDev64/pephooks create mode 120000 PepDev_arm64/pephooks create mode 100755 pephooks/normal/0950-final-cleanup-hook.binary delete mode 100644 peprepo/peppermint-keyring.key.chroot delete mode 100644 peprepo/peppermint.list.chroot diff --git a/PepDeb32/pepbld.sh b/PepDeb32/pepbld.sh index 734e906..2bf605d 100755 --- a/PepDeb32/pepbld.sh +++ b/PepDeb32/pepbld.sh @@ -1,10 +1,13 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + 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 @@ -18,17 +21,16 @@ lb config noauto \ --binary-images iso-hybrid \ --architectures i386 \ --linux-flavours 686 \ - --distribution bullseye \ - --archive-areas "main contrib non-free" \ - --firmware-binary true \ - --firmware-chroot true \ + --distribution bookworm \ + --archive-areas "main contrib non-free non-free-firmware" \ + --firmware-chroot false \ --debian-installer netinst \ - --debian-installer-distribution bullseye \ + --debian-installer-distribution bookworm \ --debian-installer-gui true \ - --uefi-secure-boot enable \ + --parent-mirror-debian-installer http://repo.peppermintos.com/packages \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ --iso-publisher "Peppermint OS Team" \ - --iso-volume "PepOS-mini-iso" \ + --iso-volume "PeppermintOS" \ --image-name "PepOS-mini-iso" \ --checksums sha512 \ --zsync false \ @@ -38,15 +40,15 @@ lb config noauto \ "${@}" # Setup the installer structure -mkdir -p $uchinanchu/fusato/config/archives mkdir -p $uchinanchu/fusato/config/includes.installer mkdir -p $uchinanchu/fusato/config/includes.binary mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share +mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer -cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDeb32/pephooks b/PepDeb32/pephooks new file mode 120000 index 0000000..7d0d615 --- /dev/null +++ b/PepDeb32/pephooks @@ -0,0 +1 @@ +../pephooks \ No newline at end of file diff --git a/PepDeb64/pepbld.sh b/PepDeb64/pepbld.sh index 30215a6..cefbc86 100755 --- a/PepDeb64/pepbld.sh +++ b/PepDeb64/pepbld.sh @@ -1,10 +1,13 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + 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 @@ -18,16 +21,16 @@ lb config noauto \ --binary-images iso-hybrid \ --architectures amd64 \ --linux-flavours amd64 \ - --distribution bullseye \ - --archive-areas "main contrib non-free" \ - --firmware-binary true \ - --firmware-chroot true \ + --distribution bookworm \ + --archive-areas "main contrib non-free non-free-firmware" \ + --firmware-chroot false \ --debian-installer netinst \ - --debian-installer-distribution bullseye \ + --debian-installer-distribution bookworm \ --debian-installer-gui true \ + --parent-mirror-debian-installer http://repo.peppermintos.com/packages \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ --iso-publisher "Peppermint OS Team" \ - --iso-volume "PepOS-mini-iso" \ + --iso-volume "PeppermintOS" \ --image-name "PepOS-mini-iso" \ --checksums sha512 \ --zsync false \ @@ -36,17 +39,17 @@ lb config noauto \ "${@}" - # Setup the installer structure -mkdir -p $uchinanchu/fusato/config/archives mkdir -p $uchinanchu/fusato/config/includes.installer mkdir -p $uchinanchu/fusato/config/includes.binary mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share +mkdir -p $uchinanchu/fusato/config/hooks/normal + #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer -cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDeb64/pephooks b/PepDeb64/pephooks new file mode 120000 index 0000000..7d0d615 --- /dev/null +++ b/PepDeb64/pephooks @@ -0,0 +1 @@ +../pephooks \ No newline at end of file diff --git a/PepDeb_arm64/pepbld.sh b/PepDeb_arm64/pepbld.sh index 48cf7c1..fcfc86f 100755 --- a/PepDeb_arm64/pepbld.sh +++ b/PepDeb_arm64/pepbld.sh @@ -1,4 +1,8 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable @@ -13,24 +17,22 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done # Defines Live Build settings - lb config noauto \ --binary-images iso-hybrid \ --architectures arm64 \ - --linux-flavours arm64 \ --distribution bullseye \ - --archive-areas "main contrib non-free" \ - --firmware-binary true \ - --firmware-chroot true \ + --archive-areas "main contrib non-free non-free-firmware" \ + --firmware-chroot false \ --debian-installer netinst \ - --debian-installer-distribution bullseye \ + --debian-installer-distribution bookworm \ --debian-installer-gui true \ + --parent-mirror-debian-installer http://repo.peppermintos.com/packages \ --bootstrap-qemu-arch arm64 \ --bootloaders grub-efi \ --bootstrap-qemu-static /usr/sbin/qemu-debootstrap \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ --iso-publisher "Peppermint OS Team" \ - --iso-volume "PepOS-mini-iso" \ + --iso-volume "PeppermintOS" \ --image-name "PepOS-mini-iso" \ --checksums sha512 \ --zsync false \ @@ -40,15 +42,15 @@ lb config noauto \ "${@}" # Setup the installer structure -mkdir -p $uchinanchu/fusato/config/archives mkdir -p $uchinanchu/fusato/config/includes.installer mkdir -p $uchinanchu/fusato/config/includes.binary mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share +mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer -cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDeb_arm64/pephooks b/PepDeb_arm64/pephooks new file mode 120000 index 0000000..7d0d615 --- /dev/null +++ b/PepDeb_arm64/pephooks @@ -0,0 +1 @@ +../pephooks \ No newline at end of file diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh index 509233e..007da40 100755 --- a/PepDev32/pepbld.sh +++ b/PepDev32/pepbld.sh @@ -1,4 +1,8 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable @@ -13,32 +17,32 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done # Defines Live Build settings - lb config noauto \ --binary-images iso-hybrid \ --architectures i386 \ - --linux-flavours 686 \ - --distribution chimaera \ + --distribution daedalus \ --initsystem sysvinit \ - --archive-areas "main contrib non-free" \ - --mirror-bootstrap http://pkgmaster.devuan.org/merged \ - --parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \ - --parent-mirror-chroot http://pkgmaster.devuan.org/merged \ - --parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \ - --parent-mirror-binary http://pkgmaster.devuan.org/merged \ - --parent-mirror-binary-security http://pkgmaster.devuan.org/merged \ - --mirror-chroot http://pkgmaster.devuan.org/merged \ - --mirror-chroot-security http://pkgmaster.devuan.org/merged \ - --parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \ + --archive-areas "main contrib non-free non-free-firmware" \ + --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 \ + --security false \ + --updates false \ + --backports false \ --uefi-secure-boot enable \ - --firmware-binary true \ - --firmware-chroot true \ + --firmware-chroot false \ --debian-installer netinst \ - --debian-installer-distribution chimaera \ + --debian-installer-distribution daedalus \ --debian-installer-gui true \ + --parent-mirror-debian-installer http://repo.peppermintos.com/packages \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ --iso-publisher "Peppermint OS Team" \ - --iso-volume "PepOS-mini-iso" \ + --iso-volume "PeppermintOS" \ --image-name "PepOS-mini-iso" \ --checksums sha512 \ --zsync false \ @@ -48,15 +52,15 @@ lb config noauto \ "${@}" # Setup the installer structure -mkdir -p $uchinanchu/fusato/config/archives mkdir -p $uchinanchu/fusato/config/includes.installer mkdir -p $uchinanchu/fusato/config/includes.binary mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share +mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer -cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev32/pephooks b/PepDev32/pephooks new file mode 120000 index 0000000..7d0d615 --- /dev/null +++ b/PepDev32/pephooks @@ -0,0 +1 @@ +../pephooks \ No newline at end of file diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh index a32fad9..cbc7112 100755 --- a/PepDev64/pepbld.sh +++ b/PepDev64/pepbld.sh @@ -1,4 +1,8 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable @@ -13,31 +17,31 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done # Defines Live Build settings - lb config noauto \ --binary-images iso-hybrid \ --architectures amd64 \ - --linux-flavours amd64 \ - --distribution chimaera \ + --distribution daedalus \ --initsystem sysvinit \ - --archive-areas "main contrib non-free" \ - --mirror-bootstrap http://pkgmaster.devuan.org/merged \ - --parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \ - --parent-mirror-chroot http://pkgmaster.devuan.org/merged \ - --parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \ - --parent-mirror-binary http://pkgmaster.devuan.org/merged \ - --parent-mirror-binary-security http://pkgmaster.devuan.org/merged \ - --mirror-chroot http://pkgmaster.devuan.org/merged \ - --mirror-chroot-security http://pkgmaster.devuan.org/merged \ - --parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \ - --firmware-binary true \ - --firmware-chroot true \ + --archive-areas "main contrib non-free non-free-firmware" \ + --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 \ + --security false \ + --updates false \ + --backports false \ + --firmware-chroot false \ --debian-installer netinst \ - --debian-installer-distribution chimaera \ + --debian-installer-distribution daedalus \ --debian-installer-gui true \ + --parent-mirror-debian-installer http://repo.peppermintos.com/packages \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ --iso-publisher "Peppermint OS Team" \ - --iso-volume "PepOS-mini-iso" \ + --iso-volume "Peppermint" \ --image-name "PepOS-mini-iso" \ --checksums sha512 \ --zsync false \ @@ -49,15 +53,15 @@ lb config noauto \ "${@}" # Setup the installer structure -mkdir -p $uchinanchu/fusato/config/archives mkdir -p $uchinanchu/fusato/config/includes.installer mkdir -p $uchinanchu/fusato/config/includes.binary mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share +mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer -cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev64/pephooks b/PepDev64/pephooks new file mode 120000 index 0000000..7d0d615 --- /dev/null +++ b/PepDev64/pephooks @@ -0,0 +1 @@ +../pephooks \ No newline at end of file diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh index 83aadcc..fb139ad 100755 --- a/PepDev_arm64/pepbld.sh +++ b/PepDev_arm64/pepbld.sh @@ -1,4 +1,8 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable @@ -13,55 +17,53 @@ for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done # Defines Live Build settings - lb config noauto \ --binary-images iso-hybrid \ --architectures arm64 \ - --linux-flavours arm64 \ - --distribution chimaera \ + --distribution daedalus \ --initsystem sysvinit \ - --archive-areas "main contrib non-free" \ - --mirror-bootstrap http://pkgmaster.devuan.org/merged \ - --parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \ - --parent-mirror-chroot http://pkgmaster.devuan.org/merged \ - --parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \ - --parent-mirror-binary http://pkgmaster.devuan.org/merged \ - --parent-mirror-binary-security http://pkgmaster.devuan.org/merged \ - --mirror-chroot http://pkgmaster.devuan.org/merged \ - --mirror-chroot-security http://pkgmaster.devuan.org/merged \ - --parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \ + --archive-areas "main contrib non-free non-free-firmware" \ + --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 \ + --security false \ + --updates false \ + --backports false \ --uefi-secure-boot enable \ - --firmware-binary true \ - --firmware-chroot true \ + --firmware-chroot false \ --debian-installer netinst \ - --debian-installer-distribution chimaera \ + --debian-installer-distribution daedalus \ --debian-installer-gui true \ + --parent-mirror-debian-installer http://repo.peppermintos.com/packages \ --bootstrap-qemu-arch arm64 \ --bootloaders grub-efi \ --bootstrap-qemu-static /usr/sbin/qemu-debootstrap \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ --iso-publisher "Peppermint OS Team" \ - --iso-volume "PepOS-mini-iso" \ + --iso-volume "PeppermintOS" \ --image-name "PepOS-mini-iso" \ --checksums sha512 \ --zsync false \ --win32-loader false \ --debian-installer-preseedfile preseed.cfg \ - --security true \ - --updates true \ - --backports true \ + "${@}" # Setup the installer structure -mkdir -p $uchinanchu/fusato/config/archives mkdir -p $uchinanchu/fusato/config/includes.installer mkdir -p $uchinanchu/fusato/config/includes.binary mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share +mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer -cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal # Copy recursive files and sub-directories, containing symlinks. cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev_arm64/pephooks b/PepDev_arm64/pephooks new file mode 120000 index 0000000..7d0d615 --- /dev/null +++ b/PepDev_arm64/pephooks @@ -0,0 +1 @@ +../pephooks \ No newline at end of file diff --git a/pephooks/normal/0950-final-cleanup-hook.binary b/pephooks/normal/0950-final-cleanup-hook.binary new file mode 100755 index 0000000..324b352 --- /dev/null +++ b/pephooks/normal/0950-final-cleanup-hook.binary @@ -0,0 +1,9 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + +## This script will remove unnecessary files and folders and reduce the size of the iso. +# Remove live folder from binary. + +rm -r live diff --git a/pepinstaller/preseed/preseed.cfg b/pepinstaller/preseed/preseed.cfg index e0a2a44..0e8d464 100644 --- a/pepinstaller/preseed/preseed.cfg +++ b/pepinstaller/preseed/preseed.cfg @@ -1,12 +1,16 @@ -# Debian Installer preconfiguration file -# to install Debian with custom repositories +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppermintOS Team (peppermintosteam@proton.me) + +# This preseed file includes configuration settings for a custom repository, +# as well as enabling the "contrib" and "non-free" components. Additionally, +# automatic responses to the Debian popularity contest are disabled # Add your custom repositories d-i apt-setup/local0/repository string \ - http://repo.peppermintos.com/packages peptesting main contrib non-free + http://repo.peppermintos.com/packages bookworm main contrib non-free non-free-firmware d-i apt-setup/local0/comment string PeppermintOS repository d-i apt-setup/local0/source boolean true -d-i apt-setup/local0/source boolean true # URL to the public key of the local repository d-i apt-setup/local0/key string http://repo.peppermintos.com/packages/conf/peppermint-keyring.gpg @@ -15,6 +19,11 @@ d-i apt-setup/local0/key string http://repo.peppermintos.com/packages/conf/peppe d-i apt-setup/non-free boolean true d-i apt-setup/contrib boolean true +# Select which update services to use; define the mirrors to be used. +# Values shown below are the normal defaults. +d-i apt-setup/services-select multiselect security, updates +d-i apt-setup/security_host string security.debian.org + # Remove popularity-contest popularity-contest popularity-contest/participate boolean false diff --git a/peprepo/peppermint-keyring.key.chroot b/peprepo/peppermint-keyring.key.chroot deleted file mode 100644 index 87f923f4aadcef825cb080c796ab551a5cf1d06e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2308 zcmV+f3H$b$0u2OW@2QIc5CGGssak8z2?G<@@`c=#O1CxTp;Il=H#MecA_r!U*2!&} z_x7}9&H<;vwZmCPPOF@4#bVh?FN{INbSbGfM878B^Z^E{%=SA!!J1Z=?{Y@AcJ4h5 zI>>B{&!7#uSa9kK$d^`pUpqw>8yjn_+txn-{$IIMPVCNr%aivp;P;Ca-l@JT*+T;q zeC}arkH*O8ZtBtQ?VX=*HI*+;dprp??HWp*J`Q*S%PXenVW>{o>snNJi5vN<6#Hfm zpl{!iI=zn_Acc;E6>*z%2xdkHGCvbus#G|zl*ls@H@4tTdG*pU;9CVGM_IOM&IK{= zkX`UrHDgo4XAx!24|0<>NX%cueY#i*fkE>}o#8?NqD0-l5Z18d!%=YgDdgJVI-1k) zUX@lyHQbUeN=$wmvFpe$p7k(4F@`u}WE}zw>_qvVga8!-9Bo5_SNidb^rav{{2Pc_ zHuv>N%;414`IL2B#1JFAGnnGAk^71x!A&Qamn)8owdGDlB&yu9(o6api)^m9l$@9S zu<^I9`#;-@$K{^iuLS3Lqv=tXtf9RQetJdM&O)QXLkLZU(~mG_a{cbD;x$Hfhgi?_ zsk~g^JW0-K<4U$kVNvP_R}S&mgUAU)ZL8;~MJZD>+tBYv)@aMSrW_HmUh_gCJt60I ziYVq{N#x~F+_?Y|0RRECSWRJWb!BWIW@U12VQyq^AY@@6b7^dLVIXpEb73GTM{s8# zYh`&LW^ZyJP-Sp%WpZt4Zge1QX>N6RDIh#;VQzJ0Y;$RBc42aFb74SdZDDC_E@N+P zK8XTO1QP)Y05}#Q1W~JU$a3A5i76DJcx>kK6V=<=r3C_F@2QId8v_Lk2?z%Q1{Dek z2nzxP76JnS0v-VZ7k~f?2@q`N@)OnD+NDP=5C3DE>eRW@hg0mdjf@m&Ep+}Y#XShg zzRyTSVLEZ%yiw#VHbOrIgnbe@fwW8gWL7atPrZwmbI0oSM@VB-vN@XDe5EvadMBRC zBJ+d(F`qpNCQ^+P(6rD1Nd65;Tn*buaH@8lb>(x@oRiOqy~Xq%LWX&f4G2L9v;SV95JbI1Ml8`UU=1GuaTv~#O~hxd6=h* z8_&%CzYRs%BUG=?vSq?AlTL zBE=90pp8eQaduqrs&HV@dBqXyP(LpWC7R&wiLje-(HS*~pwnEJ30;i$zh~>b+vQcQSdU^k-ip#}5lI zRD3m%57Lc7DDUMpNZ04QjlZvOvH+)djWV>q#k#Dj!mlOCSKgck`+K>5Yz+o*F@JV2-)!l4GS{~7FrYBVCJ(h^3}=-x*t(YLo_6t;t;x@}HIUmQcq(QzV{ywVT1!h*m8rwJe{w?Ry2^4~7AvFyv7L9+P-NB@#PsmWe48 zp?GZO@)OnD+NA{oV(+Po0vikf3JDNw=JFHO+uEi47Z3hFHg0Jul_nR?)2>c`FOn&_ zM;D0C1EkGAmuhqT=&08GataM7QenE%6YPb0E|@?oI1-VdVpgR60^vRJ8n?C|WiTef zeW0c~X7-Tb>)#=j_wXbY$KbE(jO)}~^>k8C>z@hn_3=Fbn;GHJ@Y!y~a*~fWe^TPo z!Izg0%0+b=Yyu^k_q3y$rjvUVD(8-ViokwI!8nBP=~`~=UQ(v3Z_)a56di}$%IXrt z-rG;BX7@!4C$!BnjcwKDrrl}tFXWykH`-_>jj}L054xkLF+=l3RPC7A456qU;-wBp z?K9qrPc$&>au*plL`!VE_`H4ytDh2A@1HVt(|U$txq2AqXddP2BH=JemtR%=g=d{t z9%jqZW_)a4-%Wj^!`}wsZxGFPfZ6~?2ROouYi{L~vZu4@`t$xsj-sXP|DWE%8TzI- z+#QvpaDG}-!5*4}rzlDFXilB6Y}8YGESZy(neUzE3n+kt!)i!$(#mQPH1m#kkd{HA zmjQjT`c`6pV!*n}kPiw1=TB)6hC~UW&kwowO8$5lrF diff --git a/peprepo/peppermint.list.binary b/peprepo/peppermint.list.binary index 8edb20a..4968a16 100644 --- a/peprepo/peppermint.list.binary +++ b/peprepo/peppermint.list.binary @@ -3,7 +3,7 @@ #deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free #Testing repos -deb http://repo.peppermintos.com/packages peptesting main contrib non-free -#deb-src http://repo.peppermintos.com/packages peptesting main contrib non-free +deb http://repo.peppermintos.com/packages bookworm main contrib non-free +#deb-src http://repo.peppermintos.com/packages bookworm main contrib non-free diff --git a/peprepo/peppermint.list.chroot b/peprepo/peppermint.list.chroot deleted file mode 100644 index 8edb20a..0000000 --- a/peprepo/peppermint.list.chroot +++ /dev/null @@ -1,9 +0,0 @@ -#Main repos -#deb http://repo.peppermintos.com/packages peppermint main contrib non-free -#deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free - -#Testing repos -deb http://repo.peppermintos.com/packages peptesting main contrib non-free -#deb-src http://repo.peppermintos.com/packages peptesting main contrib non-free - -