Migrate 1st layer to debian 12

equetzal · Jul 21, 2023 · 9d09e4c · 9d09e4c
1 parent 39414d1
commit 9d09e4c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/base-system/bootloader/legacy/huronos.cfg b/base-system/bootloader/legacy/huronos.cfg
@@ -27,20 +27,20 @@ MENU AUTOBOOT [Esc] -> options, Booting in # second{,s}
 default persistent
 LABEL persistent
 MENU LABEL ^Start contest system
-KERNEL /boot/vmlinuz-6.0.15-huronos+
+KERNEL /boot/vmlinuz-6.1.31-huronos+
 APPEND vga=normal acpi=force initrd=/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 quiet loglevel=3 huronos.flags=(system.uuid=UUID;event.uuid=UUID;contest.uuid=UUID;persistence=true)
 
 #LABEL fresh
 #MENU LABEL ^Start restore mode
-#KERNEL /boot/vmlinuz-6.0.15-huronos+
+#KERNEL /boot/vmlinuz-6.1.31-huronos+
 #APPEND vga=normal acpi=force initrd=/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 quiet loglevel=3 huronos.flags=(system.uuid=UUID;event.uuid=UUID;contest.uuid=UUID;persistence=false)
 
 LABEL nosync
 MENU LABEL ^Start no-sync mode
-KERNEL /boot/vmlinuz-6.0.15-huronos+
+KERNEL /boot/vmlinuz-6.1.31-huronos+
 APPEND vga=normal acpi=force initrd=/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 consoleblank=0 quiet loglevel=3 huronos.flags=(system.uuid=UUID;event.uuid=UUID;contest.uuid=UUID;persistence=true;demo=true)
 
 LABEL debug
 MENU LABEL ^Debug huronOS
-KERNEL /boot/vmlinuz-6.0.15-huronos+
+KERNEL /boot/vmlinuz-6.1.31-huronos+
 APPEND vga=normal acpi=force initrd=/boot/initrfs.img load_ramdisk=1 prompt_ramdisk=0 rw printk.time=0 apparmor=0 debug loglevel=7 huronos.flags=(system.uuid=UUID;event.uuid=UUID;contest.uuid=UUID;persistence=true;debug=true)
diff --git a/base-system/bootloader/vmlinuz-5.10.103-huronos b/base-system/bootloader/vmlinuz-5.10.103-huronos
diff --git a/base-system/bootloader/vmlinuz-6.0.15-huronos+ b/base-system/bootloader/vmlinuz-6.0.15-huronos+
diff --git a/base-system/bootloader/vmlinuz-6.1.31-huronos+ b/base-system/bootloader/vmlinuz-6.1.31-huronos+
diff --git a/base-system/config b/base-system/config
@@ -5,8 +5,8 @@ export PATH=.:./tools:../tools:/usr/sbin:/usr/bin:/sbin:/bin:/
 export LIVEKITNAME="huronOS"
 export BUILD_YEAR="2023"
 export BUILD_VERSION="0028"
-export VMLINUZ=/boot/vmlinuz-6.0.15-huronos+
-export KERNEL="6.0.15-huronos+"
+export VMLINUZ=/boot/vmlinuz-6.1.31-huronos+
+export KERNEL="6.1.31-huronos+"
 export MKMOD="bin etc home lib lib64 opt root sbin srv usr var"
 export NETWORK=false
 export HBT_LAB="/tmp/huronOS-build-lab-$$"

diff --git a/base-system/deps-dev.txt b/base-system/deps-dev.txt
@@ -1,7 +1,7 @@
 gddrescue
 genisoimage
 gpart
-netcat
+netcat-openbsd
 smartmontools
 unzip
-zip
+zip
diff --git a/base-system/usrroot/etc/apt/sources.list b/base-system/usrroot/etc/apt/sources.list
@@ -1,6 +1,6 @@
-deb http://deb.debian.org/debian/ bullseye main contrib non-free
-deb-src http://deb.debian.org/debian/ bullseye main contrib non-free
-deb http://security.debian.org/debian-security bullseye-security main contrib non-free
-deb-src http://security.debian.org/debian-security bullseye-security main contrib non-free
-deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free
-deb-src http://deb.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://deb.debian.org/debian/ bookworm main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian/ bookworm main contrib non-free non-free-firmware
+deb http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
+deb-src http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
+deb http://deb.debian.org/debian/ bookworm-updates main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian/ bookworm-updates main contrib non-free non-free-firmware