system/iso
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated kernel to version 5.4.49, updated iso/setup.dependencies, added bin86 to packages.opt, tweaks for cryptsetup

Browse Source
This commit is contained in:
Matt Housh 2020-06-25 15:20:12 -05:00
parent ebf8b7721d
commit 1f183e6c44
6 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -7,7 +7,7 @@ CRUXVERSION = 3.5
CUSTOMVERSION =
COLLECTIONS = core opt xorg
KERNEL_MIRROR = https://cdn.kernel.org
KERNEL_VERSION = 5.4.31
KERNEL_VERSION = 5.4.49
KERNEL_PATCHES =
BB_VERSION = 1.25.1
MEMTEST_VERSION = 5.01
@ -318,6 +318,7 @@ rootfs: kernel busybox
@echo "- Creating symlinks"
@ln -sf /tmp/var $(ROOTFS_DIR)/var
@ln -sf /proc/mounts $(ROOTFS_DIR)/etc/mtab
@ln -sf /sbin/cryptsetup.static $(ROOTFS_DIR)/usr/sbin/cryptsetup
@echo "- Updating library links and cache"
@ldconfig -r $(ROOTFS_DIR)
@echo "- Copying iso/ files..."

3
iso/etc/rc
View File

@ -24,6 +24,9 @@ hostname crux
/bin/mkdir /var/lock /var/log /var/run /var/tmp
/bin/touch /var/run/utmp
# Create /run/cryptsetup for cryptsetup
/bin/mkdir /run/cryptsetup
# Start log daemons
/usr/sbin/syslogd

16
iso/setup.dependencies
View File

