Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Kernel] Updating to 6.1.31 #114

Draft
wants to merge 1 commit into
base: development
Choose a base branch
from
Draft

[Kernel] Updating to 6.1.31 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions base-system/bootloader/legacy/huronos.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Binary file removed base-system/bootloader/vmlinuz-5.10.103-huronos
View file
Open in desktop
Binary file not shown.
Binary file removed base-system/bootloader/vmlinuz-6.0.15-huronos+
View file
Open in desktop
Binary file not shown.
Binary file added base-system/bootloader/vmlinuz-6.1.31-huronos+
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion base-system/config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export LIVEKITNAME="huronOS"
export BUILD_YEAR="2024"
export BUILD_VERSION="0032"
export VMLINUZ=/boot/vmlinuz-6.0.15-huronos+
export KERNEL="6.0.15-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-$$"
Expand Down
22 changes: 11 additions & 11 deletions builder-scripts/kernel/build-kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,23 @@
# Enya Quetzalli <[email protected]>

# Set basic kernel data
set -e
set -xe
export HTOOLS_KERNEL_DIR="$(pwd)"
export KERNEL_VERSION=6.0.15
export KERNEL_VERSION=6.1.31
export AUFS_REPOSITORY=aufs-standalone
export AUFS_BRANCH=aufs6.0
export AUFS_BRANCH=aufs6.1
export AUFS_TOOLS_REPOSITORY=aufs-util
export AUFS_TOOLS_BRANCH=aufs6.0
export PACKAGES="asciidoctor autoconf automake autopoint autotools-dev bc binutils binutils-common binutils-x86-64-linux-gnu bison bsdextrautils build-essential bzip2 ca-certificates cpp cpp-10 debhelper dh-autoreconf dh-exec dh-python dh-strip-nondeterminism diffstat docutils-common dpkg-dev dvipng dwarves dwz ed file flex fontconfig fontconfig-config fonts-dejavu-core fonts-font-awesome fonts-lato fonts-lmodern fonts-urw-base35 g++ g++-10 gcc gcc-10 gcc-10-multilib gcc-multilib gettext ghostscript git graphviz groff-base intltool-debian kernel-wedge lib32asan6 lib32atomic1 lib32gcc-10-dev lib32gcc-s1 lib32gomp1 lib32itm1 lib32quadmath0 lib32stdc++6 lib32ubsan1 libann0 libapache-pom-java libarchive-zip-perl libasan6 libatomic1 libaudit-dev libavahi-client3 libavahi-common-data libavahi-common3 libbabeltrace-dev libbabeltrace1 libbinutils libblkid-dev libc-dev-bin libc6-dev libc6-dev-i386 libc6-dev-x32 libc6-i386 libc6-x32 libcairo2 libcap-dev libcap-ng-dev libcc1-0 libcdt5 libcgraph6 libcommons-logging-java libcommons-parent-java libcrypt-dev libctf-nobfd0 libctf0 libcups2 libdatrie1 libdbus-1-3 libdebhelper-perl libdeflate0 libdpkg-perl libdw-dev libdw1 libelf-dev libexpat1-dev libffi-dev libfile-stripnondeterminism-perl libfontbox-java libfontconfig1 libfribidi0 libgcc-10-dev libgd3 libglib2.0-0 libglib2.0-bin libglib2.0-data libglib2.0-dev libglib2.0-dev-bin libgomp1 libgraphite2-3 libgs9 libgs9-common libgts-0.7-5 libgvc6 libgvpr2 libharfbuzz0b libiberty-dev libice6 libicu67 libidn11 libijs-0.35 libisl23 libitm1 libjbig0 libjbig2dec0 libjpeg62-turbo libjs-jquery libjs-sphinxdoc libjs-underscore libkpathsea6 liblab-gamut1 liblcms2-2 liblsan0 libltdl7 liblzma-dev libmagic-mgc libmagic1 libmount-dev libmpc3 libmpdec3 libmpfr6 libncurses5-dev libncursesw5-dev libnewt-dev libnsl-dev libnuma-dev libnuma1 libopencsd-dev libopencsd0 libopenjp2-7 libpango-1.0-0 libpangocairo-1.0-0 libpangoft2-1.0-0 libpaper-utils libpaper1 libpathplan4 libpci-dev libpcre16-3 libpcre2-16-0 libpcre2-32-0 libpcre2-dev libpcre2-posix2 libpcre3-dev libpcre32-3 libpcrecpp0v5 libpdfbox-java libperl-dev libpipeline1 libpixman-1-0 libpng-dev libptexenc1 libpython3-dev libpython3-stdlib libpython3.9 libpython3.9-dev libpython3.9-minimal libpython3.9-stdlib libquadmath0 libruby2.7 libselinux1-dev libsepol1-dev libsigsegv2 libslang2-dev libsm6 libsqlite3-0 libssl-dev libstdc++-10-dev libsub-override-perl libsynctex2 libteckit0 libtexlua53 libtexluajit2 libthai-data libthai0 libtiff5 libtirpc-dev libtool libtsan0 libubsan1 libuchardet0 libudev-dev libunwind-dev libunwind8 libwebp6 libwrap0 libwrap0-dev libx11-6 libx11-data libx32asan6 libx32atomic1 libx32gcc-10-dev libx32gcc-s1 libx32gomp1 libx32itm1 libx32quadmath0 libx32stdc++6 libx32ubsan1 libxau6 libxaw7 libxcb-render0 libxcb-shm0 libxcb1 libxdmcp6 libxext6 libxi6 libxml2 libxmu6 libxpm4 libxrender1 libxt6 libyaml-0-2 libzzip-0-13 linux-libc-dev lz4 m4 make man-db media-types openssl patch patchutils pkg-config po-debconf poppler-data preview-latex-style python-babel-localedata python3 python3-alabaster python3-babel python3-certifi python3-chardet python3-dev python3-distutils python3-docutils python3-idna python3-imagesize python3-jinja2 python3-lib2to3 python3-markupsafe python3-minimal python3-packaging python3-pkg-resources python3-pygments python3-pyparsing python3-requests python3-roman python3-six python3-snowballstemmer python3-sphinx python3-sphinx-rtd-theme python3-tz python3-urllib3 python3.9 python3.9-dev python3.9-minimal quilt rake rsync ruby ruby-asciidoctor ruby-minitest ruby-net-telnet ruby-power-assert ruby-rubygems ruby-test-unit ruby-xmlrpc ruby2.7 rubygems-integration sgml-base sphinx-common sphinx-rtd-theme-common t1utils tex-common texlive-base texlive-binaries texlive-latex-base texlive-latex-extra texlive-latex-recommended texlive-pictures uuid-dev x11-common xdg-utils xml-core xz-utils zlib1g-dev"
export PACKAGES=""
# Get the dependencies and replace every new line with a space
mapfile -t PACKAGES <dependencies.txt

