Added contrib kernel from SiFuh, workarounds for libatomic and defaults.vim, enabled LPSS and EXFAT support in kernel configs
This commit is contained in:
parent
614c77fb70
commit
48192014d6
6
Makefile
6
Makefile
@ -317,6 +317,8 @@ rootfs: kernel busybox
|
||||
@cd $(ROOTFS_DIR)/etc && rm -rf cron resolv.conf lilo.conf sysctl.conf pkgadd.conf pkgmk.conf securetty
|
||||
@cd $(ROOTFS_DIR)/etc/rc.d && find . -type f ! -name "sshd" -exec rm -f '{}' \;
|
||||
@rm $(ROOTFS_DIR)/lib/modules/$(KERNEL_VERSION)/build
|
||||
@# work around core/usbutils wanting to link against libatomic from gcc
|
||||
@bsdtar -C $(ROOTFS_DIR) -xpf $(PORTS_DIR)/core/gcc/gcc\#*.$(PKG_EXT) usr/lib/libatomic.so*
|
||||
@echo "- Creating symlinks"
|
||||
@ln -sf /tmp/var $(ROOTFS_DIR)/var
|
||||
@ln -sf /proc/mounts $(ROOTFS_DIR)/etc/mtab
|
||||
@ -393,13 +395,15 @@ image-base: check-root kernel initramfs rootfs setup.dependencies iso/efiboot.im
|
||||
@mkdir -p $(IMG_ROOT_DIR)/crux
|
||||
@cp doc/handbook/handbook.txt doc/handbook/releasenotes.txt $(IMG_ROOT_DIR)/crux
|
||||
@cp iso/setup.dependencies $(IMG_ROOT_DIR)/crux
|
||||
@mkdir -p $(IMG_ROOT_DIR)/crux/kernel
|
||||
@mkdir -p $(IMG_ROOT_DIR)/crux/kernel/contrib
|
||||
@cp kernel/linux-$(KERNEL_VERSION).tar.xz $(IMG_ROOT_DIR)/crux/kernel
|
||||
@cp kernel/linux-$(KERNEL_VERSION).config $(IMG_ROOT_DIR)/crux/kernel
|
||||
@cp kernel/linux-$(KERNEL_VERSION).defconfig $(IMG_ROOT_DIR)/crux/kernel
|
||||
@for FILE in $(KERNEL_PATCHES); do \
|
||||
cp kernel/$$FILE $(IMG_ROOT_DIR)/crux/kernel; \
|
||||
done
|
||||
@(cd $(IMG_ROOT_DIR)/crux/kernel/contrib && curl -LO \
|
||||
https://gitlab.com/SiFuh/Documentation/-/raw/master/config-5.15.55-modular)
|
||||
@for COLL in $(COLLECTIONS); do \
|
||||
mkdir -p $(IMG_ROOT_DIR)/crux/$$COLL; \
|
||||
cp $(PORTS_DIR)/$$COLL/*/*.$(PKG_EXT) $(IMG_ROOT_DIR)/crux/$$COLL; \
|
||||
|
||||
4
hacks.sh
4
hacks.sh
@ -5,3 +5,7 @@ set -ex
|
||||
# gnu-efi parallel build breakage
|
||||
sed -i -e '15s/make/make -j1/' ports/opt/gnu-efi/Pkgfile
|
||||
rm -f ports/opt/gnu-efi/.signature
|
||||
|
||||
# ppp parallel build breakage
|
||||
sed -i -e 's/make/make -j1/g' ports/opt/ppp/Pkgfile
|
||||
rm -f ports/opt/ppp/.signature
|
||||
|
||||
@ -102,7 +102,7 @@ find_and_mount_media() {
|
||||
echo -e " ${BOLD}${BLUE}*${NORM} Populating root filesystem..."
|
||||
mkdir -p /newroot
|
||||
echo -e -n " ${BOLD}${BLUE}*${NORM} Mounting new root filesystem... "
|
||||
mount -t tmpfs tmpfs /newroot -o size=1052m
|
||||
mount -t tmpfs tmpfs /newroot -o size=1079m
|
||||
checkReturn
|
||||
echo -e -n " ${BOLD}${BLUE}*${NORM} Copying files from rootfs.tar.xz... "
|
||||
tar -xJf ${MEDIAMNT}/${PREFIX}/rootfs.tar.xz -C /newroot
|
||||
@ -343,6 +343,9 @@ then
|
||||
/bin/ash
|
||||
fi
|
||||
|
||||
# create an empty /root/.vimrc to avoid a warning about defaults.vim
|
||||
touch /newroot/root/.vimrc
|
||||
|
||||
echo -e " ${BOLD}${BLUE}*${NORM} Switching root.\n"
|
||||
echo "$PRINTK" > /proc/sys/kernel/printk
|
||||
echo > /proc/sys/kernel/hotplug
|
||||
|
||||
@ -196,7 +196,7 @@ reiserfsprogs: bzip2 kmod zlib ncurses xz eudev file readline util-linux e2fspro
|
||||
rpcbind: libtirpc rpcbind
|
||||
rpcsvc-proto: rpcsvc-proto
|
||||
shared-mime-info: libpcre bzip2 kmod zlib ncurses xz expat libffi libnsl libtirpc mpdecimal libnghttp2 openssl jsoncpp attr lzo libuv lzlib rhash eudev file readline zstd libxml2 acl util-linux gdbm sqlite3 curl libarchive python3 cmake python3-setuptools ninja meson python3-libxml2 glib itstool shared-mime-info
|
||||
syslinux: mtools db ncurses libnsl libtirpc openssl bzip2 zlib readline gdbm sqlite3 perl python syslinux
|
||||
syslinux: mtools db ncurses libnsl libtirpc readline gdbm perl syslinux
|
||||
talloc: bzip2 expat ncurses libffi libnsl libtirpc mpdecimal zlib xz readline gdbm sqlite3 python3 talloc
|
||||
unzip: unzip
|
||||
wireless-tools: wireless-tools
|
||||
|
||||
@ -288,9 +288,9 @@ CONFIG_CC_HAS_SLS=y
|
||||
# CONFIG_SLS is not set
|
||||
# CONFIG_X86_CPU_RESCTRL is not set
|
||||
# CONFIG_X86_EXTENDED_PLATFORM is not set
|
||||
# CONFIG_X86_INTEL_LPSS is not set
|
||||
CONFIG_X86_INTEL_LPSS=y
|
||||
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
|
||||
CONFIG_IOSF_MBI=m
|
||||
CONFIG_IOSF_MBI=y
|
||||
# CONFIG_IOSF_MBI_DEBUG is not set
|
||||
CONFIG_SCHED_OMIT_FRAME_POINTER=y
|
||||
CONFIG_HYPERVISOR_GUEST=y
|
||||
@ -2336,7 +2336,32 @@ CONFIG_PTP_1588_CLOCK_KVM=m
|
||||
# CONFIG_PTP_1588_CLOCK_VMW is not set
|
||||
# end of PTP clock support
|
||||
|
||||
# CONFIG_PINCTRL is not set
|
||||
CONFIG_PINCTRL=y
|
||||
# CONFIG_PINCTRL_AMD is not set
|
||||
# CONFIG_PINCTRL_MCP23S08 is not set
|
||||
# CONFIG_PINCTRL_BAYTRAIL is not set
|
||||
# CONFIG_PINCTRL_CHERRYVIEW is not set
|
||||
# CONFIG_PINCTRL_LYNXPOINT is not set
|
||||
# CONFIG_PINCTRL_ALDERLAKE is not set
|
||||
# CONFIG_PINCTRL_BROXTON is not set
|
||||
# CONFIG_PINCTRL_CANNONLAKE is not set
|
||||
# CONFIG_PINCTRL_CEDARFORK is not set
|
||||
# CONFIG_PINCTRL_DENVERTON is not set
|
||||
# CONFIG_PINCTRL_ELKHARTLAKE is not set
|
||||
# CONFIG_PINCTRL_EMMITSBURG is not set
|
||||
# CONFIG_PINCTRL_GEMINILAKE is not set
|
||||
# CONFIG_PINCTRL_ICELAKE is not set
|
||||
# CONFIG_PINCTRL_JASPERLAKE is not set
|
||||
# CONFIG_PINCTRL_LAKEFIELD is not set
|
||||
# CONFIG_PINCTRL_LEWISBURG is not set
|
||||
# CONFIG_PINCTRL_SUNRISEPOINT is not set
|
||||
# CONFIG_PINCTRL_TIGERLAKE is not set
|
||||
|
||||
#
|
||||
# Renesas pinctrl drivers
|
||||
#
|
||||
# end of Renesas pinctrl drivers
|
||||
|
||||
# CONFIG_GPIOLIB is not set
|
||||
# CONFIG_W1 is not set
|
||||
# CONFIG_POWER_RESET is not set
|
||||
@ -3656,7 +3681,8 @@ CONFIG_VFAT_FS=m
|
||||
CONFIG_FAT_DEFAULT_CODEPAGE=437
|
||||
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
|
||||
# CONFIG_FAT_DEFAULT_UTF8 is not set
|
||||
# CONFIG_EXFAT_FS is not set
|
||||
CONFIG_EXFAT_FS=m
|
||||
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
|
||||
CONFIG_NTFS_FS=m
|
||||
# CONFIG_NTFS_DEBUG is not set
|
||||
# CONFIG_NTFS_RW is not set
|
||||
|
||||
@ -313,7 +313,7 @@ CONFIG_CC_HAS_SLS=y
|
||||
# CONFIG_SLS is not set
|
||||
# CONFIG_X86_CPU_RESCTRL is not set
|
||||
# CONFIG_X86_EXTENDED_PLATFORM is not set
|
||||
# CONFIG_X86_INTEL_LPSS is not set
|
||||
CONFIG_X86_INTEL_LPSS=y
|
||||
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
|
||||
CONFIG_IOSF_MBI=y
|
||||
# CONFIG_IOSF_MBI_DEBUG is not set
|
||||
@ -2619,7 +2619,32 @@ CONFIG_PTP_1588_CLOCK_KVM=m
|
||||
# CONFIG_PTP_1588_CLOCK_VMW is not set
|
||||
# end of PTP clock support
|
||||
|
||||
# CONFIG_PINCTRL is not set
|
||||
CONFIG_PINCTRL=y
|
||||
# CONFIG_PINCTRL_AMD is not set
|
||||
# CONFIG_PINCTRL_MCP23S08 is not set
|
||||
# CONFIG_PINCTRL_BAYTRAIL is not set
|
||||
# CONFIG_PINCTRL_CHERRYVIEW is not set
|
||||
# CONFIG_PINCTRL_LYNXPOINT is not set
|
||||
# CONFIG_PINCTRL_ALDERLAKE is not set
|
||||
# CONFIG_PINCTRL_BROXTON is not set
|
||||
# CONFIG_PINCTRL_CANNONLAKE is not set
|
||||
# CONFIG_PINCTRL_CEDARFORK is not set
|
||||
# CONFIG_PINCTRL_DENVERTON is not set
|
||||
# CONFIG_PINCTRL_ELKHARTLAKE is not set
|
||||
# CONFIG_PINCTRL_EMMITSBURG is not set
|
||||
# CONFIG_PINCTRL_GEMINILAKE is not set
|
||||
# CONFIG_PINCTRL_ICELAKE is not set
|
||||
# CONFIG_PINCTRL_JASPERLAKE is not set
|
||||
# CONFIG_PINCTRL_LAKEFIELD is not set
|
||||
# CONFIG_PINCTRL_LEWISBURG is not set
|
||||
# CONFIG_PINCTRL_SUNRISEPOINT is not set
|
||||
# CONFIG_PINCTRL_TIGERLAKE is not set
|
||||
|
||||
#
|
||||
# Renesas pinctrl drivers
|
||||
#
|
||||
# end of Renesas pinctrl drivers
|
||||
|
||||
# CONFIG_GPIOLIB is not set
|
||||
# CONFIG_W1 is not set
|
||||
# CONFIG_POWER_RESET is not set
|
||||
@ -4086,7 +4111,8 @@ CONFIG_VFAT_FS=m
|
||||
CONFIG_FAT_DEFAULT_CODEPAGE=437
|
||||
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
|
||||
# CONFIG_FAT_DEFAULT_UTF8 is not set
|
||||
# CONFIG_EXFAT_FS is not set
|
||||
CONFIG_EXFAT_FS=m
|
||||
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
|
||||
CONFIG_NTFS_FS=m
|
||||
# CONFIG_NTFS_DEBUG is not set
|
||||
# CONFIG_NTFS_RW is not set
|
||||
|
||||
Loading…
Reference in New Issue
Block a user