@ -4,10 +4,9 @@ autoconf: autoconf
automake: ncurses libgmp db autoconf readline libmpfr gdbm gawk perl automake
bash: ncurses readline bash
bc: ncurses readline bc
bin86: bin86
bindutils: openssl zlib bindutils
binutils: zlib flex binutils
bison: bison
bison: ncurses attr acl gettext bison
bzip2: bzip2
ca-certificates: ca-certificates
coreutils: libgmp attr linux-pam acl libcap coreutils
@ -79,7 +78,7 @@ prt-get: prt-get
psmisc: ncurses psmisc
rc: rc
readline: ncurses readline
rsync: attr acl rsync
rsync: attr openssl zlib acl rsync
sed: attr acl sed
shadow: attr linux-pam acl shadow
signify: signify
@ -99,14 +98,15 @@ which: which
xz: xz
zlib: zlib
alsa-lib: alsa-lib
at-spi2-atk: libpcre bzip2 expat ncurses libffi libtirpc mpdecimal zlib xz db xorg-xorgproto xorg-util-macros dbus readline xorg-libxau xorg-libxdmcp xorg-xtrans gdbm sqlite3 perl python3 p5-xml-parser python3-setuptools ninja xorg-xcb-proto intltool meson xorg-libxcb glib xorg-libx11 gobject-introspection xorg-libxext xorg-libxfixes atk xorg-libxi xorg-libxtst at-spi2-core at-spi2-atk
at-spi2-atk: libpcre bzip2 expat ncurses libffi libtirpc mpdecimal zlib xz db xorg-xorgproto xorg-util-macros dbus readline libxml2 xorg-libxau xorg-libxdmcp xorg-xtrans gdbm sqlite3 perl python3 p5-xml-parser python3-setuptools ninja xorg-xcb-proto intltool meson xorg-libxcb glib xorg-libx11 gobject-introspection xorg-libxext xorg-libxfixes atk xorg-libxi xorg-libxtst at-spi2-core at-spi2-atk
at-spi2-core: expat libpcre bzip2 ncurses libffi libtirpc mpdecimal zlib xz db xorg-xorgproto xorg-util-macros dbus readline xorg-libxau xorg-libxdmcp xorg-xtrans gdbm sqlite3 perl python3 p5-xml-parser python3-setuptools ninja xorg-xcb-proto intltool meson xorg-libxcb glib xorg-libx11 gobject-introspection xorg-libxext xorg-libxfixes xorg-libxi xorg-libxtst at-spi2-core
atk: libpcre bzip2 expat ncurses libffi libtirpc mpdecimal zlib xz readline gdbm sqlite3 python3 python3-setuptools ninja meson glib gobject-introspection atk
bin86: bin86
btrfs-progs: lzo zlib xz zstd btrfs-progs
cairo: zlib expat xorg-xorgproto bzip2 ncurses libffi libtirpc mpdecimal xz xorg-util-macros xorg-libpixman libpcre libpng xorg-libxau xorg-libxdmcp readline xorg-xtrans freetype gdbm sqlite3 fontconfig python3 xorg-xcb-proto python3-setuptools ninja xorg-libxcb meson xorg-libx11 xorg-xcb-util glib xorg-libxext xorg-libxrender cairo
cdrkit: zlib openssl bzip2 xz attr lzo expat ncurses linux-pam file curl acl libcap libarchive cmake cdrkit
cmake: openssl zlib bzip2 xz attr lzo expat ncurses curl acl libarchive cmake
cryptsetup: kmod ncurses zlib openssl attr json-c eudev acl util-linux gettext libdevmapper popt cryptsetup
cryptsetup: kmod ncurses zlib openssl attr bzip2 xz lzo expat eudev curl acl util-linux gettext libarchive libdevmapper popt cmake json-c cryptsetup
dbus: expat dbus
dbus-glib: expat libpcre bzip2 ncurses libffi libtirpc mpdecimal zlib xz dbus readline gdbm sqlite3 python3 python3-setuptools ninja meson glib dbus-glib
dialog: ncurses dialog
@ -133,7 +133,7 @@ hicolor-icon-theme: hicolor-icon-theme
intltool: expat db ncurses readline gdbm perl p5-xml-parser intltool
iputils: attr linux-pam openssl bzip2 expat ncurses libffi libtirpc mpdecimal zlib xz libcap readline gdbm sqlite3 python3 python3-setuptools ninja meson iputils
jfsutils: kmod ncurses zlib eudev util-linux jfsutils
json-c: json-c
json-c: openssl zlib bzip2 xz attr lzo expat ncurses curl acl libarchive cmake json-c
keyutils: keyutils
libaio: libaio
libevent: openssl libevent
@ -149,7 +149,7 @@ libtirpc: libtirpc
libxml2: zlib xz libxml2
libxml2-python: db ncurses openssl bzip2 zlib xz readline libxml2 gdbm sqlite3 python libxml2-python
libxslt: zlib xz libxml2 libxslt
lilo: kmod ncurses zlib eudev util-linux libdevmapper lilo
lilo: kmod ncurses zlib bin86 eudev util-linux libdevmapper lilo
linux-firmware: linux-firmware
llvm: openssl zlib bzip2 xz attr lzo expat ncurses libffi libtirpc mpdecimal curl libxml2 acl readline libarchive gdbm sqlite3 cmake python3 ninja llvm
lvm2: kmod ncurses zlib libaio eudev util-linux libdevmapper lvm2
@ -161,7 +161,7 @@ mutt: ncurses openssl zlib readline gdbm mutt
nano: zlib ncurses bzip2 xz file nano
nfs-utils: kmod ncurses zlib attr linux-pam libtirpc openssl keyutils eudev readline libcap rpcbind libevent util-linux sqlite3 libdevmapper nfs-utils
ninja: bzip2 expat ncurses libffi libtirpc mpdecimal zlib xz readline gdbm sqlite3 python3 ninja
openbox: xorg-xorgproto bzip2 expat ncurses libffi libtirpc mpdecimal zlib xz xorg-util-macros kmod xorg-libpixman libpcre fribidi xorg-libxau xorg-libxdmcp readline libpng xorg-xtrans eudev gdbm sqlite3 freetype xorg-libice util-linux python3 fontconfig xorg-libsm xorg-xcb-proto python3-setuptools ninja xorg-libxcb meson xorg-libx11 xorg-xcb-util glib xorg-libxext xorg-libxrender gobject-introspection xorg-libxinerama xorg-libxrandr cairo harfbuzz xorg-libxft pango openbox
openbox: xorg-xorgproto bzip2 expat ncurses libffi libtirpc mpdecimal zlib xz xorg-util-macros kmod xorg-libpixman libpcre fribidi xorg-libxau xorg-libxdmcp readline libpng libxml2 xorg-xtrans eudev gdbm sqlite3 freetype xorg-libice util-linux python3 fontconfig xorg-libsm xorg-xcb-proto python3-setuptools ninja xorg-libxcb meson xorg-libx11 xorg-xcb-util glib xorg-libxext xorg-libxrender gobject-introspection xorg-libxinerama xorg-libxrandr cairo harfbuzz xorg-libxft pango openbox
p5-xml-parser: expat db ncurses readline gdbm perl p5-xml-parser
pango: kmod ncurses zlib xorg-xorgproto xorg-util-macros expat bzip2 libffi libtirpc mpdecimal xz xorg-libpixman libpcre fribidi eudev readline libpng xorg-libxau xorg-libxdmcp xorg-xtrans util-linux gdbm sqlite3 freetype xorg-libice python3 fontconfig xorg-libsm xorg-xcb-proto python3-setuptools ninja xorg-libxcb meson xorg-libx11 xorg-xcb-util glib xorg-libxext xorg-libxrender gobject-introspection cairo harfbuzz xorg-libxft pango
parted: kmod ncurses zlib eudev readline util-linux libdevmapper parted