download_kernel() {
cp -ar $HTOOLS_KERNEL_DIR/sources.list /etc/apt/sources.list
apt update

# Preinstall all the required software to compile the kernel
apt install --yes --no-install-recommends $PACKAGES
apt install --yes --no-install-recommends "${PACKAGES[@]}"

# Download Linux kernel, AUFS standalone patches and AUFS tools
git clone --depth 1 --branch v$KERNEL_VERSION https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git || true
Expand Down Expand Up @@ -156,7 +158,7 @@ clean_other_kernels() {
}

delete_packages() {
apt remove --yes $PACKAGES
apt remove --yes "${PACKAGES[@]}"
apt autoremove --purge --yes
apt clean --yes
}
Expand All @@ -171,15 +173,15 @@ main() {
exit
fi

mkdir -p ./kernel-stuff/
pushd ./kernel-stuff/

if [ "$1" = "--build" ]; then
mkdir -p ./kernel-stuff/
pushd ./kernel-stuff/
download_kernel
patch_kernel
configure_kernel
compile_kernel
save_kernel
popd
elif [ "$1" = "--clean-kernel" ]; then
clean_other_kernels
elif [ "$1" = "--clean-packages" ]; then
Expand All @@ -189,8 +191,6 @@ main() {
else
printf '%s\n%s' "No option selected, run:" "build-kernel.sh [--build | --clean-kernel | --clean-packages | --restore-kernel TAR_FILE]"
fi

popd
}

main "$@"
Loading