Skip to content

Commit

Permalink
Merge pull request #20 from jdorigao/rescue-wip
Browse files Browse the repository at this point in the history
rescue: fix on startup
  • Loading branch information
jdorigao authored Sep 8, 2024
2 parents 216d14d + e2d4e53 commit 77cd857
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 45 deletions.
8 changes: 5 additions & 3 deletions Config.in
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
menu "REG.rescue"

menu "System"
source "$BR2_EXTERNAL_RESCUE_PATH/package/core/rescue-system/Config.in"
source "$BR2_EXTERNAL_RESCUE_PATH/package/core/noto-sans-fonts/Config.in"
source "$BR2_EXTERNAL_RESCUE_PATH/package/core/rescue-system/Config.in"
endmenu

menu "Boot"
source "$BR2_EXTERNAL_RESCUE_PATH/package/boot/plymouth/Config.in"
source "$BR2_EXTERNAL_RESCUE_PATH/package/boot/plymouth/Config.in"
endmenu

menu "Fonts"
source "$BR2_EXTERNAL_RESCUE_PATH/package/fonts/noto-sans-fonts/Config.in"
endmenu

endmenu
Empty file modified board/fsoverlay/etc/init.d/S02date
100644 → 100755
Empty file.
Empty file modified board/fsoverlay/etc/init.d/S97update
100644 → 100755
Empty file.
Empty file modified board/fsoverlay/etc/init.d/S99finishboot
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion buildroot
36 changes: 6 additions & 30 deletions configs/rescue-board.common
Original file line number Diff line number Diff line change
Expand Up @@ -8,34 +8,9 @@ BR2_ENABLE_LTO=y
# Allow to build GOLD linker, but do not use as default
BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-gold --enable-plugins"

# prefer linux tools over busybox tools
BR2_PACKAGE_BUSYBOX=n
BR2_PACKAGE_COREUTILS=y
BR2_PACKAGE_FINDUTILS=y
BR2_PACKAGE_GAWK=y
BR2_PACKAGE_GREP=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_KMOD=y
BR2_PACKAGE_KMOD_TOOLS=y
BR2_PACKAGE_LSOF=y
BR2_PACKAGE_NETCAT=y
BR2_PACKAGE_NET_TOOLS=y
BR2_PACKAGE_PROCPS_NG=y
BR2_PACKAGE_PSMISC=y
BR2_PACKAGE_SED=y
# Linux tools
BR2_PACKAGE_BUSYBOX=y
BR2_PACKAGE_START_STOP_DAEMON=y
BR2_PACKAGE_TAR=y
BR2_PACKAGE_UTIL_LINUX_AGETTY=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_HWCLOCK=y
BR2_PACKAGE_UTIL_LINUX_KILL=y
BR2_PACKAGE_UTIL_LINUX_LOGGER=y
BR2_PACKAGE_UTIL_LINUX_LOGIN=y
BR2_PACKAGE_UTIL_LINUX_MORE=y
BR2_PACKAGE_UTIL_LINUX_MOUNT=y
BR2_PACKAGE_UTIL_LINUX_SU=y
BR2_PACKAGE_UTIL_LINUX_FALLOCATE=y
BR2_PACKAGE_WHICH=y

# system
BR2_TARGET_GENERIC_HOSTNAME="REGLINUX"
Expand All @@ -47,17 +22,18 @@ BR2_TARGET_GENERIC_ROOT_PASSWD="linux"
# Initramfs decompression support
BR2_LINUX_KERNEL_LZ4=y

BR2_PACKAGE_GLIBC_UTILS=y

# System
BR2_PACKAGE_RESCUE_SYSTEM=y
BR2_PACKAGE_GLIBC_UTILS=y
BR2_SYSTEM_BIN_SH_BASH=y # /bin/sh implementation; set here because a `choice` cannot be `select`

# Disable generating rootfs tar (speedup)
BR2_TARGET_ROOTFS_TAR=n
BR2_PACKAGE_SQUASHFS_GZIP=n

# Force SqushFS XZ
BR2_PACKAGE_SQUASHFS_GZIP=n
BR2_TARGET_ROOTFS_SQUASHFS=y
BR2_PACKAGE_SQUASHFS=y
BR2_PACKAGE_SQUASHFS_XZ=y

# REGlinux splash screen
Expand Down
11 changes: 0 additions & 11 deletions package/core/rescue-system/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ config BR2_PACKAGE_RESCUE_SYSTEM
select BR2_RISCV_ISA_RVC if BR2_PACKAGE_RESCUE_TARGET_RISCV64

# minimal system required packages
select BR2_TARGET_RESCUE_IMAGES_DEFINITIONS
select BR2_PACKAGE_BASH # bash shell, used as the interactive shell
select BR2_PACKAGE_RNG_TOOLS # system entropy. Currently disabled for RK3128 due to high CPU impact
select BR2_PACKAGE_HOST_GENEXT2FS # tools to generate rescue image
select BR2_TARGET_ROOTFS_SQUASHFS # tool to generate the target image
select BR2_PACKAGE_SQUASHFS_XZ # some squashfs options
select BR2_PACKAGE_DOSFSTOOLS # fat
select BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT # fat
select BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT # fat
Expand Down Expand Up @@ -58,14 +55,6 @@ config BR2_PACKAGE_RESCUE_SYSTEM
select BR2_PACKAGE_ZSTD # for btrfs compression
select BR2_PACKAGE_LZ4 # for initramfs compression

# tools
select BR2_PACKAGE_SQUASHFS # mksquash tool
select BR2_PACKAGE_NCDU # Disk Usage

# REGlinux splash screen
select BR2_PACKAGE_PLYMOUTH
select BR2_PACKAGE_NOTO_SANS_FONTS

help
Rescue System

Expand Down
File renamed without changes.

0 comments on commit 77cd857

Please sign in to comment.