15
kernel/linux-5.4.31.config → kernel/linux-5.4.49.config
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 5.4.31 Kernel Configuration
# Linux/x86 5.4.49 Kernel Configuration
#
#
@ -12,7 +12,6 @@ CONFIG_CLANG_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@ -3666,9 +3665,11 @@ CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_NULL2=y
# CONFIG_CRYPTO_PCRYPT is not set
# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
# CONFIG_CRYPTO_TEST is not set
CONFIG_CRYPTO_SIMD=m
CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
# Public-key cryptography
@ -3777,10 +3778,10 @@ CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_CHACHA20 is not set
# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
# CONFIG_CRYPTO_SEED is not set
# CONFIG_CRYPTO_SERPENT is not set
# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
# CONFIG_CRYPTO_SM4 is not set
# CONFIG_CRYPTO_TEA is not set
# CONFIG_CRYPTO_TWOFISH is not set

15
kernel/linux-5.4.31.defconfig → kernel/linux-5.4.49.defconfig
View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 5.4.31 Kernel Configuration
# Linux/x86 5.4.49 Kernel Configuration
#
#
@ -12,7 +12,6 @@ CONFIG_CLANG_VERSION=0
CONFIG_CC_CAN_LINK=y
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_THREAD_INFO_IN_TASK=y
@ -3801,9 +3800,11 @@ CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_NULL2=y
# CONFIG_CRYPTO_PCRYPT is not set
# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_CRYPTD=m
CONFIG_CRYPTO_AUTHENC=m
# CONFIG_CRYPTO_TEST is not set
CONFIG_CRYPTO_SIMD=m
CONFIG_CRYPTO_GLUE_HELPER_X86=m
#
# Public-key cryptography
@ -3912,10 +3913,10 @@ CONFIG_CRYPTO_ARC4=m
# CONFIG_CRYPTO_CHACHA20 is not set
# CONFIG_CRYPTO_CHACHA20_X86_64 is not set
# CONFIG_CRYPTO_SEED is not set
# CONFIG_CRYPTO_SERPENT is not set
# CONFIG_CRYPTO_SERPENT_SSE2_X86_64 is not set
# CONFIG_CRYPTO_SERPENT_AVX_X86_64 is not set
# CONFIG_CRYPTO_SERPENT_AVX2_X86_64 is not set
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
# CONFIG_CRYPTO_SM4 is not set
# CONFIG_CRYPTO_TEA is not set
# CONFIG_CRYPTO_TWOFISH is not set

1
packages.opt
View File

@ -2,6 +2,7 @@ alsa-lib
at-spi2-atk
at-spi2-core
atk
bin86
btrfs-progs
cairo
cdrkit