diff --git a/.gitignore b/.gitignore index ae5566b..808f462 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ /keys /.idea /.vscode -*.txt +/.zed diff --git a/hack/kernel/config.sh b/hack/kernel/config.sh index 5a381d3..ee09482 100755 --- a/hack/kernel/config.sh +++ b/hack/kernel/config.sh @@ -1,4 +1,4 @@ #!/bin/bash -export KERNEL_VERSION=6.12.21 +export KERNEL_VERSION=6.12.63 export KERNEL_CONFIG="feos-linux-${KERNEL_VERSION}.config" diff --git a/hack/kernel/config/feos-linux-6.12.21.config b/hack/kernel/config/feos-linux-6.12.63.config similarity index 99% rename from hack/kernel/config/feos-linux-6.12.21.config rename to hack/kernel/config/feos-linux-6.12.63.config index 7e69cd1..17266ad 100644 --- a/hack/kernel/config/feos-linux-6.12.21.config +++ b/hack/kernel/config/feos-linux-6.12.63.config @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.12.21 Kernel Configuration +# Linux/x86 6.12.63 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-14) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-14+deb12u1) 12.2.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=120200 CONFIG_CLANG_VERSION=0 @@ -11,14 +11,16 @@ CONFIG_AS_VERSION=24000 CONFIG_LD_IS_BFD=y CONFIG_LD_VERSION=24000 CONFIG_LLD_VERSION=0 -CONFIG_RUSTC_VERSION=108600 -CONFIG_RUSTC_LLVM_VERSION=190107 +CONFIG_RUSTC_VERSION=109200 +CONFIG_RUSTC_LLVM_VERSION=210103 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_GCC_ASM_GOTO_OUTPUT_BROKEN=y CONFIG_TOOLS_SUPPORT_RELR=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y +CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -464,6 +466,7 @@ CONFIG_HAVE_LIVEPATCH=y # end of Processor type and features CONFIG_CC_HAS_NAMED_AS=y +CONFIG_CC_HAS_NAMED_AS_FIXED_SANITIZERS=y CONFIG_USE_X86_SEG_SUPPORT=y CONFIG_CC_HAS_SLS=y CONFIG_CC_HAS_RETURN_THUNK=y @@ -497,6 +500,9 @@ CONFIG_MITIGATION_SPECTRE_V1=y CONFIG_MITIGATION_SPECTRE_V2=y CONFIG_MITIGATION_SRBDS=y CONFIG_MITIGATION_SSB=y +CONFIG_MITIGATION_ITS=y +CONFIG_MITIGATION_TSA=y +CONFIG_MITIGATION_VMSCAPE=y CONFIG_ARCH_HAS_ADD_PAGES=y # @@ -971,6 +977,7 @@ CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y CONFIG_PER_VMA_LOCK=y CONFIG_LOCK_MM_AND_FIND_VMA=y CONFIG_IOMMU_MM_DATA=y +CONFIG_EXECMEM=y CONFIG_NUMA_MEMBLKS=y # CONFIG_NUMA_EMU is not set @@ -1116,8 +1123,6 @@ CONFIG_ETHTOOL_NETLINK=y # # Device Drivers # -CONFIG_HAVE_EISA=y -# CONFIG_EISA is not set CONFIG_HAVE_PCI=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_PCI=y @@ -2858,6 +2863,7 @@ CONFIG_VHOST_MENU=y CONFIG_VHOST_NET=y # CONFIG_VHOST_VSOCK is not set # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set +CONFIG_VHOST_ENABLE_FORK_OWNER_CONTROL=y # # Microsoft Hyper-V guest support @@ -3548,7 +3554,6 @@ CONFIG_CRYPTO_HASH_INFO=y # # Accelerated Cryptographic Algorithms for CPU (x86) # -# CONFIG_CRYPTO_CURVE25519_X86 is not set # CONFIG_CRYPTO_AES_NI_INTEL is not set # CONFIG_CRYPTO_BLOWFISH_X86_64 is not set # CONFIG_CRYPTO_CAMELLIA_X86_64 is not set @@ -3568,13 +3573,11 @@ CONFIG_CRYPTO_HASH_INFO=y # CONFIG_CRYPTO_ARIA_AESNI_AVX_X86_64 is not set # CONFIG_CRYPTO_ARIA_AESNI_AVX2_X86_64 is not set # CONFIG_CRYPTO_ARIA_GFNI_AVX512_X86_64 is not set -# CONFIG_CRYPTO_CHACHA20_X86_64 is not set # CONFIG_CRYPTO_AEGIS128_AESNI_SSE2 is not set # CONFIG_CRYPTO_NHPOLY1305_SSE2 is not set # CONFIG_CRYPTO_NHPOLY1305_AVX2 is not set # CONFIG_CRYPTO_BLAKE2S_X86 is not set # CONFIG_CRYPTO_POLYVAL_CLMUL_NI is not set -# CONFIG_CRYPTO_POLY1305_X86_64 is not set # CONFIG_CRYPTO_SHA1_SSSE3 is not set # CONFIG_CRYPTO_SHA256_SSSE3 is not set # CONFIG_CRYPTO_SHA512_SSSE3 is not set diff --git a/hack/kernel/make.mk b/hack/kernel/make.mk index dd0100c..b875ef1 100644 --- a/hack/kernel/make.mk +++ b/hack/kernel/make.mk @@ -5,3 +5,6 @@ kernel: menuconfig: docker run -it --rm -u $${UID} -v "`pwd`:/feos" feos-builder bash -c "cd hack/kernel && ./mk-menuconfig" + +oldconfig: + docker run -it --rm -u $${UID} -v "`pwd`:/feos" feos-builder bash -c "cd hack/kernel && ./mk-oldconfig" diff --git a/hack/kernel/mk-oldconfig b/hack/kernel/mk-oldconfig new file mode 100755 index 0000000..dba54b0 --- /dev/null +++ b/hack/kernel/mk-oldconfig @@ -0,0 +1,29 @@ +#!/bin/bash + +set -e + +workingDir=$(mktemp -d) +thisDir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +function clean { + rm -rf $workingDir +} +trap clean EXIT + +source config.sh + +pushd $workingDir + +KERNEL_MAJOR_VERSION=$(echo $KERNEL_VERSION | cut -d"." -f1) +echo "Downloading Linux Kernel $KERNEL_VERSION" +wget -qO- --show-progress "https://cdn.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR_VERSION}.x/linux-${KERNEL_VERSION}.tar.xz" | + tar xJ +cp "$thisDir/config/$KERNEL_CONFIG" linux-${KERNEL_VERSION}/.config +pushd linux-${KERNEL_VERSION} +make oldconfig + +popd # linux src + +cp linux-${KERNEL_VERSION}/.config "$thisDir/config/$KERNEL_CONFIG" + +popd # working dir diff --git a/hack/uki/os-release.txt b/hack/uki/os-release.txt index 5ecbbee..3adde61 100644 --- a/hack/uki/os-release.txt +++ b/hack/uki/os-release.txt @@ -1,10 +1,10 @@ NAME="FeOS" -VERSION="0.1.0-6.1.62" +VERSION="0.5.0-6.12.63" ID=feos -PRETTY_NAME="FeOS v0.1.0-6.1.62" -VERSION_ID="0.1.0" -HOME_URL="https://www.github.com/maltej/feos" -SUPPORT_URL="https://www.github.com/maltej/feos" -BUG_REPORT_URL="https://www.github.com/maltej/feos" -PRIVACY_POLICY_URL="https://www.github.com/maltej/feos" -VERSION_CODENAME="0.1.0" +PRETTY_NAME="FeOS v0.5.0-6.12.63" +VERSION_ID="0.5.0" +HOME_URL="https://www.github.com/ironcore-dev/feos" +SUPPORT_URL="https://www.github.com/ironcore-dev/feos" +BUG_REPORT_URL="https://www.github.com/ironcore-dev/feos" +PRIVACY_POLICY_URL="https://www.github.com/ironcore-dev/feos" +VERSION_CODENAME="0.5.0"