diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2019-05-04 00:10:26 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2019-05-04 00:10:26 +0000 |
| commit | 7bb2006007c1996f33758e41db070252d4d3607f (patch) | |
| tree | 3dc03d4f6a8867742961a3dea9ecc96c52d00a10 /sub | |
| parent | 1202c964c4e91083a3c60b41b9c11e220bfa759d (diff) | |
| download | lh-bootstrap-7bb2006007c1996f33758e41db070252d4d3607f.tar.xz | |
Make a lean and mean version, as a basis for filling an initramfs
Diffstat (limited to 'sub')
34 files changed, 362 insertions, 1769 deletions
diff --git a/sub/bearssl/Makefile b/sub/bearssl/Makefile index e96f5b4..f5e4e3f 100644 --- a/sub/bearssl/Makefile +++ b/sub/bearssl/Makefile @@ -16,16 +16,14 @@ $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied: $(OUTPUT)/sources/.lh_$(BEARSSL exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) git checkout $(BEARSSL_VERSION) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib dll tools CC=$(TRIPLE)-muslgcc LD=$(TRIPLE)-muslgcc LDDLL=$(TRIPLE)-muslgcc +$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION) $(MAKE) lib CC=$(BUILD_HOST_CC) LD=$(BUILD_HOST_CC) LDDLL=$(BUILD_HOST_CC) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_installed: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_installed: $(OUTPUT)/build-host/.lh_$(BEARSSL_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec s6-mkdir -p $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/bin - exec cp $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/brssl $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/bin/ - exec cp $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/libbearssl.a $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/libbearssl.so $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib/ + exec cp $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/build/libbearssl.a $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/lib/ exec s6-hiercopy $(OUTPUT)/build-host/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/inc $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include exec chown -R root.root $(OUTPUT)/rootfs/opt/$(BEARSSL_NAME)-$(BEARSSL_VERSION)/include exec makenamelink $(OUTPUT)/rootfs/opt $(BEARSSL_NAME) $(BEARSSL_NAME)-$(BEARSSL_VERSION) $(OUTPUT)/tmp - exec makelinks $(OUTPUT)/build-host /bin /opt/$(BEARSSL_NAME)/bin exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/busybox/Makefile b/sub/busybox/Makefile index 1a11c1a..1933d78 100644 --- a/sub/busybox/Makefile +++ b/sub/busybox/Makefile @@ -7,7 +7,6 @@ clean-busybox: rm -f $(OUTPUT)/sources/.lh_bb_dled rm -rf $(OUTPUT)/build-host/.lh_bb_* rm -rf $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION) - rm -f $(OUTPUT)/build-host/bbsuid.c $(OUTPUT)/build-host/bbsuid $(OUTPUT)/build-host/.lh_bbsuid_installed $(OUTPUT)/sources/.lh_bb_cloned: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed @@ -28,25 +27,14 @@ $(OUTPUT)/build-host/.lh_bb_copied: $(OUTPUT)/sources/.lh_bb_dled | $(OUTPUT)/bu $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config: $(OUTPUT)/build-host/.lh_bb_copied sub/busybox/host-full-config | $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_prepared exec setuidgid $(NORMALUSER) cp -f $(WD)/sub/busybox/host-full-config $@ -$(OUTPUT)/build-host/.lh_bb_built: $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION) $(MAKE) -j1 busybox install CROSS_COMPILE=$(TRIPLE)- CC=$(TRIPLE)-muslgcc +$(OUTPUT)/build-host/.lh_bb_built: $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/.config | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION) $(MAKE) -j1 busybox install CROSS_COMPILE=$(TRIPLE)- CC=$(BUILD_HOST_CC) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_bb_installed: $(OUTPUT)/build-host/.lh_bb_built $(OUTPUT)/build-host/bin/muslgcc $(OUTPUT)/tmp/.lh_layout_installed | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_bb_installed: $(OUTPUT)/build-host/.lh_bb_built $(OUTPUT)/tmp/.lh_layout_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec s6-rmrf $(OUTPUT)/rootfs/opt/busybox-$(BUSYBOX_VERSION) exec cp -RP $(OUTPUT)/build-host/busybox-$(BUSYBOX_VERSION)/_install $(OUTPUT)/rootfs/opt/busybox-$(BUSYBOX_VERSION) exec makenamelink $(OUTPUT)/rootfs/opt busybox busybox-$(BUSYBOX_VERSION) $(OUTPUT)/tmp exec makelinks $(OUTPUT)/rootfs /bin /opt/busybox/bin exec makelinks $(OUTPUT)/rootfs /bin /opt/busybox/sbin exec setuidgid $(NORMALUSER) s6-touch $@ - - -$(OUTPUT)/build-host/bbsuid.c: sub/busybox/SUIDLIST sub/busybox/bbsuid-header sub/busybox/bbsuid-footer | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) redirfd -w 1 $@ foreground cat sub/busybox/bbsuid-header "" foreground sed s/.*/\"\&\",/ sub/busybox/SUIDLIST "" cat sub/busybox/bbsuid-footer - -$(OUTPUT)/build-host/bbsuid: $(OUTPUT)/build-host/bbsuid.c $(OUTPUT)/build-host/bin/muslgcc $(OUTPUT)/build-host/.lh_skalibs_installed - exec setuidgid $(NORMALUSER) muslgcc -static -o $@ -I $(OUTPUT)/rootfs/package/prog/skalibs/include -L $(OUTPUT)/rootfs/package/prog/skalibs/library $(OUTPUT)/build-host/bbsuid.c -lskarnet - -$(OUTPUT)/build-host/.lh_bbsuid_installed: sub/busybox/SUIDLIST $(OUTPUT)/build-host/bbsuid $(OUTPUT)/build-host/.lh_bb_installed | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec sub/busybox/install-bbsuid $(OUTPUT) sub/busybox/SUIDLIST - exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/busybox/SUIDLIST b/sub/busybox/SUIDLIST deleted file mode 100644 index c632267..0000000 --- a/sub/busybox/SUIDLIST +++ /dev/null @@ -1,8 +0,0 @@ -ipcrm -ipcs -passwd -ping -ping6 -su -traceroute -traceroute6 diff --git a/sub/busybox/bbsuid-footer b/sub/busybox/bbsuid-footer deleted file mode 100644 index 699c6f8..0000000 --- a/sub/busybox/bbsuid-footer +++ /dev/null @@ -1,21 +0,0 @@ -} ; - -static int okay (char const *s) -{ - register char const **p = list ; - for (; *p ; p++) if (!str_diff(s, *p)) return 1 ; - return 0 ; -} - -int main (int argc, char const *const *argv, char const *const *envp) -{ - stralloc sa = STRALLOC_ZERO ; - PROG = "busybox-setuid" ; - if (!sabasename(&sa, argv[0], str_len(argv[0]))) - strerr_diefu2sys(111, "sabasename", argv[0]) ; - if (!stralloc_0(&sa)) strerr_diefu1sys(111, "stralloc_0") ; - if (!okay(sa.s)) strerr_dief2x(100, sa.s, " is not granted root privileges") ; - stralloc_free(&sa) ; - execve("/bin/busybox", (char *const *)argv, (char *const *)envp) ; - strerr_dieexec(111, "/bin/busybox") ; -} diff --git a/sub/busybox/bbsuid-header b/sub/busybox/bbsuid-header deleted file mode 100644 index 98af28b..0000000 --- a/sub/busybox/bbsuid-header +++ /dev/null @@ -1,9 +0,0 @@ -/* ISC license. */ - -#include <skalibs/bytestr.h> -#include <skalibs/strerr2.h> -#include <skalibs/stralloc.h> -#include <skalibs/djbunix.h> - -static char const *list[] = -{ diff --git a/sub/busybox/host-full-config b/sub/busybox/host-full-config index 195c4b8..3261ec7 100644 --- a/sub/busybox/host-full-config +++ b/sub/busybox/host-full-config @@ -1,14 +1,14 @@ # # Automatically generated make config: don't edit # Busybox version: 1.31.0.git -# Fri May 3 12:23:41 2019 +# Fri May 3 16:36:36 2019 # CONFIG_HAVE_DOT_CONFIG=y # # Settings # -CONFIG_DESKTOP=y +# CONFIG_DESKTOP is not set # CONFIG_EXTRA_COMPAT is not set # CONFIG_FEDORA_COMPAT is not set # CONFIG_INCLUDE_SUSv2 is not set @@ -34,8 +34,8 @@ CONFIG_INSTALL_NO_USR=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_SYSLOG_INFO=y -CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_SYSLOG_INFO is not set +# CONFIG_FEATURE_SYSLOG is not set CONFIG_PLATFORM_LINUX=y # @@ -205,8 +205,8 @@ CONFIG_CHMOD=y CONFIG_CHOWN=y # CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set CONFIG_CP=y # CONFIG_FEATURE_CP_LONG_OPTIONS is not set # CONFIG_FEATURE_CP_REFLINK is not set @@ -223,30 +223,30 @@ CONFIG_FEATURE_DD_STATUS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set CONFIG_DU=y CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y -CONFIG_EXPAND=y -CONFIG_UNEXPAND=y +# CONFIG_EXPAND is not set +# CONFIG_UNEXPAND is not set CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y # CONFIG_FACTOR is not set CONFIG_FALSE=y -CONFIG_FOLD=y +# CONFIG_FOLD is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y +# CONFIG_HOSTID is not set CONFIG_ID=y -CONFIG_GROUPS=y -CONFIG_INSTALL=y +# CONFIG_GROUPS is not set +# CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -CONFIG_LINK=y +# CONFIG_LINK is not set CONFIG_LN=y -CONFIG_LOGNAME=y +# CONFIG_LOGNAME is not set CONFIG_LS=y CONFIG_FEATURE_LS_FILETYPES=y CONFIG_FEATURE_LS_FOLLOWLINKS=y @@ -255,13 +255,13 @@ CONFIG_FEATURE_LS_WIDTH=y CONFIG_FEATURE_LS_SORTFILES=y CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_SHA1SUM=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +# CONFIG_MD5SUM is not set +# CONFIG_SHA1SUM is not set CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SHA3SUM=y +# CONFIG_SHA512SUM is not set +# CONFIG_SHA3SUM is not set # # Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum @@ -273,12 +273,12 @@ CONFIG_MKNOD=y CONFIG_MKTEMP=y CONFIG_MV=y CONFIG_NICE=y -CONFIG_NL=y -CONFIG_NOHUP=y -CONFIG_NPROC=y -CONFIG_OD=y -CONFIG_PASTE=y -CONFIG_PRINTENV=y +# CONFIG_NL is not set +# CONFIG_NOHUP is not set +# CONFIG_NPROC is not set +# CONFIG_OD is not set +# CONFIG_PASTE is not set +# CONFIG_PRINTENV is not set CONFIG_PRINTF=y CONFIG_PWD=y CONFIG_READLINK=y @@ -288,23 +288,23 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SEQ=y # CONFIG_SHRED is not set -CONFIG_SHUF=y +# CONFIG_SHUF is not set CONFIG_SLEEP=y # CONFIG_FEATURE_FANCY_SLEEP is not set CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y # CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set -CONFIG_SPLIT=y +# CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_FEATURE_STAT_FILESYSTEM=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +# CONFIG_FEATURE_STAT_FILESYSTEM is not set CONFIG_STTY=y -CONFIG_SUM=y +# CONFIG_SUM is not set CONFIG_SYNC=y -CONFIG_FEATURE_SYNC_FANCY=y -CONFIG_FSYNC=y -CONFIG_TAC=y +# CONFIG_FEATURE_SYNC_FANCY is not set +# CONFIG_FSYNC is not set +# CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y @@ -312,28 +312,28 @@ CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y CONFIG_TEST1=y CONFIG_TEST2=y -CONFIG_FEATURE_TEST_64=y +# CONFIG_FEATURE_TEST_64 is not set # CONFIG_TIMEOUT is not set CONFIG_TOUCH=y -CONFIG_FEATURE_TOUCH_NODEREF=y -CONFIG_FEATURE_TOUCH_SUSV3=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_FEATURE_TOUCH_NODEREF is not set +# CONFIG_FEATURE_TOUCH_SUSV3 is not set +# CONFIG_TR is not set +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set CONFIG_TRUE=y -CONFIG_TRUNCATE=y +# CONFIG_TRUNCATE is not set CONFIG_TTY=y CONFIG_UNAME=y CONFIG_UNAME_OSNAME="Linux" -CONFIG_BB_ARCH=y +# CONFIG_BB_ARCH is not set CONFIG_UNIQ=y -CONFIG_UNLINK=y +# CONFIG_UNLINK is not set CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_BASE64=y -CONFIG_UUENCODE=y +# CONFIG_UUDECODE is not set +# CONFIG_BASE64 is not set +# CONFIG_UUENCODE is not set CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y +# CONFIG_FEATURE_WC_LARGE is not set # CONFIG_WHO is not set # CONFIG_W is not set # CONFIG_USERS is not set @@ -391,7 +391,7 @@ CONFIG_DEFAULT_SETFONT_DIR="" # CONFIG_START_STOP_DAEMON is not set # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set # CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -CONFIG_WHICH=y +# CONFIG_WHICH is not set # # klibc-utils @@ -409,10 +409,10 @@ CONFIG_FEATURE_AWK_LIBM=y CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y CONFIG_CMP=y CONFIG_DIFF=y -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_LONG_OPTIONS=y CONFIG_FEATURE_DIFF_DIR=y # CONFIG_ED is not set -CONFIG_PATCH=y +# CONFIG_PATCH is not set CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 @@ -420,7 +420,7 @@ CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set +CONFIG_FEATURE_VI_REGEX_SEARCH=n CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -436,44 +436,44 @@ CONFIG_FEATURE_ALLOW_EXEC=y # # Finding Utilities # -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_EXECUTABLE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_EXEC_PLUS=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -CONFIG_FEATURE_FIND_QUIT=y -CONFIG_FEATURE_FIND_DELETE=y -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_EXECUTABLE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_MAXDEPTH is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_EXEC_PLUS is not set +# CONFIG_FEATURE_FIND_USER is not set +# CONFIG_FEATURE_FIND_GROUP is not set +# CONFIG_FEATURE_FIND_NOT is not set +# CONFIG_FEATURE_FIND_DEPTH is not set +# CONFIG_FEATURE_FIND_PAREN is not set +# CONFIG_FEATURE_FIND_SIZE is not set +# CONFIG_FEATURE_FIND_PRUNE is not set +# CONFIG_FEATURE_FIND_QUIT is not set +# CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_PATH is not set +# CONFIG_FEATURE_FIND_REGEX is not set # CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_FEATURE_FIND_LINKS=y +# CONFIG_FEATURE_FIND_LINKS is not set CONFIG_GREP=y CONFIG_EGREP=y CONFIG_FGREP=y CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y -CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y -CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y -CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y +# CONFIG_XARGS is not set +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +# CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set +# CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE is not set # # Init Utilities @@ -488,16 +488,16 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" # CONFIG_INIT is not set -CONFIG_LINUXRC=y +# CONFIG_LINUXRC is not set # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SYSLOG is not set -CONFIG_FEATURE_INIT_QUIET=y +# CONFIG_FEATURE_INIT_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set CONFIG_INIT_TERMINAL_TYPE="" -CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y +# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set # # Login/Password Management Utilities @@ -509,31 +509,31 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_CRYPT_SHA is not set # CONFIG_ADD_SHELL is not set # CONFIG_REMOVE_SHELL is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_LAST_ID=60000 -CONFIG_FIRST_SYSTEM_ID=100 -CONFIG_LAST_SYSTEM_ID=999 -CONFIG_CHPASSWD=y -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512" -CONFIG_CRYPTPW=y -CONFIG_MKPASSWD=y -CONFIG_DELUSER=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_GETTY=y -CONFIG_LOGIN=y +# CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=0 +CONFIG_FIRST_SYSTEM_ID=0 +CONFIG_LAST_SYSTEM_ID=0 +# CONFIG_CHPASSWD is not set +CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="" +# CONFIG_CRYPTPW is not set +# CONFIG_MKPASSWD is not set +# CONFIG_DELUSER is not set +# CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set # CONFIG_LOGIN_SESSION_AS_CHILD is not set -CONFIG_LOGIN_SCRIPTS=y +# CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_SU=y +# CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_SU is not set # CONFIG_FEATURE_SU_SYSLOG is not set -CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set # CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set @@ -582,11 +582,11 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set -CONFIG_BLKDISCARD=y -CONFIG_BLKID=y -CONFIG_FEATURE_BLKID_TYPE=y -CONFIG_BLOCKDEV=y -CONFIG_CAL=y +# CONFIG_BLKDISCARD is not set +# CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set +# CONFIG_BLOCKDEV is not set +# CONFIG_CAL is not set # CONFIG_CHRT is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y @@ -598,9 +598,9 @@ CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FEATURE_FBSET_FANCY is not set # CONFIG_FEATURE_FBSET_READMODE is not set # CONFIG_FDFORMAT is not set -CONFIG_FDISK=y +# CONFIG_FDISK is not set # CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_FDISK_WRITABLE is not set # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set @@ -608,45 +608,45 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_GPT_LABEL is not set # CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FINDFS is not set -CONFIG_FLOCK=y +# CONFIG_FLOCK is not set # CONFIG_FDFLUSH is not set -CONFIG_FREERAMDISK=y +# CONFIG_FREERAMDISK is not set # CONFIG_FSCK_MINIX is not set # CONFIG_FSFREEZE is not set -CONFIG_FSTRIM=y -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y +# CONFIG_FSTRIM is not set +# CONFIG_GETOPT is not set +# CONFIG_FEATURE_GETOPT_LONG is not set CONFIG_HEXDUMP=y # CONFIG_FEATURE_HEXDUMP_REVERSE is not set CONFIG_HD=y -CONFIG_XXD=y +# CONFIG_XXD is not set # CONFIG_HWCLOCK is not set # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -CONFIG_IONICE=y -CONFIG_IPCRM=y -CONFIG_IPCS=y +# CONFIG_IONICE is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LOSETUP=y +# CONFIG_LOSETUP is not set # CONFIG_LSPCI is not set # CONFIG_LSUSB is not set -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set -CONFIG_MKE2FS=y -CONFIG_MKFS_EXT2=y +# CONFIG_MKE2FS is not set +# CONFIG_MKFS_EXT2 is not set # CONFIG_MKFS_MINIX is not set # CONFIG_FEATURE_MINIX2 is not set # CONFIG_MKFS_REISER is not set # CONFIG_MKDOSFS is not set # CONFIG_MKFS_VFAT is not set -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_UUID=y +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_UUID is not set # CONFIG_MORE is not set CONFIG_MOUNT=y CONFIG_FEATURE_MOUNT_FAKE=y @@ -658,24 +658,24 @@ CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y -CONFIG_MOUNTPOINT=y +# CONFIG_MOUNTPOINT is not set # CONFIG_NOLOGIN is not set # CONFIG_NOLOGIN_DEPENDENCIES is not set -CONFIG_NSENTER=y +# CONFIG_NSENTER is not set # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set -CONFIG_RDEV=y +# CONFIG_RDEV is not set # CONFIG_READPROFILE is not set -CONFIG_RENICE=y -CONFIG_REV=y +# CONFIG_RENICE is not set +# CONFIG_REV is not set # CONFIG_RTCWAKE is not set # CONFIG_SCRIPT is not set # CONFIG_SCRIPTREPLAY is not set -CONFIG_SETARCH=y +# CONFIG_SETARCH is not set # CONFIG_LINUX32 is not set # CONFIG_LINUX64 is not set -CONFIG_SETPRIV=y -CONFIG_FEATURE_SETPRIV_DUMP=y +# CONFIG_SETPRIV is not set +# CONFIG_FEATURE_SETPRIV_DUMP is not set # CONFIG_FEATURE_SETPRIV_CAPABILITIES is not set # CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES is not set # CONFIG_SETSID is not set @@ -684,12 +684,12 @@ CONFIG_FEATURE_SETPRIV_DUMP=y # CONFIG_FEATURE_SWAPON_PRI is not set # CONFIG_SWAPOFF is not set # CONFIG_FEATURE_SWAPONOFF_LABEL is not set -CONFIG_SWITCH_ROOT=y +# CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set -CONFIG_UEVENT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y +# CONFIG_UEVENT is not set +# CONFIG_UMOUNT is not set +# CONFIG_FEATURE_UMOUNT_ALL is not set # CONFIG_UNSHARE is not set # CONFIG_WALL is not set @@ -704,11 +704,11 @@ CONFIG_VOLUMEID=y # # Filesystem/Volume identification # -CONFIG_FEATURE_VOLUMEID_BCACHE=y +# CONFIG_FEATURE_VOLUMEID_BCACHE is not set # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set # CONFIG_FEATURE_VOLUMEID_EXFAT is not set -CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_EXT is not set # CONFIG_FEATURE_VOLUMEID_F2FS is not set # CONFIG_FEATURE_VOLUMEID_FAT is not set # CONFIG_FEATURE_VOLUMEID_HFS is not set @@ -716,7 +716,7 @@ CONFIG_FEATURE_VOLUMEID_EXT=y # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_LFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set # CONFIG_FEATURE_VOLUMEID_MINIX is not set # CONFIG_FEATURE_VOLUMEID_NILFS is not set @@ -724,7 +724,7 @@ CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set -CONFIG_FEATURE_VOLUMEID_SQUASHFS=y +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set # CONFIG_FEATURE_VOLUMEID_UBIFS is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set @@ -733,7 +733,7 @@ CONFIG_FEATURE_VOLUMEID_SQUASHFS=y # # Miscellaneous Utilities # -CONFIG_ADJTIMEX=y +# CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set CONFIG_BC=y @@ -784,7 +784,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set # CONFIG_I2CTRANSFER is not set -CONFIG_INOTIFYD=y +# CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y @@ -809,14 +809,14 @@ CONFIG_FEATURE_LESS_ENV=y # CONFIG_NANDDUMP is not set # CONFIG_PARTPROBE is not set # CONFIG_RAIDAUTORUN is not set -CONFIG_READAHEAD=y -CONFIG_RFKILL=y +# CONFIG_READAHEAD is not set +# CONFIG_RFKILL is not set # CONFIG_RUNLEVEL is not set # CONFIG_RX is not set -CONFIG_SETFATTR=y -CONFIG_SETSERIAL=y +# CONFIG_SETFATTR is not set +# CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set -CONFIG_TIME=y +# CONFIG_TIME is not set # CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set @@ -825,52 +825,52 @@ CONFIG_TIME=y # CONFIG_UBIRMVOL is not set # CONFIG_UBIRSVOL is not set # CONFIG_UBIUPDATEVOL is not set -CONFIG_UBIRENAME=y +# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set # # Networking Utilities # -CONFIG_FEATURE_IPV6=y +# CONFIG_FEATURE_IPV6 is not set # CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -CONFIG_VERBOSE_RESOLUTION_ERRORS=y +# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set # CONFIG_FEATURE_TLS_SHA1 is not set -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -CONFIG_FEATURE_BRCTL_FANCY=y -CONFIG_FEATURE_BRCTL_SHOW=y +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_FEATURE_BRCTL_SHOW is not set # CONFIG_DNSD is not set # CONFIG_ETHER_WAKE is not set -CONFIG_FTPD=y -CONFIG_FEATURE_FTPD_WRITE=y -CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y -CONFIG_FEATURE_FTPD_AUTHENTICATION=y +# CONFIG_FTPD is not set +# CONFIG_FEATURE_FTPD_WRITE is not set +# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -CONFIG_DNSDOMAINNAME=y -CONFIG_HTTPD=y -CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_SETUID=y -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y -CONFIG_FEATURE_HTTPD_ERROR_PAGES=y -CONFIG_FEATURE_HTTPD_PROXY=y -CONFIG_FEATURE_HTTPD_GZIP=y -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_HOSTNAME is not set +# CONFIG_DNSDOMAINNAME is not set +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +# CONFIG_FEATURE_HTTPD_GZIP is not set +# CONFIG_IFCONFIG is not set +# CONFIG_FEATURE_IFCONFIG_STATUS is not set # CONFIG_FEATURE_IFCONFIG_SLIP is not set # CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set # CONFIG_IFENSLAVE is not set # CONFIG_IFPLUGD is not set # CONFIG_IFUP is not set @@ -899,15 +899,15 @@ CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" -CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_TUNNEL is not set CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_NEIGH=y +# CONFIG_FEATURE_IP_NEIGH is not set # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPCALC=y +# CONFIG_IPCALC is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FAKEIDENTD is not set -CONFIG_NAMEIF=y +# CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set # CONFIG_NC is not set @@ -925,22 +925,22 @@ CONFIG_FEATURE_NETSTAT_PRG=y # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set # CONFIG_FEATURE_NTP_AUTH is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y +# CONFIG_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING is not set +# CONFIG_PSCAN is not set +# CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set -CONFIG_SSL_CLIENT=y +# CONFIG_SSL_CLIENT is not set # CONFIG_TC is not set # CONFIG_FEATURE_TC_INGRESS is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_FEATURE_TELNET_WIDTH=y -CONFIG_TELNETD=y +# CONFIG_TELNET is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set +# CONFIG_FEATURE_TELNET_WIDTH is not set +# CONFIG_TELNETD is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set @@ -951,46 +951,42 @@ CONFIG_TELNETD=y # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set # CONFIG_TFTP_DEBUG is not set CONFIG_TLS=y -CONFIG_TRACEROUTE=y -CONFIG_TRACEROUTE6=y -CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y -CONFIG_TUNCTL=y +# CONFIG_TRACEROUTE is not set +# CONFIG_TRACEROUTE6 is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TUNCTL is not set # CONFIG_FEATURE_TUNCTL_UG is not set -CONFIG_VCONFIG=y +# CONFIG_VCONFIG is not set CONFIG_WGET=y -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_FEATURE_WGET_HTTPS=y CONFIG_FEATURE_WGET_OPENSSL=y -CONFIG_WHOIS=y +# CONFIG_WHOIS is not set # CONFIG_ZCIP is not set -CONFIG_UDHCPD=y -CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y -CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y -CONFIG_DHCPD_LEASES_FILE="/var/run/udhcpd.leases" -CONFIG_DUMPLEASES=y +# CONFIG_UDHCPD is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_DUMPLEASES is not set # CONFIG_DHCPRELAY is not set -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCPC_ARPING=y -CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/opt/local/bin/udhcpc-default-script" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" # CONFIG_UDHCPC6 is not set -CONFIG_FEATURE_UDHCPC6_RFC3646=y -CONFIG_FEATURE_UDHCPC6_RFC4704=y -CONFIG_FEATURE_UDHCPC6_RFC4833=y -CONFIG_FEATURE_UDHCPC6_RFC5970=y - -# -# Common options for DHCP applets -# -CONFIG_FEATURE_UDHCP_PORT=y -CONFIG_UDHCP_DEBUG=9 -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_FEATURE_UDHCP_RFC3397=y -CONFIG_FEATURE_UDHCP_8021Q=y +# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set +# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +CONFIG_UDHCP_DEBUG=0 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" # @@ -1015,30 +1011,30 @@ CONFIG_FEATURE_MIME_CHARSET="" # Process Utilities # CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_IOSTAT=y +# CONFIG_FUSER is not set +# CONFIG_IOSTAT is not set CONFIG_KILL=y # CONFIG_KILLALL is not set # CONFIG_KILLALL5 is not set CONFIG_LSOF=y -CONFIG_MPSTAT=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PKILL=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PMAP=y +# CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set +# CONFIG_PGREP is not set +# CONFIG_PKILL is not set +# CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +# CONFIG_PMAP is not set # CONFIG_POWERTOP is not set # CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_LONG is not set -CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_FEATURE_PS_LONG=y +# CONFIG_FEATURE_PS_TIME is not set # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y +# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set # CONFIG_PSTREE is not set -CONFIG_PWDX=y +# CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set CONFIG_BB_SYSCTL=y CONFIG_TOP=y @@ -1095,22 +1091,22 @@ CONFIG_SH_IS_ASH=y CONFIG_BASH_IS_NONE=y CONFIG_ASH=y # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set -CONFIG_ASH_INTERNAL_GLOB=y +# CONFIG_ASH_INTERNAL_GLOB is not set CONFIG_ASH_BASH_COMPAT=y -# CONFIG_ASH_BASH_SOURCE_CURDIR is not set -CONFIG_ASH_BASH_NOT_FOUND_HOOK=y +CONFIG_ASH_BASH_SOURCE_CURDIR=y +# CONFIG_ASH_BASH_NOT_FOUND_HOOK is not set CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y -CONFIG_ASH_RANDOM_SUPPORT=y +# CONFIG_ASH_RANDOM_SUPPORT is not set CONFIG_ASH_EXPAND_PRMT=y # CONFIG_ASH_IDLE_TIMEOUT is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_ECHO=y CONFIG_ASH_PRINTF=y CONFIG_ASH_TEST=y -CONFIG_ASH_HELP=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_HELP is not set +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_CMDCMD is not set # CONFIG_CTTYHACK is not set # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set @@ -1153,11 +1149,11 @@ CONFIG_ASH_CMDCMD=y # Options common to all shells # CONFIG_FEATURE_SH_MATH=y -CONFIG_FEATURE_SH_MATH_64=y +# CONFIG_FEATURE_SH_MATH_64 is not set CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set -CONFIG_FEATURE_SH_READ_FRAC=y +# CONFIG_FEATURE_SH_READ_FRAC is not set # CONFIG_FEATURE_SH_HISTFILESIZE is not set # CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS is not set diff --git a/sub/busybox/install-bbsuid b/sub/busybox/install-bbsuid deleted file mode 100755 index da73864..0000000 --- a/sub/busybox/install-bbsuid +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -e - -output="$1" -file="$2" - -cp -f $output/build-host/bbsuid $output/rootfs/opt/busybox/bin/bbsuid -s6-chmod 4755 $output/rootfs/opt/busybox/bin/bbsuid - -for i in $(s6-ls $output/rootfs/opt/busybox/bin | grep -xFf $file) ; do - rm -f $output/rootfs/opt/busybox/bin/$i - s6-ln -s bbsuid $output/rootfs/opt/busybox/bin/$i -done - -for i in $(s6-ls $output/rootfs/opt/busybox/sbin | grep -xFf $file) ; do - rm -f $output/rootfs/opt/busybox/sbin/$i - s6-ln -s ../bin/bbsuid $output/rootfs/opt/busybox/bin/$i -done - diff --git a/sub/disk-image/make-disk-image b/sub/disk-image/make-disk-image deleted file mode 100755 index a7a2f97..0000000 --- a/sub/disk-image/make-disk-image +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -e - -output="$1" -rootfs_size="$2" -swap_size="$3" -rwfs_size="$4" -userfs_size="$5" -extra_size="$6" - -totalsize=$(s6-expr ${rootfs_size} + ${swap_size} + ${rwfs_size} + ${userfs_size} + ${extra_size} + 4) - -# prepare extlinux.conf - -if s6-test ${KERNEL_GENERIC_ARCH} = x86 ; then - consolearg="console=ttyS0,115200n8" - if ${USE_GRAPHIC} ; then - consolearg= - fi - if ${USE_VIRTIO_DISK} ; then - bootpartition=/dev/vda1 - elif s6-test ${KERNEL_ARCH} = x86_64 ; then - bootpartition=/dev/sda1 - else - bootpartition=/dev/hda1 - fi - s6-cat > ${output}/rootfs/boot/extlinux.conf <<EOF -serial 0 115200 -console 0 -prompt 0 -default linux -totaltimeout 1200 -say extlinux booting -label linux - linux /boot/vmlinuz - append ro root=$bootpartition rootfstype=ext4 loglevel=4 $consolearg -EOF -fi - -s6-rmrf "$output/disk-image.raw" -setuidgid ${NORMALUSER} dd if=/dev/zero of=$output/disk-image.raw bs=1 count=0 seek=${totalsize}M - -fdisk $output/disk-image.raw <<EOF -n - - - -+${rootfs_size}M -n - - - -+${swap_size}M -t -2 -82 -n - - - -+${rwfs_size}M -n - - - -n - -+${userfs_size}M -n - - -a -1 -w -EOF - -loop=$(losetup -f) -losetup -P "$loop" "$output/disk-image.raw" - -{ - mkfs.ext4 -O ^huge_file ${loop}p1 - mkswap ${loop}p2 - mkfs.ext4 -O ^huge_file ${loop}p3 - mkfs.ext4 -O ^huge_file ${loop}p5 - mkfs.ext4 -O ^huge_file ${loop}p6 - - s6-mkdir -p "$output/tmp/rootfs" "$output/tmp/rwfs" "$output/tmp/userfs" "$output/tmp/stagingfs" - mount -t ext4 ${loop}p1 "$output/tmp/rootfs" - s6-hiercopy "$output/rootfs" "$output/tmp/rootfs" - if s6-test ${KERNEL_GENERIC_ARCH} = x86 ; then - dd if=${output}/build-build/opt/syslinux/usr/share/syslinux/mbr.bin of=${loop} - extlinux -i "$output/tmp/rootfs/boot" - fi - umount -l "$output/tmp/rootfs" - mount -t ext4 ${loop}p3 "$output/tmp/rwfs" - s6-hiercopy "$output/rwfs" "$output/tmp/rwfs" - umount -l "$output/tmp/rwfs" - mount -t ext4 ${loop}p5 "$output/tmp/userfs" - s6-hiercopy "$output/userfs" "$output/tmp/userfs" - umount -l "$output/tmp/userfs" - mount -t ext4 ${loop}p6 "$output/tmp/stagingfs" - s6-hiercopy "$output/stagingfs" "$output/tmp/stagingfs" - umount -l "$output/tmp/stagingfs" -} || { losetup -d "$loop" ; exit 1 ; } - -losetup -d "$loop" diff --git a/sub/dnscache/Makefile b/sub/dnscache/Makefile deleted file mode 100644 index eb02b05..0000000 --- a/sub/dnscache/Makefile +++ /dev/null @@ -1,32 +0,0 @@ - -$(OUTPUT)/sources/djbdns-1.05.tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget http://cr.yp.to/djbdns/djbdns-1.05.tar.gz - -$(OUTPUT)/sources/.lh_djbdns_dled: $(OUTPUT)/sources/djbdns-1.05.tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_djbdns_copied: $(OUTPUT)/sources/.lh_djbdns_dled | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/djbdns-1.05 - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar zxpvf $(OUTPUT)/sources/djbdns-1.05.tar.gz - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/djbdns-1.05 redirfd -r 0 $(WD)/sub/dnscache/djbdns-readiness-notification.patch patch -p1 - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_djbdns_patched: $(OUTPUT)/build-host/.lh_djbdns_copied | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) sed -f $(WD)/sub/dnscache/patch.sed $(OUTPUT)/build-host/djbdns-1.05/Makefile > $(OUTPUT)/build-host/djbdns-1.05/Makefile.patched - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_djbdns_configured: $(OUTPUT)/build-host/.lh_djbdns_copied | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-echo "muslgcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h" > $(OUTPUT)/build-host/djbdns-1.05/conf-cc - exec setuidgid $(NORMALUSER) s6-echo "muslgcc -s -static" > $(OUTPUT)/build-host/djbdns-1.05/conf-ld - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_dnscache_built: $(OUTPUT)/build-host/.lh_djbdns_configured $(OUTPUT)/build-host/.lh_djbdns_patched $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/djbdns-1.05 $(MAKE) -f Makefile.patched dnscache - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_dnscache_installed: $(OUTPUT)/build-host/.lh_dnscache_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec s6-mkdir -p -m 0755 $(OUTPUT)/rootfs/opt/djbdns-1.05/bin - exec makenamelink $(OUTPUT)/rootfs/opt djbdns djbdns-1.05 $(OUTPUT)/tmp - exec cp -f $(OUTPUT)/build-host/djbdns-1.05/dnscache $(OUTPUT)/rootfs/opt/djbdns-1.05/bin/dnscache - exec makelinks $(OUTPUT)/rootfs /bin /opt/djbdns/bin - exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/dnscache/djbdns-readiness-notification.patch b/sub/dnscache/djbdns-readiness-notification.patch deleted file mode 100644 index 2e1be53..0000000 --- a/sub/dnscache/djbdns-readiness-notification.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- src.old/dnscache.c -+++ src/dnscache.c -@@ -445,5 +445,7 @@ - strerr_die2sys(111,FATAL,"unable to listen on TCP socket: "); - - log_startup(); -+ write(1, "\n", 1); -+ close(1); - doit(); - } ---- src.old/server.c -+++ src/server.c -@@ -104,6 +104,8 @@ - socket_tryreservein(udp53,65536); - - buffer_putsflush(buffer_2,starting); -+ write(1, "\n", 1); -+ close(1); - - for (;;) { - len = socket_recv4(udp53,buf,sizeof buf,ip,&port); diff --git a/sub/dnscache/patch.sed b/sub/dnscache/patch.sed deleted file mode 100644 index 0540d27..0000000 --- a/sub/dnscache/patch.sed +++ /dev/null @@ -1,5 +0,0 @@ -s/choose compile load tryshsgr\.c hasshsgr\.h1 hasshsgr\.h2 chkshsgr /choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 / -s/ar cr /$(TRIPLE)-ar cr / -s/ranlib /$(TRIPLE)-ranlib / -s%\./chkshsgr ||%true ||% -s%\./choose clr tryshsgr hasshsgr\.h1 hasshsgr\.h2 > hasshsgr\.h%cat hasshsgr.h1 > hasshsgr.h% diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile index f804b07..d0941ca 100644 --- a/sub/dropbear/Makefile +++ b/sub/dropbear/Makefile @@ -1,4 +1,3 @@ -include sub/dropbear/Makefile.sftp-server DROPBEAR_VERSION ?= 2019.78 @@ -22,20 +21,19 @@ $(OUTPUT)/build-host/.lh_dropbear_patched: $(OUTPUT)/build-host/.lh_dropbear_cop exec setuidgid $(NORMALUSER) cp -f sub/dropbear/localoptions.h $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION)/localoptions.h exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_dropbear_configured: $(OUTPUT)/build-host/.lh_dropbear_patched $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) export ARCH $(KERNEL_ARCH) export CC $(TRIPLE)-muslgcc export LDFLAGS '-s -static' ./configure --host=$(TRIPLE) --prefix=/opt/dropbear-$(DROPBEAR_VERSION) --disable-syslog --disable-lastlog --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline --without-pam --enable-bundled-libtom --disable-zlib --enable-static +$(OUTPUT)/build-host/.lh_dropbear_configured: $(OUTPUT)/build-host/.lh_dropbear_patched | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) export ARCH $(KERNEL_ARCH) export CC $(BUILD_HOST_CC) export LDFLAGS '-s -static' ./configure --host=$(TRIPLE) --prefix=/opt/dropbear-$(DROPBEAR_VERSION) --disable-syslog --disable-lastlog --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline --without-pam --enable-bundled-libtom --disable-zlib --enable-static exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_dropbear_built: $(OUTPUT)/build-host/.lh_dropbear_configured $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) export PROGRAMS "dropbear dbclient dropbearkey dropbearconvert scp" $(MAKE) ARCH=$(KERNEL_ARCH) +$(OUTPUT)/build-host/.lh_dropbear_built: $(OUTPUT)/build-host/.lh_dropbear_configured | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) $(MAKE) ARCH=$(KERNEL_ARCH) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_dropbear_installed: $(OUTPUT)/build-host/.lh_dropbear_built $(OUTPUT)/build-host/$(OPENSSH_NAME)-$(OPENSSH_VERSION)/sftp-server $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + +$(OUTPUT)/build-host/.lh_dropbear_installed: $(OUTPUT)/build-host/.lh_dropbear_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs exec makenamelink $(OUTPUT)/rootfs/opt dropbear dropbear-$(DROPBEAR_VERSION) $(OUTPUT)/tmp exec cp -f $(OUTPUT)/build-host/dropbear-$(DROPBEAR_VERSION)/scp $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/bin/scp + exec mv -f $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/sbin/dropbear $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/bin/dropbear + exec rmdir $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/sbin exec makelinks $(OUTPUT)/rootfs /bin /opt/dropbear/bin - exec makelinks $(OUTPUT)/rootfs /bin /opt/dropbear/sbin - # The following line happens after the makelinks on purpose: we don't want the sftp-server binary to be exported to /bin - exec cp -f $(OUTPUT)/build-host/$(OPENSSH_NAME)-$(OPENSSH_VERSION)/sftp-server $(OUTPUT)/rootfs/opt/dropbear-$(DROPBEAR_VERSION)/bin/sftp-server exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/dropbear/Makefile.sftp-server b/sub/dropbear/Makefile.sftp-server deleted file mode 100644 index 9d44911..0000000 --- a/sub/dropbear/Makefile.sftp-server +++ /dev/null @@ -1,107 +0,0 @@ - -ZLIB_VERSION := 1.2.11 - -$(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget http://zlib.net/zlib-$(ZLIB_VERSION).tar.gz - -$(OUTPUT)/sources/.lh_zlib_dled: $(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.gz - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_zlib_copied: $(OUTPUT)/sources/.lh_zlib_dled $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION) - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar zxpvf $(OUTPUT)/sources/zlib-$(ZLIB_VERSION).tar.gz - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_zlib_configured: $(OUTPUT)/build-host/.lh_zlib_copied $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION) export CHOST $(TRIPLE) ./configure --prefix=/opt/zlib-$(ZLIB_VERSION) --static - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_zlib_built: $(OUTPUT)/build-host/.lh_zlib_configured $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION) $(MAKE) CHOST=$(TRIPLE) CC=$(TRIPLE)-muslgcc - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_zlib_installed: $(OUTPUT)/build-host/.lh_zlib_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec cd $(OUTPUT)/build-host/zlib-$(ZLIB_VERSION) $(MAKE) install CHOST=$(TRIPLE) CC=$(TRIPLE)-muslgcc DESTDIR=$(OUTPUT)/build-host - exec makenamelink $(OUTPUT)/build-host/opt zlib zlib-$(ZLIB_VERSION) $(OUTPUT)/tmp - exec setuidgid $(NORMALUSER) s6-touch $@ - - -LIBRESSL_NAME := libressl -LIBRESSL_VERSION := 2.7.0 -LIBRESSL_URLDIR := https://ftp.openbsd.org/pub/OpenBSD/LibreSSL -LIBRESSL_TAREXT := tar.gz -LIBRESSL_TARLETTER := z -LIBRESSL_CONFIGURE_OPTIONS := --enable-extratests --disable-shared --enable-static --with-gnu-ld -LIBRESSL_CFLAGS := "" -LIBRESSL_CONFLDFLAGS := "-s -static" -LIBRESSL_MAKELDFLAGS := "-s -all-static" - -$(OUTPUT)/sources/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION).$(LIBRESSL_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget $(LIBRESSL_URLDIR)/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION).$(LIBRESSL_TAREXT) - -$(OUTPUT)/sources/.lh_$(LIBRESSL_NAME)_dled: $(OUTPUT)/sources/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION).$(LIBRESSL_TAREXT) | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_copied: $(OUTPUT)/sources/.lh_$(LIBRESSL_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION) - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar $(LIBRESSL_TARLETTER)xpvf $(OUTPUT)/sources/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION).$(LIBRESSL_TAREXT) - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_configured: $(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_copied $(OUTPUT)/build-host/.lh_zlib_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION) export CFLAGS $(LIBRESSL_CFLAGS) export LDFLAGS $(LIBRESSL_CONFLDFLAGS) export CC muslgcc ./configure --host=$(TRIPLE) --prefix=/opt/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION) $(LIBRESSL_CONFIGURE_OPTIONS) - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_built: $(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_configured $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION) $(MAKE) LDFLAGS=$(LIBRESSL_MAKELDFLAGS) CC=muslgcc - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_installed: $(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec cd $(OUTPUT)/build-host/$(LIBRESSL_NAME)-$(LIBRESSL_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/build-host - exec makenamelink $(OUTPUT)/build-host/opt $(LIBRESSL_NAME) $(LIBRESSL_NAME)-$(LIBRESSL_VERSION) $(OUTPUT)/tmp - exec makelinks $(OUTPUT)/build-host /bin /opt/$(LIBRESSL_NAME)/bin - exec setuidgid $(NORMALUSER) s6-touch $@ - - -OPENSSH_NAME := openssh -OPENSSH_VERSION := 7.6p1 -OPENSSH_URLDIR := http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_TAREXT := tar.gz -OPENSSH_TARLETTER := z -OPENSSH_CONFIGURE_OPTIONS := \ - --disable-etc-default-login \ - --disable-lastlog \ - --disable-utmp \ - --disable-utmpx \ - --disable-wtmp \ - --disable-wtmpx \ - --disable-libutil \ - --disable-pututline \ - --disable-pututxline \ - --without-rpath \ - --without-pie \ - --with-ssl-dir=$(OUTPUT)/build-host/opt/libressl \ - --with-cflags="-I$(OUTPUT)/build-host/opt/zlib/include -I$(OUTPUT)/build-host/opt/libressl/include" \ - --with-ldflags="-s -static -L$(OUTPUT)/build-host/opt/zlib/lib -L$(OUTPUT)/build-host/opt/libressl/lib" - --with-privsep-user=65534 \ - --with-sandbox=rlimit \ - --with-mantype=cat \ - --with-md5-passwords - - -$(OUTPUT)/sources/$(OPENSSH_NAME)-$(OPENSSH_VERSION).$(OPENSSH_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget $(OPENSSH_URLDIR)/$(OPENSSH_NAME)-$(OPENSSH_VERSION).$(OPENSSH_TAREXT) - -$(OUTPUT)/sources/.lh_$(OPENSSH_NAME)_dled: $(OUTPUT)/sources/$(OPENSSH_NAME)-$(OPENSSH_VERSION).$(OPENSSH_TAREXT) | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_$(OPENSSH_NAME)_copied: $(OUTPUT)/sources/.lh_$(OPENSSH_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/$(OPENSSH_NAME)-$(OPENSSH_VERSION) - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar $(OPENSSH_TARLETTER)xpvf $(OUTPUT)/sources/$(OPENSSH_NAME)-$(OPENSSH_VERSION).$(OPENSSH_TAREXT) - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_$(OPENSSH_NAME)_configured: $(OUTPUT)/build-host/.lh_$(OPENSSH_NAME)_copied $(OUTPUT)/build-host/.lh_zlib_installed $(OUTPUT)/build-host/.lh_$(LIBRESSL_NAME)_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(OPENSSH_NAME)-$(OPENSSH_VERSION) export CC "muslgcc -I$(OUTPUT)/build-host/opt/zlib/include -I$(OUTPUT)/build-host/opt/libressl/include -L$(OUTPUT)/build-host/opt/zlib/lib -L$(OUTPUT)/build-host/opt/libressl/lib -s -static" ./configure --host=$(TRIPLE) --prefix=/opt/$(OPENSSH_NAME)-$(OPENSSH_VERSION) $(OPENSSH_CONFIGURE_OPTIONS) - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/$(OPENSSH_NAME)-$(OPENSSH_VERSION)/sftp-server: $(OUTPUT)/build-host/.lh_$(OPENSSH_NAME)_configured $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(OPENSSH_NAME)-$(OPENSSH_VERSION) $(MAKE) sftp-server CC=muslgcc diff --git a/sub/dropbear/localoptions.h b/sub/dropbear/localoptions.h index 493cec3..bdf864b 100644 --- a/sub/dropbear/localoptions.h +++ b/sub/dropbear/localoptions.h @@ -16,7 +16,7 @@ #define DROPBEAR_DH_GROUP16 1 #define XAUTH_COMMAND "/bin/xauth -q" -#define SFTPSERVER_PATH "/opt/dropbear/bin/sftp-server" +#undef SFTPSERVER_PATH #define DROPBEAR_PATH_SSH_PROGRAM "/bin/dbclient" #define DEFAULT_PATH "/command:/bin" diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile index ae6365a..2b0a9d3 100644 --- a/sub/kmod/Makefile +++ b/sub/kmod/Makefile @@ -32,16 +32,16 @@ $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied: $(OUTPUT)/sources/.lh_$(KMOD_NAME exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/$(KMOD_NAME)-$(KMOD_VERSION) $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied $(OUTPUT)/build-build/.lh_xz_installed $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CFLAGS $(KMOD_CFLAGS) export LDFLAGS $(KMOD_LDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS) +$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_copied $(OUTPUT)/build-build/.lh_xz_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src export CC $(BUILD_BUILD_CC) export CFLAGS $(KMOD_CFLAGS) export LDFLAGS $(KMOD_LDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION) $(KMOD_CONFIGURE_OPTIONS) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) CFLAGS="-I $(OUTPUT)/build-build/opt/xz/include" LDFLAGS=$(KMOD_LDFLAGS) LIBS="-llzma" +$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) CC=$(BUILD_BUILD_CC) CFLAGS="-I $(OUTPUT)/build-build/opt/xz/include" LDFLAGS=$(KMOD_LDFLAGS) LIBS="-llzma" exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_installed: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) install +$(OUTPUT)/build-build/.lh_$(KMOD_NAME)_installed: $(OUTPUT)/build-build/.lh_$(KMOD_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/src $(MAKE) install CC=$(BUILD_BUILD_CC) exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(KMOD_NAME) $(KMOD_NAME)-$(KMOD_VERSION) $(OUTPUT)/tmp exec setuidgid $(NORMALUSER) rm -f $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/bin/depmod exec setuidgid $(NORMALUSER) s6-ln -s kmod $(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/bin/depmod diff --git a/sub/layout/Makefile b/sub/layout/Makefile index ce9ebd5..ed63328 100644 --- a/sub/layout/Makefile +++ b/sub/layout/Makefile @@ -1,12 +1,7 @@ $(OUTPUT)/tmp/.lh_layout_copied: $(OUTPUT)/tmp/.lh_prepared layout | $(OUTPUT)/build-build/.lh_skarnet_installed exec sub/layout/copylayout $(OUTPUT) - exec sub/layout/configure-localoptions $(OUTPUT) $(COUNTRY_CODE) $(LOCAL_IP) $(ROUTER_IP) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/tmp/.lh_layout_s6rcdb_made: $(OUTPUT)/tmp/.lh_layout_copied | $(OUTPUT)/build-build/.lh_skarnet_installed - stamp=$$(s6-clock) && s6-rc-compile -v2 -h sysfdh $(OUTPUT)/rootfs/etc/s6-rc/compiled-$$stamp $(OUTPUT)/rootfs/etc/s6-rc/source-base && s6-ln -s compiled-$$stamp $(OUTPUT)/rootfs/etc/s6-rc/compiled.new && s6-rename $(OUTPUT)/rootfs/etc/s6-rc/compiled.new $(OUTPUT)/rootfs/etc/s6-rc/compiled - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/tmp/.lh_layout_installed: $(OUTPUT)/tmp/.lh_layout_copied $(OUTPUT)/tmp/.lh_layout_s6rcdb_made | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/tmp/.lh_layout_installed: $(OUTPUT)/tmp/.lh_layout_copied | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/layout/configure-localoptions b/sub/layout/configure-localoptions deleted file mode 100755 index 451fcce..0000000 --- a/sub/layout/configure-localoptions +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -e - -output="$1" -countrycode="$2" -localip="$3" -routerip="$4" - -case "$countrycode" in - fr) timezone=Europe/Paris ;; - uk) timezone=Europe/London ;; - rs) timezone=Europe/Belgrade ;; - cn) timezone=Asia/Shanghai ;; - vn) timezone=Asia/Saigon ;; - *) echo "invalid countrycode: please choose fr, uk, rs, cn or vn" 1>&2 ; exit 100 ;; -esac - -echo "$countrycode" > $output/rootfs/etc/s6-linux-init/env-stage2/COUNTRY_CODE -echo "$localip" > $output/rootfs/etc/s6-linux-init/env-stage2/ETH0_IP4 -echo "$routerip" > $output/rootfs/etc/s6-linux-init/env-stage2/DEFAULT_ROUTER_IP4 -echo ":$timezone" > $output/rootfs/etc/s6-linux-init/env/TZ diff --git a/sub/layout/copylayout b/sub/layout/copylayout index 82b303e..32b991d 100755 --- a/sub/layout/copylayout +++ b/sub/layout/copylayout @@ -1,64 +1,17 @@ #!/bin/sh -e -# TODO: need comments - output="$1" - -case "$QEMU_ARCH" in - x86_64) disk=sda ; partition=sda ; netmodule=e1000 ; console=ttyS0 ;; - x86) disk=sda ; partition=sda ; netmodule=e1000 ; console=ttyS0 ;; - arm) disk=mmcblk0 ; partition=mmcblk0p ; netmodule=virtio_net ; console=ttyAMA0 ;; - aarch64) disk=mmcblk0 ; partition=mmcblk0p ; netmodule=virtio_net ; console=ttyAMA0 ;; -esac - -if $USE_VIRTIO_DISK ; then - disk=vda - partition=vda -fi - -if $USE_VIRTIO_NETWORK ; then - netmodule=virtio_net -fi - s6-hiercopy layout/rootfs $output/rootfs find "$output/rootfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; -s6-hiercopy layout/rwfs $output/rwfs -find "$output/rwfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; -s6-hiercopy layout/userfs $output/userfs -find "$output/userfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; -s6-hiercopy layout/stagingfs $output/stagingfs -find "$output/stagingfs" -type f -name .empty -size 0c -exec s6-rmrf {} \; -if $USE_GRAPHIC ; then - console=tty1 - echo "load-essential-modules" >> $output/rootfs/etc/s6-rc/source-base/ok-local/contents -fi - -timeout=${S6RC_TIMEOUT} buildtime=$(s6-clock) hostarch=$(s6-echo $TRIPLE | cut -f1 -d-) -sed -i -e "s/%%HOSTNAME%%/lh-$hostarch/g" $output/rootfs/etc/s6-rc/source-base/00/up $output/rootfs/etc/s6-linux-init/run-image/service/s6-linux-init-early-getty/run $output/rootfs/etc/motd $output/rootfs/etc/issue.net $output/rootfs/root/.execline-shell $output/userfs/home/guest/.execline-shell -sed -i -e "s/%%CONSOLE%%/$console/g" $output/rootfs/etc/s6-linux-init/run-image/service/s6-linux-init-early-getty/run -sed -i -e "s/%%NETMODULE%%/$netmodule/g" $output/rootfs/etc/s6-rc/source-base/init-eth0/up -sed -i -e "s/%%RCTIMEOUT%%/$timeout/g" -e "s/%%BUILDTIME%%/$buildtime/g" $output/rootfs/etc/rc.init - - -if $USE_DHCP ; then - eth0_service=udhcpc-eth0-pipeline -else - eth0_service=static-eth0 -fi -# echo ${eth0_service} > $output/rootfs/etc/s6-rc/source-base/activate-eth0/contents - -for i in $output/rootfs/etc/s6-rc/source-base/mount-*/* ; do - sed -i -e "s/%%DISK%%/$disk/g" -e "s/%%PARTITION%%/$partition/g" $i -done - -chown -R root.root $output/rootfs $output/rwfs $output/userfs +sed -i -e "s/%%HOSTNAME%%/lh-$hostarch/g" $output/rootfs/run/service/s6-linux-init-early-getty/run $output/rootfs/etc/motd $output/rootfs/etc/issue.net $output/rootfs/root/.execline-shell +sed -i -e "s/%%CONSOLE%%/$console/g" $output/rootfs/run/service/s6-linux-init-early-getty/run -s6-mkfifo -m 0600 -- $output/rootfs/etc/s6-linux-init/run-image/service/s6-svscan-log/fifo || s6-true +s6-mkfifo -m 0600 $output/rootfs/run/service/s6-svscan-log/fifo while read file user group perms ; do if s6-test -n "$file" -a "$file" != "#" ; then diff --git a/sub/layout/permissions b/sub/layout/permissions index 459355e..d940583 100644 --- a/sub/layout/permissions +++ b/sub/layout/permissions @@ -1,18 +1,7 @@ rootfs/etc/shadow 0 0 0600 -rootfs/etc/s6-linux-init/run-image/uncaught-logs 98 98 2700 +rootfs/run/uncaught-logs 98 98 2700 -rwfs/var/tmp 0 0 1777 -rwfs/var/log/devd 100 61 2700 -rwfs/var/log/dnscache 114 64 2700 -rwfs/var/log/fdholder 135 76 2700 -rwfs/var/log/fdholder-tmp 135 76 2700 -rwfs/var/log/klogd 102 61 2700 -rwfs/var/log/ntpclient 106 62 2700 -rwfs/var/log/sshd-4 138 61 2700 -rwfs/var/log/syslogd 104 61 2700 -# rwfs/var/log/udhcpc-eth0 139 78 2700 - -userfs/home/guest 1000 100 2755 -userfs/home/guest/.execline-shell 1000 100 0755 -userfs/home/guest/.execline-loginshell 1000 100 0755 -userfs/home/guest/.ssh 1000 100 2700 +rootfs/tmp 0 0 1777 +rootfs/var/log/klogd 102 61 2700 +rootfs/var/log/ntpclient 106 62 2700 +rootfs/var/log/sshd-4 138 61 2700 diff --git a/sub/musl/Makefile b/sub/musl/Makefile deleted file mode 100644 index 5a32c81..0000000 --- a/sub/musl/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -MUSL_BASE ?= /opt/musl-git - -# Latest version at 2019-05-03 -MUSL_VERSION := 2df8b1d806c3e1fd4b6b10e13794855a93fe6628 - - -# Build-build - -$(OUTPUT)/sources/.lh_musl_cloned: | $(OUTPUT)/tmp/.lh_prepared - if ! test -d $(OUTPUT)/sources/musl ; then cd $(OUTPUT)/sources && git clone git://git.musl-libc.org/musl musl && cd musl && git checkout $(MUSL_VERSION) ; fi - exec setuidgid $(NORMALUSER) touch $@ - -$(OUTPUT)/build-build/.lh_gcc: $(OUTPUT)/build-build/bin/gcc - exec setuidgid $(NORMALUSER) touch $@ - -$(OUTPUT)/build-build/bin/gcc: | $(OUTPUT)/tmp/.lh_prepared - exec setuidgid $(NORMALUSER) ln -sf $(BUILD_BUILD_CC) $(OUTPUT)/build-build/bin/gcc - - -# Build-host - -$(OUTPUT)/build-host/bin/muslgcc: $(OUTPUT)/build-host/kernel/.lh_headers_installed | $(OUTPUT)/tmp/.lh_layout_installed $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) sub/musl/muslgccmake-buildhost $(OUTPUT) $(TRIPLE) $(BUILD_HOST_CC) - exec setuidgid $(NORMALUSER) s6-ln -sf $(TRIPLE)-muslgcc $@ diff --git a/sub/musl/muslgccmake-buildhost b/sub/musl/muslgccmake-buildhost deleted file mode 100755 index 703efbd..0000000 --- a/sub/musl/muslgccmake-buildhost +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -e - -output="$1" -triple="$2" -xgcc="$3" - -file=$output/build-host/bin/${triple}-muslgcc -echo '#!/bin/sh' > $file -echo "exec $xgcc -isystem $output/rootfs/opt/linux-kernel-headers/include -s \"\$@\"" >> $file -s6-chmod 0755 $file diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index c67d72b..e328322 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -92,8 +92,8 @@ $(OUTPUT)/build-build/.lh_skalibs_copied: $(OUTPUT)/sources/.lh_skalibs_cloned exec setuidgid $(NORMALUSER) cp -RP -- $(OUTPUT)/sources/skalibs $(OUTPUT)/build-build/tmp/skalibs exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-build/.lh_skalibs_configured: $(OUTPUT)/build-build/.lh_skalibs_copied $(OUTPUT)/build-build/.lh_gcc - cd $(OUTPUT)/build-build/tmp/skalibs && setuidgid $(NORMALUSER) ./configure --enable-tai-clock --enable-slashpackage --with-default-path=/command:/bin --disable-shared +$(OUTPUT)/build-build/.lh_skalibs_configured: $(OUTPUT)/build-build/.lh_skalibs_copied + cd $(OUTPUT)/build-build/tmp/skalibs && setuidgid $(NORMALUSER) export CC $(BUILD_BUILD_CC) ./configure --enable-tai-clock --enable-slashpackage --with-default-path=/command:/bin --disable-shared exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_skalibs_built: $(OUTPUT)/build-build/.lh_skalibs_configured @@ -110,8 +110,8 @@ $(OUTPUT)/build-build/.lh_execline_copied: $(OUTPUT)/sources/.lh_execline_cloned exec setuidgid $(NORMALUSER) cp -RP -- $(OUTPUT)/sources/execline $(OUTPUT)/build-build/tmp/execline exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-build/.lh_execline_configured: $(OUTPUT)/build-build/.lh_execline_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_gcc - cd $(OUTPUT)/build-build/tmp/execline && setuidgid $(NORMALUSER) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library +$(OUTPUT)/build-build/.lh_execline_configured: $(OUTPUT)/build-build/.lh_execline_copied $(OUTPUT)/build-build/.lh_skalibs_installed + cd $(OUTPUT)/build-build/tmp/execline && setuidgid $(NORMALUSER) export CC $(BUILD_BUILD_CC) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_execline_built: $(OUTPUT)/build-build/.lh_execline_configured $(OUTPUT)/build-build/.lh_skalibs_installed @@ -128,8 +128,8 @@ $(OUTPUT)/build-build/.lh_s6pu_copied: $(OUTPUT)/sources/.lh_s6pu_cloned exec setuidgid $(NORMALUSER) cp -RP -- $(OUTPUT)/sources/s6-portable-utils $(OUTPUT)/build-build/tmp/s6-portable-utils exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-build/.lh_s6pu_configured: $(OUTPUT)/build-build/.lh_s6pu_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_gcc - cd $(OUTPUT)/build-build/tmp/s6-portable-utils && setuidgid $(NORMALUSER) ./configure --enable-slashpackage --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library +$(OUTPUT)/build-build/.lh_s6pu_configured: $(OUTPUT)/build-build/.lh_s6pu_copied $(OUTPUT)/build-build/.lh_skalibs_installed + cd $(OUTPUT)/build-build/tmp/s6-portable-utils && setuidgid $(NORMALUSER) export CC $(BUILD_BUILD_CC) ./configure --enable-slashpackage --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_s6pu_built: $(OUTPUT)/build-build/.lh_s6pu_configured $(OUTPUT)/build-build/.lh_skalibs_installed @@ -146,8 +146,8 @@ $(OUTPUT)/build-build/.lh_s6_copied: $(OUTPUT)/sources/.lh_s6_cloned exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/s6 $(OUTPUT)/build-build/tmp/s6 exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-build/.lh_s6_configured: $(OUTPUT)/build-build/.lh_s6_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_gcc - cd $(OUTPUT)/build-build/tmp/s6 && setuidgid $(NORMALUSER) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/build-build/package/admin/execline/library +$(OUTPUT)/build-build/.lh_s6_configured: $(OUTPUT)/build-build/.lh_s6_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed + cd $(OUTPUT)/build-build/tmp/s6 && setuidgid $(NORMALUSER) export CC $(BUILD_BUILD_CC) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/build-build/package/admin/execline/library exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_s6_built: $(OUTPUT)/build-build/.lh_s6_configured $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed @@ -164,8 +164,8 @@ $(OUTPUT)/build-build/.lh_s6rc_copied: $(OUTPUT)/sources/.lh_s6rc_cloned exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/s6-rc $(OUTPUT)/build-build/tmp/s6-rc exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-build/.lh_s6rc_configured: $(OUTPUT)/build-build/.lh_s6rc_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6_installed $(OUTPUT)/build-build/.lh_gcc $(OUTPUT)/build-build/.lh_s6_installed - cd $(OUTPUT)/build-build/tmp/s6-rc && setuidgid $(NORMALUSER) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/build-build/package/admin/execline/library --with-include=$(OUTPUT)/build-build/package/admin/s6/include --with-lib=$(OUTPUT)/build-build/package/admin/s6/library +$(OUTPUT)/build-build/.lh_s6rc_configured: $(OUTPUT)/build-build/.lh_s6rc_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6_installed + cd $(OUTPUT)/build-build/tmp/s6-rc && setuidgid $(NORMALUSER) export CC $(BUILD_BUILD_CC) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/build-build/package/admin/execline/library --with-include=$(OUTPUT)/build-build/package/admin/s6/include --with-lib=$(OUTPUT)/build-build/package/admin/s6/library exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_s6rc_built: $(OUTPUT)/build-build/.lh_s6rc_configured $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_execline_installed $(OUTPUT)/build-build/.lh_s6_installed @@ -182,8 +182,8 @@ $(OUTPUT)/build-build/.lh_s6dns_copied: $(OUTPUT)/sources/.lh_s6dns_cloned exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/s6-dns $(OUTPUT)/build-build/tmp/s6-dns exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-build/.lh_s6dns_configured: $(OUTPUT)/build-build/.lh_s6dns_copied $(OUTPUT)/build-build/.lh_skalibs_installed $(OUTPUT)/build-build/.lh_gcc - cd $(OUTPUT)/build-build/tmp/s6-dns && setuidgid $(NORMALUSER) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library +$(OUTPUT)/build-build/.lh_s6dns_configured: $(OUTPUT)/build-build/.lh_s6dns_copied $(OUTPUT)/build-build/.lh_skalibs_installed + cd $(OUTPUT)/build-build/tmp/s6-dns && setuidgid $(NORMALUSER) export CC $(BUILD_BUILD_CC) ./configure --enable-slashpackage --disable-shared --with-sysdeps=$(OUTPUT)/build-build/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/build-build/package/prog/skalibs/include --with-lib=$(OUTPUT)/build-build/package/prog/skalibs/library exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_s6dns_built: $(OUTPUT)/build-build/.lh_s6dns_configured $(OUTPUT)/build-build/.lh_skalibs_installed @@ -208,15 +208,15 @@ $(OUTPUT)/build-host/.lh_skalibs_copied: $(OUTPUT)/sources/.lh_skalibs_cloned | exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/skalibs $(OUTPUT)/build-host/skalibs exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_skalibs_configured: $(OUTPUT)/build-host/.lh_skalibs_copied $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/skalibs export CC muslgcc ./configure --host=$(TRIPLE) --with-sysdeps=$(WD)/sysdeps/$(TRIPLE) --enable-tai-clock --enable-slashpackage --with-default-path=/command:/bin --disable-shared +$(OUTPUT)/build-host/.lh_skalibs_configured: $(OUTPUT)/build-host/.lh_skalibs_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/skalibs ./configure --host=$(TRIPLE) --with-sysdeps=$(WD)/sysdeps/$(TRIPLE) --enable-tai-clock --enable-slashpackage --with-default-path=/command:/bin --disable-shared exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_skalibs_built: $(OUTPUT)/build-host/.lh_skalibs_configured $(OUTPUT)/build-host/bin/muslgcc| $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_skalibs_built: $(OUTPUT)/build-host/.lh_skalibs_configured | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/skalibs $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_skalibs_installed: $(OUTPUT)/build-host/.lh_skalibs_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_skalibs_installed: $(OUTPUT)/build-host/.lh_skalibs_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed cd $(OUTPUT)/build-host/skalibs && $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) touch $@ @@ -226,15 +226,15 @@ $(OUTPUT)/build-host/.lh_execline_copied: $(OUTPUT)/sources/.lh_execline_cloned exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/execline $(OUTPUT)/build-host/execline exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_execline_configured: $(OUTPUT)/build-host/.lh_execline_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/execline export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library +$(OUTPUT)/build-host/.lh_execline_configured: $(OUTPUT)/build-host/.lh_execline_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/execline ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_execline_built: $(OUTPUT)/build-host/.lh_execline_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_execline_built: $(OUTPUT)/build-host/.lh_execline_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/execline $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_execline_installed: $(OUTPUT)/build-host/.lh_execline_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_execline_installed: $(OUTPUT)/build-host/.lh_execline_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/execline $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -244,15 +244,15 @@ $(OUTPUT)/build-host/.lh_s6pu_copied: $(OUTPUT)/sources/.lh_s6pu_cloned | $(OUTP exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-portable-utils $(OUTPUT)/build-host/s6-portable-utils exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6pu_configured: $(OUTPUT)/build-host/.lh_s6pu_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-portable-utils export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library +$(OUTPUT)/build-host/.lh_s6pu_configured: $(OUTPUT)/build-host/.lh_s6pu_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-portable-utils ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6pu_built: $(OUTPUT)/build-host/.lh_s6pu_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6pu_built: $(OUTPUT)/build-host/.lh_s6pu_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-portable-utils $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6pu_installed: $(OUTPUT)/build-host/.lh_s6pu_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6pu_installed: $(OUTPUT)/build-host/.lh_s6pu_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/s6-portable-utils $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -262,15 +262,15 @@ $(OUTPUT)/build-host/.lh_s6lu_copied: $(OUTPUT)/sources/.lh_s6lu_cloned | $(OUTP exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-linux-utils $(OUTPUT)/build-host/s6-linux-utils exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6lu_configured: $(OUTPUT)/build-host/.lh_s6lu_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-utils export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library +$(OUTPUT)/build-host/.lh_s6lu_configured: $(OUTPUT)/build-host/.lh_s6lu_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-utils ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6lu_built: $(OUTPUT)/build-host/.lh_s6lu_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6lu_built: $(OUTPUT)/build-host/.lh_s6lu_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-utils $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6lu_installed: $(OUTPUT)/build-host/.lh_s6lu_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6lu_installed: $(OUTPUT)/build-host/.lh_s6lu_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/s6-linux-utils $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -280,15 +280,15 @@ $(OUTPUT)/build-host/.lh_s6dns_copied: $(OUTPUT)/sources/.lh_s6dns_cloned | $(OU exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-dns $(OUTPUT)/build-host/s6-dns exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6dns_configured: $(OUTPUT)/build-host/.lh_s6dns_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-dns export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library +$(OUTPUT)/build-host/.lh_s6dns_configured: $(OUTPUT)/build-host/.lh_s6dns_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-dns ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6dns_built: $(OUTPUT)/build-host/.lh_s6dns_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6dns_built: $(OUTPUT)/build-host/.lh_s6dns_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-dns $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6dns_installed: $(OUTPUT)/build-host/.lh_s6dns_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6dns_installed: $(OUTPUT)/build-host/.lh_s6dns_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/s6-dns $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -298,15 +298,15 @@ $(OUTPUT)/build-host/.lh_s6net_copied: $(OUTPUT)/sources/.lh_s6net_cloned | $(OU exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-networking $(OUTPUT)/build-host/s6-networking exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6net_configured: $(OUTPUT)/build-host/.lh_s6net_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_bearssl_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-networking export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --enable-ssl=bearssl --with-ssl-path=$(OUTPUT)/rootfs/opt/bearssl --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/rootfs/package/web/s6-dns/include --with-lib=$(OUTPUT)/rootfs/package/web/s6-dns/library --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-include=$(OUTPUT)/rootfs/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library +$(OUTPUT)/build-host/.lh_s6net_configured: $(OUTPUT)/build-host/.lh_s6net_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_bearssl_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-networking ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --enable-ssl=bearssl --with-ssl-path=$(OUTPUT)/rootfs/opt/bearssl --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/rootfs/package/web/s6-dns/include --with-lib=$(OUTPUT)/rootfs/package/web/s6-dns/library --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-include=$(OUTPUT)/rootfs/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6net_built: $(OUTPUT)/build-host/.lh_s6net_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6net_built: $(OUTPUT)/build-host/.lh_s6net_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_bearssl_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-networking $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6net_installed: $(OUTPUT)/build-host/.lh_s6net_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6net_installed: $(OUTPUT)/build-host/.lh_s6net_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/s6-networking $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -316,15 +316,15 @@ $(OUTPUT)/build-host/.lh_s6_copied: $(OUTPUT)/sources/.lh_s6_cloned | $(OUTPUT)/ exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6 $(OUTPUT)/build-host/s6 exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6_configured: $(OUTPUT)/build-host/.lh_s6_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6 export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library +$(OUTPUT)/build-host/.lh_s6_configured: $(OUTPUT)/build-host/.lh_s6_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6 ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6_built: $(OUTPUT)/build-host/.lh_s6_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6_built: $(OUTPUT)/build-host/.lh_s6_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6 $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6_installed: $(OUTPUT)/build-host/.lh_s6_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6_installed: $(OUTPUT)/build-host/.lh_s6_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/s6 $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -334,15 +334,15 @@ $(OUTPUT)/build-host/.lh_s6rc_copied: $(OUTPUT)/sources/.lh_s6rc_cloned | $(OUTP exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-rc $(OUTPUT)/build-host/s6-rc exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6rc_configured: $(OUTPUT)/build-host/.lh_s6rc_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-rc export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-include=$(OUTPUT)/rootfs/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library +$(OUTPUT)/build-host/.lh_s6rc_configured: $(OUTPUT)/build-host/.lh_s6rc_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-rc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/rootfs/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-include=$(OUTPUT)/rootfs/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-host/.lh_s6rc_built: $(OUTPUT)/build-host/.lh_s6rc_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6rc_built: $(OUTPUT)/build-host/.lh_s6rc_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-rc $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6rc_installed: $(OUTPUT)/build-host/.lh_s6rc_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6rc_installed: $(OUTPUT)/build-host/.lh_s6rc_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/s6-rc $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -352,15 +352,15 @@ $(OUTPUT)/build-host/.lh_s6li_copied: $(OUTPUT)/sources/.lh_s6li_cloned | $(OUTP exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/s6-linux-init $(OUTPUT)/build-host/s6-linux-init exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6li_configured: $(OUTPUT)/build-host/.lh_s6li_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-init export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-include=$(OUTPUT)/build-build/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library +$(OUTPUT)/build-host/.lh_s6li_configured: $(OUTPUT)/build-host/.lh_s6li_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-init ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library --with-include=$(OUTPUT)/build-build/package/admin/execline/include --with-lib=$(OUTPUT)/rootfs/package/admin/execline/library --with-include=$(OUTPUT)/build-build/package/admin/s6/include --with-lib=$(OUTPUT)/rootfs/package/admin/s6/library exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-host/.lh_s6li_built: $(OUTPUT)/build-host/.lh_s6li_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6li_built: $(OUTPUT)/build-host/.lh_s6li_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/s6-linux-init $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_s6li_installed: $(OUTPUT)/build-host/.lh_s6li_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_s6li_installed: $(OUTPUT)/build-host/.lh_s6li_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/s6-linux-init $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -370,15 +370,15 @@ $(OUTPUT)/build-host/.lh_mdevd_copied: $(OUTPUT)/sources/.lh_mdevd_cloned | $(OU exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/mdevd $(OUTPUT)/build-host/mdevd exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_mdevd_configured: $(OUTPUT)/build-host/.lh_mdevd_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/mdevd export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library +$(OUTPUT)/build-host/.lh_mdevd_configured: $(OUTPUT)/build-host/.lh_mdevd_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/mdevd ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-host/.lh_mdevd_built: $(OUTPUT)/build-host/.lh_mdevd_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_mdevd_built: $(OUTPUT)/build-host/.lh_mdevd_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/mdevd $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_mdevd_installed: $(OUTPUT)/build-host/.lh_mdevd_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_mdevd_installed: $(OUTPUT)/build-host/.lh_mdevd_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/mdevd $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ @@ -388,18 +388,18 @@ $(OUTPUT)/build-host/.lh_bcnm_copied: $(OUTPUT)/sources/.lh_bcnm_cloned | $(OUTP exec setuidgid $(NORMALUSER) s6-hiercopy $(OUTPUT)/sources/bcnm $(OUTPUT)/build-host/bcnm exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_bcnm_configured: $(OUTPUT)/build-host/.lh_bcnm_copied $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/bcnm export CC muslgcc ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library +$(OUTPUT)/build-host/.lh_bcnm_configured: $(OUTPUT)/build-host/.lh_bcnm_copied $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/bcnm ./configure --host=$(TRIPLE) --enable-slashpackage --enable-static-libc --with-sysdeps=$(OUTPUT)/rootfs/package/prog/skalibs/sysdeps --with-include=$(OUTPUT)/rootfs/package/prog/skalibs/include --with-lib=$(OUTPUT)/rootfs/package/prog/skalibs/library exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-host/.lh_bcnm_built: $(OUTPUT)/build-host/.lh_bcnm_configured $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_bcnm_built: $(OUTPUT)/build-host/.lh_bcnm_configured $(OUTPUT)/build-host/.lh_skalibs_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/bcnm $(MAKE) all strip exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_bcnm_installed: $(OUTPUT)/build-host/.lh_bcnm_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_bcnm_installed: $(OUTPUT)/build-host/.lh_bcnm_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed exec cd $(OUTPUT)/build-host/bcnm $(MAKE) install update global-links DESTDIR=$(OUTPUT)/rootfs exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_skarnet_installed: $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6pu_installed $(OUTPUT)/build-host/.lh_s6lu_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_s6net_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_s6rc_installed $(OUTPUT)/build-host/.lh_s6li_installed $(OUTPUT)/build-host/.lh_mdevd_installed $(OUTPUT)/build-host/.lh_mdevd_installed $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-host/.lh_skarnet_installed: $(OUTPUT)/build-host/.lh_skalibs_installed $(OUTPUT)/build-host/.lh_execline_installed $(OUTPUT)/build-host/.lh_s6pu_installed $(OUTPUT)/build-host/.lh_s6lu_installed $(OUTPUT)/build-host/.lh_s6dns_installed $(OUTPUT)/build-host/.lh_s6net_installed $(OUTPUT)/build-host/.lh_s6_installed $(OUTPUT)/build-host/.lh_s6rc_installed $(OUTPUT)/build-host/.lh_s6li_installed $(OUTPUT)/build-host/.lh_mdevd_installed $(OUTPUT)/build-host/.lh_mdevd_installed $(OUTPUT)/build-host/.lh_bcnm_installed | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/socklog/Makefile b/sub/socklog/Makefile deleted file mode 100644 index e0c9673..0000000 --- a/sub/socklog/Makefile +++ /dev/null @@ -1,32 +0,0 @@ - -$(OUTPUT)/sources/socklog-2.1.0.tar.gz: | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget http://smarden.org/socklog/socklog-2.1.0.tar.gz - -$(OUTPUT)/sources/.lh_socklog_dled: $(OUTPUT)/sources/socklog-2.1.0.tar.gz | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_socklog_copied: $(OUTPUT)/sources/.lh_socklog_dled | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-host/package/admin/socklog-2.1.0 - exec setuidgid $(NORMALUSER) s6-mkdir -p -- $(OUTPUT)/build-host/package - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/package tar zxpvf $(OUTPUT)/sources/socklog-2.1.0.tar.gz - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_socklog_patched: $(OUTPUT)/build-host/.lh_socklog_copied | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) sed -f $(WD)/sub/socklog/patch.sed $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/Makefile > $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/Makefile.patched - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_socklog_configured: $(OUTPUT)/build-host/.lh_socklog_copied | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-echo "muslgcc -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -include errno.h" > $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/conf-cc - exec setuidgid $(NORMALUSER) s6-echo "muslgcc -s -static" > $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/conf-ld - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_socklog_built: $(OUTPUT)/build-host/.lh_socklog_configured $(OUTPUT)/build-host/.lh_socklog_patched $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src $(MAKE) -f Makefile.patched socklog - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-host/.lh_socklog_installed: $(OUTPUT)/build-host/.lh_socklog_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec s6-mkdir -p -m 0755 $(OUTPUT)/rootfs/package/admin/socklog-2.1.0/command - exec makenamelink $(OUTPUT)/rootfs/package/admin socklog socklog-2.1.0 $(OUTPUT)/tmp - exec cp -f $(OUTPUT)/build-host/package/admin/socklog-2.1.0/src/socklog $(OUTPUT)/rootfs/package/admin/socklog-2.1.0/command/socklog - exec makelinks $(OUTPUT)/rootfs /command /package/admin/socklog/command - exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/socklog/patch.sed b/sub/socklog/patch.sed deleted file mode 100644 index 0540d27..0000000 --- a/sub/socklog/patch.sed +++ /dev/null @@ -1,5 +0,0 @@ -s/choose compile load tryshsgr\.c hasshsgr\.h1 hasshsgr\.h2 chkshsgr /choose compile load tryshsgr.c hasshsgr.h1 hasshsgr.h2 / -s/ar cr /$(TRIPLE)-ar cr / -s/ranlib /$(TRIPLE)-ranlib / -s%\./chkshsgr ||%true ||% -s%\./choose clr tryshsgr hasshsgr\.h1 hasshsgr\.h2 > hasshsgr\.h%cat hasshsgr.h1 > hasshsgr.h% diff --git a/sub/syslinux/Makefile b/sub/syslinux/Makefile deleted file mode 100644 index 8c7f5d2..0000000 --- a/sub/syslinux/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -LIBUUID_NAME := libuuid -LIBUUID_VERSION := 1.0.3 -LIBUUID_URLDIR := http://skarnet.org/archive -LIBUUID_TAREXT := tar.gz -LIBUUID_TARLETTER := z - -NASM_NAME := nasm -NASM_VERSION := 2.12.02 -NASM_TAREXT := tar.xz -NASM_TARLETTER := J -NASM_URLDIR = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) - -SYSLINUX_NAME := syslinux -SYSLINUX_VERSION := 6.03 -SYSLINUX_URLDIR := https://cdn.kernel.org/pub/linux/utils/boot/$(SYSLINUX_NAME) -SYSLINUX_TAREXT := tar.xz -SYSLINUX_TARLETTER := J - -SYSLINUX_CFLAGS := "-I $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/include" -SYSLINUX_LDFLAGS := "-s -L $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/lib" -SYSLINUX_INSTALLROOT := $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION) - - - -$(OUTPUT)/sources/$(LIBUUID_NAME)-$(LIBUUID_VERSION).$(LIBUUID_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget $(LIBUUID_URLDIR)/$(LIBUUID_NAME)-$(LIBUUID_VERSION).$(LIBUUID_TAREXT) - -$(OUTPUT)/sources/.lh_$(LIBUUID_NAME)_dled: $(OUTPUT)/sources/$(LIBUUID_NAME)-$(LIBUUID_VERSION).$(LIBUUID_TAREXT) | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/sources/$(NASM_NAME)-$(NASM_VERSION).$(NASM_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget $(NASM_URLDIR)/$(NASM_NAME)-$(NASM_VERSION).$(NASM_TAREXT) - -$(OUTPUT)/sources/.lh_$(NASM_NAME)_dled: $(OUTPUT)/sources/$(NASM_NAME)-$(NASM_VERSION).$(NASM_TAREXT) | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/sources/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION).$(SYSLINUX_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/sources wget $(SYSLINUX_URLDIR)/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION).$(SYSLINUX_TAREXT) - -$(OUTPUT)/sources/.lh_$(SYSLINUX_NAME)_dled: $(OUTPUT)/sources/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION).$(SYSLINUX_TAREXT) | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-touch $@ - - -$(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_copied: $(OUTPUT)/sources/.lh_$(LIBUUID_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION) - exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION) - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION) tar $(LIBUUID_TARLETTER)xpvf $(OUTPUT)/sources/$(LIBUUID_NAME)-$(LIBUUID_VERSION).$(LIBUUID_TAREXT) - exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION)/$(LIBUUID_NAME)-$(LIBUUID_VERSION) $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION)/src - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_configured: $(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_copied $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION)/src ./configure --prefix=$(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION) --enable-static --disable-shared - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_built: $(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_configured $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION)/src $(MAKE) - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_installed: $(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_built $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)-$(LIBUUID_VERSION)/src $(MAKE) install - exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(LIBUUID_NAME) $(LIBUUID_NAME)-$(LIBUUID_VERSION) $(OUTPUT)/tmp - exec setuidgid $(NORMALUSER) s6-touch $@ - - -$(OUTPUT)/build-build/.lh_$(NASM_NAME)_copied: $(OUTPUT)/sources/.lh_$(NASM_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION) - exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION) - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION) tar $(NASM_TARLETTER)xpvf $(OUTPUT)/sources/$(NASM_NAME)-$(NASM_VERSION).$(NASM_TAREXT) - exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/$(NASM_NAME)-$(NASM_VERSION) $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(NASM_NAME)_configured: $(OUTPUT)/build-build/.lh_$(NASM_NAME)_copied $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src ./configure --prefix=$(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION) - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(NASM_NAME)_built: $(OUTPUT)/build-build/.lh_$(NASM_NAME)_copied $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src $(MAKE) - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(NASM_NAME)_installed: $(OUTPUT)/build-build/.lh_$(NASM_NAME)_built $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION)/src $(MAKE) install - exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(NASM_NAME) $(NASM_NAME)-$(NASM_VERSION) $(OUTPUT)/tmp - exec setuidgid $(NORMALUSER) s6-touch $@ - - -$(OUTPUT)/build-build/.lh_$(SYSLINUX_NAME)_copied: $(OUTPUT)/sources/.lh_$(SYSLINUX_NAME)_dled sub/syslinux/syslinux-extraflags.patch sub/syslinux/syslinux-gcc5-1.patch sub/syslinux/syslinux-gcc5-2.patch sub/syslinux/syslinux-gcc5-3.patch sub/syslinux/syslinux-inttypes.patch sub/syslinux/syslinux-oknogit.patch | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION) - exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION) - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION) tar $(SYSLINUX_TARLETTER)xpvf $(OUTPUT)/sources/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION).$(SYSLINUX_TAREXT) - exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION) $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src redirfd -r 0 $(WD)/sub/syslinux/syslinux-extraflags.patch patch -p1 - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src redirfd -r 0 $(WD)/sub/syslinux/syslinux-gcc5-1.patch patch -p1 - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src redirfd -r 0 $(WD)/sub/syslinux/syslinux-gcc5-2.patch patch -p1 - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src redirfd -r 0 $(WD)/sub/syslinux/syslinux-gcc5-3.patch patch -p1 - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src redirfd -r 0 $(WD)/sub/syslinux/syslinux-inttypes.patch patch -p1 - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src redirfd -r 0 $(WD)/sub/syslinux/syslinux-oknogit.patch patch -p1 - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(SYSLINUX_NAME)_built: $(OUTPUT)/build-build/.lh_$(SYSLINUX_NAME)_copied $(OUTPUT)/build-build/.lh_$(LIBUUID_NAME)_installed $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION)/src export INSTALLROOT $(SYSLINUX_INSTALLROOT) export EXTRA_CFLAGS $(SYSLINUX_CFLAGS) export EXTRA_LDFLAGS $(SYSLINUX_LDFLAGS) if $(MAKE) clean "" if $(MAKE) installer "" make install - exec setuidgid $(NORMALUSER) s6-touch $@ - -$(OUTPUT)/build-build/.lh_$(SYSLINUX_NAME)_installed: $(OUTPUT)/build-build/.lh_$(SYSLINUX_NAME)_built $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(SYSLINUX_NAME) $(SYSLINUX_NAME)-$(SYSLINUX_VERSION) $(OUTPUT)/tmp - exec setuidgid $(NORMALUSER) makelinks $(OUTPUT)/build-build /bin /opt/$(SYSLINUX_NAME)/sbin - exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/syslinux/syslinux-extraflags.patch b/sub/syslinux/syslinux-extraflags.patch deleted file mode 100644 index df64345..0000000 --- a/sub/syslinux/syslinux-extraflags.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src.tmp/core/Makefile -+++ src/core/Makefile -@@ -26,7 +26,7 @@ - - OPTFLAGS = - INCLUDES = -I$(SRC)/include -I$(com32)/include -I$(com32)/include/sys -I$(com32)/lib \ -- -I$(SRC)/lwip/src/include -I$(SRC)/lwip/src/include/ipv4 -I$(SRC)/fs/pxe -+ -I$(SRC)/lwip/src/include -I$(SRC)/lwip/src/include/ipv4 -I$(SRC)/fs/pxe $(EXTRA_CFLAGS) - - # This is very similar to cp437; technically it's for Norway and Denmark, - # but it's unlikely the characters that are different will be used in ---- src.tmp/extlinux/Makefile -+++ src/extlinux/Makefile -@@ -17,10 +17,10 @@ - include $(MAKEDIR)/syslinux.mk - - OPTFLAGS = -g -Os --INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libinstaller -+INCLUDES = -I$(SRC) -I$(objdir) -I$(SRC)/../libinstaller $(EXTRA_CFLAGS) - CFLAGS = $(GCCWARN) -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \ - $(OPTFLAGS) $(INCLUDES) --LDFLAGS = -+LDFLAGS = $(EXTRA_LDFLAGS) - - SRCS = main.c \ - mountinfo.c \ ---- src.tmp/utils/Makefile -+++ src/utils/Makefile -@@ -17,8 +17,8 @@ - VPATH = $(SRC) - include $(MAKEDIR)/syslinux.mk - --CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC) --LDFLAGS = -O2 -+CFLAGS = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC) $(EXTRA_CFLAGS) -+LDFLAGS = -O2 $(EXTRA_LDFLAGS) - - C_TARGETS = isohybrid gethostip memdiskfind - SCRIPT_TARGETS = mkdiskimage diff --git a/sub/syslinux/syslinux-gcc5-1.patch b/sub/syslinux/syslinux-gcc5-1.patch deleted file mode 100644 index 380b05a..0000000 --- a/sub/syslinux/syslinux-gcc5-1.patch +++ /dev/null @@ -1,81 +0,0 @@ -From e5f2b577ded109291c9632dacb6eaa621d8a59fe Mon Sep 17 00:00:00 2001 -From: Sylvain Gault <sylvain.gault@gmail.com> -Date: Tue, 29 Sep 2015 02:38:25 +0200 -Subject: [PATCH 1/1] bios: Fix alignment change with gcc 5 - -The section aligment specified in the ld scripts have to be greater or -equal to those in the .o files generated by gcc. - -Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com> -Tested-by: poma <pomidorabelisima@gmail.com> -Signed-off-by: Paulo Alcantara <pcacjr@zytor.com> ---- - core/i386/syslinux.ld | 6 +++--- - core/x86_64/syslinux.ld | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld -index 7b4e012..7390451 100644 ---- a/core/i386/syslinux.ld -+++ b/core/i386/syslinux.ld -@@ -266,7 +266,7 @@ SECTIONS - __text_end = .; - } - -- . = ALIGN(16); -+ . = ALIGN(32); - - __rodata_vma = .; - __rodata_lma = __rodata_vma + __text_lma - __text_vma; -@@ -361,7 +361,7 @@ SECTIONS - __dynamic_end = .; - } - -- . = ALIGN(16); -+ . = ALIGN(32); - - __data_vma = .; - __data_lma = __data_vma + __text_lma - __text_vma; -@@ -377,7 +377,7 @@ SECTIONS - __pm_code_dwords = (__pm_code_len + 3) >> 2; - - . = ALIGN(128); -- -+ - __bss_vma = .; - __bss_lma = .; /* Dummy */ - .bss (NOLOAD) : AT (__bss_lma) { -diff --git a/core/x86_64/syslinux.ld b/core/x86_64/syslinux.ld -index 1057112..bf815c4 100644 ---- a/core/x86_64/syslinux.ld -+++ b/core/x86_64/syslinux.ld -@@ -266,7 +266,7 @@ SECTIONS - __text_end = .; - } - -- . = ALIGN(16); -+ . = ALIGN(32); - - __rodata_vma = .; - __rodata_lma = __rodata_vma + __text_lma - __text_vma; -@@ -361,7 +361,7 @@ SECTIONS - __dynamic_end = .; - } - -- . = ALIGN(16); -+ . = ALIGN(32); - - __data_vma = .; - __data_lma = __data_vma + __text_lma - __text_vma; -@@ -377,7 +377,7 @@ SECTIONS - __pm_code_dwords = (__pm_code_len + 3) >> 2; - - . = ALIGN(128); -- -+ - __bss_vma = .; - __bss_lma = .; /* Dummy */ - .bss (NOLOAD) : AT (__bss_lma) { --- -2.7.4.GIT - diff --git a/sub/syslinux/syslinux-gcc5-2.patch b/sub/syslinux/syslinux-gcc5-2.patch deleted file mode 100644 index da436f6..0000000 --- a/sub/syslinux/syslinux-gcc5-2.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 0cc9a99e560a2f52bcf052fd85b1efae35ee812f Mon Sep 17 00:00:00 2001 -From: Sylvain Gault <sylvain.gault@gmail.com> -Date: Tue, 29 Sep 2015 04:45:09 +0200 -Subject: [PATCH 1/1] bios: Don't try to guess the sections alignment - -For the compression / decompression to succeed, the sections layout must -be the same between the virtual memory and load memory. The section -alignment was kept in sync by introducing aligment that should be -greater or equal to the actual section alignment. - -This patch compute the load memory addresses of the sections so that -the layout is the same as the virtual memory addresses. - -Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com> -Tested-by: poma <pomidorabelisima@gmail.com> -Signed-off-by: Paulo Alcantara <pcacjr@zytor.com> ---- - core/i386/syslinux.ld | 63 ++++++++++--------------------------------------- - core/x86_64/syslinux.ld | 63 ++++++++++--------------------------------------- - 2 files changed, 24 insertions(+), 102 deletions(-) - -diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld -index 7390451..92b75b1 100644 ---- a/core/i386/syslinux.ld -+++ b/core/i386/syslinux.ld -@@ -255,10 +255,9 @@ SECTIONS - . = 0x100000; - - __pm_code_start = .; -+ __vma_to_lma = __pm_code_lma - __pm_code_start; - -- __text_vma = .; -- __text_lma = __pm_code_lma; -- .text : AT(__text_lma) { -+ .text : AT(ADDR(.text) + __vma_to_lma) { - FILL(0x90909090) - __text_start = .; - *(.text) -@@ -266,106 +265,68 @@ SECTIONS - __text_end = .; - } - -- . = ALIGN(32); -- -- __rodata_vma = .; -- __rodata_lma = __rodata_vma + __text_lma - __text_vma; -- .rodata : AT(__rodata_lma) { -+ .rodata : AT(ADDR(.rodata) + __vma_to_lma) { - __rodata_start = .; - *(.rodata) - *(.rodata.*) - __rodata_end = .; - } - -- . = ALIGN(4); -- -- __ctors_vma = .; -- __ctors_lma = __ctors_vma + __text_lma - __text_vma; -- .ctors : AT(__ctors_lma) { -+ .ctors : AT(ADDR(.ctors) + __vma_to_lma) { - __ctors_start = .; - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - __ctors_end = .; - } - -- __dtors_vma = .; -- __dtors_lma = __dtors_vma + __text_lma - __text_vma; -- .dtors : AT(__dtors_lma) { -+ .dtors : AT(ADDR(.dtors) + __vma_to_lma) { - __dtors_start = .; - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - __dtors_end = .; - } - -- . = ALIGN(4); -- -- __dynsym_vma = .; -- __dynsym_lma = __dynsym_vma + __text_lma - __text_vma; -- .dynsym : AT(__dynsym_lma) { -+ .dynsym : AT(ADDR(.dynsym) + __vma_to_lma) { - __dynsym_start = .; - *(.dynsym) - __dynsym_end = .; - } - __dynsym_len = __dynsym_end - __dynsym_start; - -- . = ALIGN(4); -- -- __dynstr_vma = .; -- __dynstr_lma = __dynstr_vma + __text_lma - __text_vma; -- .dynstr : AT(__dynstr_lma) { -+ .dynstr : AT(ADDR(.dynstr) + __vma_to_lma) { - __dynstr_start = .; - *(.dynstr) - __dynstr_end = .; - } - __dynstr_len = __dynstr_end - __dynstr_start; - -- . = ALIGN(4); -- -- __gnu_hash_vma = .; -- __gnu_hash_lma = __gnu_hash_vma + __text_lma - __text_vma; -- .gnu.hash : AT(__gnu_hash_lma) { -+ .gnu.hash : AT(ADDR(.gnu.hash) + __vma_to_lma) { - __gnu_hash_start = .; - *(.gnu.hash) - __gnu_hash_end = .; - } - - -- . = ALIGN(4); -- -- __dynlink_vma = .; -- __dynlink_lma = __dynlink_vma + __text_lma - __text_vma; -- .dynlink : AT(__dynlink_lma) { -+ .dynlink : AT(ADDR(.dynlink) + __vma_to_lma) { - __dynlink_start = .; - *(.dynlink) - __dynlink_end = .; - } - -- . = ALIGN(4); -- -- __got_vma = .; -- __got_lma = __got_vma + __text_lma - __text_vma; -- .got : AT(__got_lma) { -+ .got : AT(ADDR(.got) + __vma_to_lma) { - __got_start = .; - KEEP (*(.got.plt)) - KEEP (*(.got)) - __got_end = .; - } - -- . = ALIGN(4); -- -- __dynamic_vma = .; -- __dynamic_lma = __dynamic_vma + __text_lma - __text_vma; -- .dynamic : AT(__dynamic_lma) { -+ .dynamic : AT(ADDR(.dynamic) + __vma_to_lma) { - __dynamic_start = .; - *(.dynamic) - __dynamic_end = .; - } - -- . = ALIGN(32); -- -- __data_vma = .; -- __data_lma = __data_vma + __text_lma - __text_vma; -- .data : AT(__data_lma) { -+ .data : AT(ADDR(.data) + __vma_to_lma) { - __data_start = .; - *(.data) - *(.data.*) -diff --git a/core/x86_64/syslinux.ld b/core/x86_64/syslinux.ld -index bf815c4..70c6e00 100644 ---- a/core/x86_64/syslinux.ld -+++ b/core/x86_64/syslinux.ld -@@ -255,10 +255,9 @@ SECTIONS - . = 0x100000; - - __pm_code_start = .; -+ __vma_to_lma = __pm_code_lma - __pm_code_start; - -- __text_vma = .; -- __text_lma = __pm_code_lma; -- .text : AT(__text_lma) { -+ .text : AT(ADDR(.text) + __vma_to_lma) { - FILL(0x90909090) - __text_start = .; - *(.text) -@@ -266,106 +265,68 @@ SECTIONS - __text_end = .; - } - -- . = ALIGN(32); -- -- __rodata_vma = .; -- __rodata_lma = __rodata_vma + __text_lma - __text_vma; -- .rodata : AT(__rodata_lma) { -+ .rodata : AT(ADDR(.rodata) + __vma_to_lma) { - __rodata_start = .; - *(.rodata) - *(.rodata.*) - __rodata_end = .; - } - -- . = ALIGN(4); -- -- __ctors_vma = .; -- __ctors_lma = __ctors_vma + __text_lma - __text_vma; -- .ctors : AT(__ctors_lma) { -+ .ctors : AT(ADDR(.ctors) + __vma_to_lma) { - __ctors_start = .; - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - __ctors_end = .; - } - -- __dtors_vma = .; -- __dtors_lma = __dtors_vma + __text_lma - __text_vma; -- .dtors : AT(__dtors_lma) { -+ .dtors : AT(ADDR(.dtors) + __vma_to_lma) { - __dtors_start = .; - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - __dtors_end = .; - } - -- . = ALIGN(4); -- -- __dynsym_vma = .; -- __dynsym_lma = __dynsym_vma + __text_lma - __text_vma; -- .dynsym : AT(__dynsym_lma) { -+ .dynsym : AT(ADDR(.dynsym) + __vma_to_lma) { - __dynsym_start = .; - *(.dynsym) - __dynsym_end = .; - } - __dynsym_len = __dynsym_end - __dynsym_start; - -- . = ALIGN(4); -- -- __dynstr_vma = .; -- __dynstr_lma = __dynstr_vma + __text_lma - __text_vma; -- .dynstr : AT(__dynstr_lma) { -+ .dynstr : AT(ADDR(.dynstr) + __vma_to_lma) { - __dynstr_start = .; - *(.dynstr) - __dynstr_end = .; - } - __dynstr_len = __dynstr_end - __dynstr_start; - -- . = ALIGN(4); -- -- __gnu_hash_vma = .; -- __gnu_hash_lma = __gnu_hash_vma + __text_lma - __text_vma; -- .gnu.hash : AT(__gnu_hash_lma) { -+ .gnu.hash : AT(ADDR(.gnu.hash) + __vma_to_lma) { - __gnu_hash_start = .; - *(.gnu.hash) - __gnu_hash_end = .; - } - - -- . = ALIGN(4); -- -- __dynlink_vma = .; -- __dynlink_lma = __dynlink_vma + __text_lma - __text_vma; -- .dynlink : AT(__dynlink_lma) { -+ .dynlink : AT(ADDR(.dynlink) + __vma_to_lma) { - __dynlink_start = .; - *(.dynlink) - __dynlink_end = .; - } - -- . = ALIGN(4); -- -- __got_vma = .; -- __got_lma = __got_vma + __text_lma - __text_vma; -- .got : AT(__got_lma) { -+ .got : AT(ADDR(.got) + __vma_to_lma) { - __got_start = .; - KEEP (*(.got.plt)) - KEEP (*(.got)) - __got_end = .; - } - -- . = ALIGN(4); -- -- __dynamic_vma = .; -- __dynamic_lma = __dynamic_vma + __text_lma - __text_vma; -- .dynamic : AT(__dynamic_lma) { -+ .dynamic : AT(ADDR(.dynamic) + __vma_to_lma) { - __dynamic_start = .; - *(.dynamic) - __dynamic_end = .; - } - -- . = ALIGN(32); -- -- __data_vma = .; -- __data_lma = __data_vma + __text_lma - __text_vma; -- .data : AT(__data_lma) { -+ .data : AT(ADDR(.data) + __vma_to_lma) { - __data_start = .; - *(.data) - *(.data.*) --- -2.7.4.GIT - diff --git a/sub/syslinux/syslinux-gcc5-3.patch b/sub/syslinux/syslinux-gcc5-3.patch deleted file mode 100644 index e4d4655..0000000 --- a/sub/syslinux/syslinux-gcc5-3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8dc6d758b564a1ccc44c3ae11f265d43628219ce Mon Sep 17 00:00:00 2001 -From: Sylvain Gault <sylvain.gault@gmail.com> -Date: Tue, 13 Oct 2015 06:18:07 +0200 -Subject: [PATCH 1/1] ldlinux: Fix return pointer to local data - -The command-line parsing used to return a pointer to a local array. The -code used to work by chance, but now, gcc 5 is able to detect it and -return a NULL pointer instead. - -The buffer is now marked static. This shouldn't be a problem as only one -command line can be read at a time. - -Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com> -Tested-by: poma <pomidorabelisima at gmail.com> -Signed-off-by: Paulo Alcantara <pcacjr@zytor.com> ---- - com32/elflink/ldlinux/cli.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c -index 6ff30c6..3119b11 100644 ---- a/com32/elflink/ldlinux/cli.c -+++ b/com32/elflink/ldlinux/cli.c -@@ -125,7 +125,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , - int (*pDraw_Menu) (int, int, int), - void (*show_fkey) (int), bool *timedout) - { -- char cmdline[MAX_CMDLINE_LEN] = { }; -+ static char cmdline[MAX_CMDLINE_LEN] = { }; - int key, len, prev_len, cursor; - int redraw = 0; - int x, y; --- -2.7.4.GIT - diff --git a/sub/syslinux/syslinux-inttypes.patch b/sub/syslinux/syslinux-inttypes.patch deleted file mode 100644 index 79cc36c..0000000 --- a/sub/syslinux/syslinux-inttypes.patch +++ /dev/null @@ -1,310 +0,0 @@ ---- src.tmp/efi/wrapper.c -+++ src/efi/wrapper.c -@@ -43,8 +43,8 @@ - * For 64bit machines (class == ELFCLASS64), the optional - * header includes PE32+header fields - */ --static void write_header(FILE *f, __uint32_t entry, size_t data_size, -- __uint32_t so_memsz, __uint8_t class) -+static void write_header(FILE *f, uint32_t entry, size_t data_size, -+ uint32_t so_memsz, uint8_t class) - { - struct optional_hdr o_hdr; - struct optional_hdr_pe32p o_hdr_pe32p; -@@ -53,9 +53,9 @@ - struct extra_hdr_pe32p e_hdr_pe32p; - struct coff_hdr c_hdr; - struct header hdr; -- __uint32_t total_sz = data_size; -- __uint32_t hdr_sz; -- __uint32_t reloc_start, reloc_end; -+ uint32_t total_sz = data_size; -+ uint32_t hdr_sz; -+ uint32_t reloc_start, reloc_end; - - /* - * The header size have to be a multiple of file_align, which currently -@@ -103,7 +103,7 @@ - e_hdr.image_sz = hdr_sz + so_memsz; - e_hdr.headers_sz = hdr_sz; - e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; -- e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t); -+ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(uint64_t); - fwrite(&e_hdr, sizeof(e_hdr), 1, f); - } - else if (class == ELFCLASS64) { -@@ -126,7 +126,7 @@ - e_hdr_pe32p.image_sz = hdr_sz + so_memsz; - e_hdr_pe32p.headers_sz = hdr_sz; - e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION; -- e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t); -+ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(uint64_t); - fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f); - } - -@@ -163,10 +163,10 @@ - { - Elf32_Ehdr e32_hdr; - Elf64_Ehdr e64_hdr; -- __uint32_t entry; -- __uint8_t class; -- __uint64_t phoff = 0; -- __uint16_t phnum = 0, phentsize = 0; -+ uint32_t entry; -+ uint8_t class; -+ uint64_t phoff = 0; -+ uint16_t phnum = 0, phentsize = 0; - unsigned char *id; - FILE *f_in, *f_out; - void *buf; ---- src.tmp/efi/wrapper.h -+++ src/efi/wrapper.h -@@ -1,6 +1,8 @@ - #ifndef EFI_WRAPPER_H - #define EFI_WRAPPER_H - -+#include <stdint.h> -+ - #define MSDOS_SIGNATURE 0x5a4d - #define PE_SIGNATURE 0x4550 - #define PE32_FORMAT 0x10b -@@ -27,13 +29,13 @@ - #define OFFSETOF(t,m) ((size_t)&((t *)0)->m) - - struct header { -- __uint16_t msdos_signature; -- __uint8_t _pad1[0x16]; -- __uint16_t relocs_ptr; -- __uint8_t __pad2[0x3c - 0x1a]; -- __uint32_t pe_hdr; -- __uint16_t pe_signature; -- __uint16_t _pad2; -+ uint16_t msdos_signature; -+ uint8_t _pad1[0x16]; -+ uint16_t relocs_ptr; -+ uint8_t __pad2[0x3c - 0x1a]; -+ uint32_t pe_hdr; -+ uint16_t pe_signature; -+ uint16_t _pad2; - } __packed; - - /* FIXME: when setting up coff_hdr, set up optional_hdr_sz -@@ -43,72 +45,72 @@ - * COFF header - */ - struct coff_hdr { -- __uint16_t arch; -- __uint16_t nr_sections; -- __uint32_t timedatestamp; -- __uint32_t symtab; -- __uint32_t nr_syms; -- __uint16_t optional_hdr_sz; -- __uint16_t characteristics; -+ uint16_t arch; -+ uint16_t nr_sections; -+ uint32_t timedatestamp; -+ uint32_t symtab; -+ uint32_t nr_syms; -+ uint16_t optional_hdr_sz; -+ uint16_t characteristics; - } __packed; - - struct optional_hdr { -- __uint16_t format; -- __uint8_t major_linker_version; -- __uint8_t minor_linker_version; -- __uint32_t code_sz; -- __uint32_t initialized_data_sz; -- __uint32_t uninitialized_data_sz; -- __uint32_t entry_point; -- __uint32_t base_code; -- __uint32_t data; -+ uint16_t format; -+ uint8_t major_linker_version; -+ uint8_t minor_linker_version; -+ uint32_t code_sz; -+ uint32_t initialized_data_sz; -+ uint32_t uninitialized_data_sz; -+ uint32_t entry_point; -+ uint32_t base_code; -+ uint32_t data; - } __packed; - - /* For PE32+, the optional_header does NOT have - * data after base_code - */ - struct optional_hdr_pe32p { -- __uint16_t format; -- __uint8_t major_linker_version; -- __uint8_t minor_linker_version; -- __uint32_t code_sz; -- __uint32_t initialized_data_sz; -- __uint32_t uninitialized_data_sz; -- __uint32_t entry_point; -- __uint32_t base_code; -+ uint16_t format; -+ uint8_t major_linker_version; -+ uint8_t minor_linker_version; -+ uint32_t code_sz; -+ uint32_t initialized_data_sz; -+ uint32_t uninitialized_data_sz; -+ uint32_t entry_point; -+ uint32_t base_code; - } __packed; - /* - * Extra header fields - */ - struct extra_hdr { -- __uint32_t image_base; -- __uint32_t section_align; -- __uint32_t file_align; -- __uint16_t major_os_version; -- __uint16_t minor_os_version; -- __uint16_t major_image_version; -- __uint16_t minor_image_version; -- __uint16_t major_subsystem_version; -- __uint16_t minor_subsystem_version; -- __uint32_t win32_version; -- __uint32_t image_sz; -- __uint32_t headers_sz; -- __uint32_t checksum; -- __uint16_t subsystem; -- __uint16_t dll_characteristics; -- __uint32_t stack_reserve_sz; -- __uint32_t stack_commit_sz; -- __uint32_t heap_reserve_sz; -- __uint32_t heap_commit_sz; -- __uint32_t loader_flags; -- __uint32_t rva_and_sizes_nr; -+ uint32_t image_base; -+ uint32_t section_align; -+ uint32_t file_align; -+ uint16_t major_os_version; -+ uint16_t minor_os_version; -+ uint16_t major_image_version; -+ uint16_t minor_image_version; -+ uint16_t major_subsystem_version; -+ uint16_t minor_subsystem_version; -+ uint32_t win32_version; -+ uint32_t image_sz; -+ uint32_t headers_sz; -+ uint32_t checksum; -+ uint16_t subsystem; -+ uint16_t dll_characteristics; -+ uint32_t stack_reserve_sz; -+ uint32_t stack_commit_sz; -+ uint32_t heap_reserve_sz; -+ uint32_t heap_commit_sz; -+ uint32_t loader_flags; -+ uint32_t rva_and_sizes_nr; - struct { -- __uint64_t export_table; -- __uint64_t import_table; -- __uint64_t resource_table; -- __uint64_t exception_table; -- __uint64_t certification_table; -- __uint64_t base_relocation_table; -+ uint64_t export_table; -+ uint64_t import_table; -+ uint64_t resource_table; -+ uint64_t exception_table; -+ uint64_t certification_table; -+ uint64_t base_relocation_table; - } data_directory; - } __packed; - -@@ -117,54 +119,54 @@ - */ - - struct extra_hdr_pe32p { -- __uint64_t image_base; -- __uint32_t section_align; -- __uint32_t file_align; -- __uint16_t major_os_version; -- __uint16_t minor_os_version; -- __uint16_t major_image_version; -- __uint16_t minor_image_version; -- __uint16_t major_subsystem_version; -- __uint16_t minor_subsystem_version; -- __uint32_t win32_version; -- __uint32_t image_sz; -- __uint32_t headers_sz; -- __uint32_t checksum; -- __uint16_t subsystem; -- __uint16_t dll_characteristics; -- __uint64_t stack_reserve_sz; -- __uint64_t stack_commit_sz; -- __uint64_t heap_reserve_sz; -- __uint64_t heap_commit_sz; -- __uint32_t loader_flags; -- __uint32_t rva_and_sizes_nr; -+ uint64_t image_base; -+ uint32_t section_align; -+ uint32_t file_align; -+ uint16_t major_os_version; -+ uint16_t minor_os_version; -+ uint16_t major_image_version; -+ uint16_t minor_image_version; -+ uint16_t major_subsystem_version; -+ uint16_t minor_subsystem_version; -+ uint32_t win32_version; -+ uint32_t image_sz; -+ uint32_t headers_sz; -+ uint32_t checksum; -+ uint16_t subsystem; -+ uint16_t dll_characteristics; -+ uint64_t stack_reserve_sz; -+ uint64_t stack_commit_sz; -+ uint64_t heap_reserve_sz; -+ uint64_t heap_commit_sz; -+ uint32_t loader_flags; -+ uint32_t rva_and_sizes_nr; - struct { -- __uint64_t export_table; -- __uint64_t import_table; -- __uint64_t resource_table; -- __uint64_t exception_table; -- __uint64_t certification_table; -- __uint64_t base_relocation_table; -+ uint64_t export_table; -+ uint64_t import_table; -+ uint64_t resource_table; -+ uint64_t exception_table; -+ uint64_t certification_table; -+ uint64_t base_relocation_table; - } data_directory; - } __packed; - - struct section { -- __uint8_t name[8]; -- __uint32_t virtual_sz; -- __uint32_t virtual_address; -- __uint32_t raw_data_sz; -- __uint32_t raw_data; -- __uint32_t relocs; -- __uint32_t line_numbers; -- __uint16_t relocs_nr; -- __uint16_t line_numbers_nr; -- __uint32_t characteristics; -+ uint8_t name[8]; -+ uint32_t virtual_sz; -+ uint32_t virtual_address; -+ uint32_t raw_data_sz; -+ uint32_t raw_data; -+ uint32_t relocs; -+ uint32_t line_numbers; -+ uint16_t relocs_nr; -+ uint16_t line_numbers_nr; -+ uint32_t characteristics; - } __packed; - - struct coff_reloc { -- __uint32_t virtual_address; -- __uint32_t symtab_index; -- __uint16_t type; -+ uint32_t virtual_address; -+ uint32_t symtab_index; -+ uint16_t type; - }; - - #endif /* EFI_WRAPPER_H */ diff --git a/sub/syslinux/syslinux-oknogit.patch b/sub/syslinux/syslinux-oknogit.patch deleted file mode 100644 index 0ace431..0000000 --- a/sub/syslinux/syslinux-oknogit.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src.old/efi/build-gnu-efi.sh -+++ src/efi/build-gnu-efi.sh -@@ -29,7 +29,7 @@ - - ( - cd ../.. -- git submodule update --init -+ git submodule update --init || true - ) - - mkdir -p "$objdir/gnu-efi" ---- src.old/efi/clean-gnu-efi.sh -+++ src/efi/clean-gnu-efi.sh -@@ -23,7 +23,7 @@ - - ( - cd ../.. -- git submodule update --init -+ git submodule update --init || true - ) - - if [ -d "$objdir/gnu-efi" ];then diff --git a/sub/util-linux/Makefile b/sub/util-linux/Makefile index 858c533..221781d 100644 --- a/sub/util-linux/Makefile +++ b/sub/util-linux/Makefile @@ -108,25 +108,24 @@ $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT): | $(OUTPUT)/tmp/. $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled: $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied: $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled sub/util-linux/nowall.patch | $(OUTPUT)/build-build/.lh_skarnet_installed +$(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied: $(OUTPUT)/sources/.lh_$(UTLX_NAME)_dled | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-rmrf $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(UTLX_NAME) $(UTLX_NAME)-$(UTLX_VERSION) $(OUTPUT)/tmp exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) tar $(UTLX_TARLETTER)xpvf $(OUTPUT)/sources/$(UTLX_NAME)-$(UTLX_VERSION).$(UTLX_TAREXT) exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/$(UTLX_NAME)-$(UTLX_VERSION) $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src -# exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) redirfd -r 0 $(WD)/sub/util-linux/nowall.patch patch -p1 exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_configured: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_copied $(OUTPUT)/build-build/.lh_kernel_headers_installed | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src export CFLAGS $(UTLX_CFLAGS) export LDFLAGS $(UTLX_CONFLDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) $(UTLX_CONFIGURE_OPTIONS) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src export CC $(BUILD_BUILD_CC) export CFLAGS $(UTLX_CFLAGS) export LDFLAGS $(UTLX_CONFLDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION) $(UTLX_CONFIGURE_OPTIONS) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_built: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) LDFLAGS=$(UTLX_MAKELDFLAGS) + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) CC=$(BUILD_BUILD_CC) LDFLAGS=$(UTLX_MAKELDFLAGS) exec setuidgid $(NORMALUSER) s6-touch $@ $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_installed: $(OUTPUT)/build-build/.lh_$(UTLX_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) install + exec cd $(OUTPUT)/build-build/opt/$(UTLX_NAME)-$(UTLX_VERSION)/src $(MAKE) install CC=$(BUILD_BUILD_CC) exec setuidgid $(NORMALUSER) makelinks $(OUTPUT)/build-build /bin /opt/$(UTLX_NAME)/bin exec setuidgid $(NORMALUSER) makelinks $(OUTPUT)/build-build /bin /opt/$(UTLX_NAME)/sbin exec setuidgid $(NORMALUSER) s6-touch $@ diff --git a/sub/util-linux/nowall.patch b/sub/util-linux/nowall.patch deleted file mode 100644 index 6de7a56..0000000 --- a/sub/util-linux/nowall.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- util-linux-2.32.old/src/Makefile.in -+++ util-linux-2.32/src/Makefile.in -@@ -372,12 +372,12 @@ - @BUILD_SETTERM_TRUE@@HAVE_TINFO_FALSE@am__append_125 = $(NCURSES_CFLAGS) - @BUILD_MESG_TRUE@am__append_126 = mesg - @BUILD_MESG_TRUE@am__append_127 = term-utils/mesg.1 --@BUILD_WALL_TRUE@am__append_128 = wall --@BUILD_WALL_TRUE@am__append_129 = term-utils/wall.1 --@BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_130 = install-exec-hook-wall --@BUILD_WRITE_TRUE@am__append_131 = write --@BUILD_WRITE_TRUE@am__append_132 = term-utils/write.1 --@BUILD_WRITE_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_133 = install-exec-hook-write -+# @BUILD_WALL_TRUE@am__append_128 = wall -+# @BUILD_WALL_TRUE@am__append_129 = term-utils/wall.1 -+# @BUILD_WALL_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_130 = install-exec-hook-wall -+# @BUILD_WRITE_TRUE@am__append_131 = write -+# @BUILD_WRITE_TRUE@am__append_132 = term-utils/write.1 -+# @BUILD_WRITE_TRUE@@MAKEINSTALL_DO_CHOWN_TRUE@@USE_TTY_GROUP_TRUE@am__append_133 = install-exec-hook-write - @BUILD_LAST_TRUE@am__append_134 = last - @BUILD_LAST_TRUE@am__append_135 = \ - @BUILD_LAST_TRUE@ login-utils/last.1 \ diff --git a/sub/xz/Makefile b/sub/xz/Makefile index cfbbf23..83d36bc 100644 --- a/sub/xz/Makefile +++ b/sub/xz/Makefile @@ -24,16 +24,16 @@ $(OUTPUT)/build-build/.lh_$(XZ_NAME)_copied: $(OUTPUT)/sources/.lh_$(XZ_NAME)_dl exec setuidgid $(NORMALUSER) s6-rename $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/$(XZ_NAME)-$(XZ_VERSION) $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_copied $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS) +$(OUTPUT)/build-build/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src export CC $(BUILD_BUILD_CC) export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) ./configure --prefix=$(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_configured $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) LDFLAGS=$(XZ_MAKELDFLAGS) +$(OUTPUT)/build-build/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) CC=$(BUILD_BUILD_CC) LDFLAGS=$(XZ_MAKELDFLAGS) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-build/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_built $(OUTPUT)/build-build/.lh_gcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) install +$(OUTPUT)/build-build/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-build/.lh_$(XZ_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-build/opt/$(XZ_NAME)-$(XZ_VERSION)/src $(MAKE) install CC=$(BUILD_BUILD_CC) exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build/opt $(XZ_NAME) $(XZ_NAME)-$(XZ_VERSION) $(OUTPUT)/tmp exec setuidgid $(NORMALUSER) s6-touch $@ @@ -43,16 +43,16 @@ $(OUTPUT)/build-host/.lh_$(XZ_NAME)_copied: $(OUTPUT)/sources/.lh_$(XZ_NAME)_dle exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host tar $(XZ_TARLETTER)xpvf $(OUTPUT)/sources/$(XZ_NAME)-$(XZ_VERSION).$(XZ_TAREXT) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_copied $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) export CC muslgcc ./configure --host=$(TRIPLE) --prefix=/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS) +$(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_copied | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) export CC $(BUILD_HOST_CC) export CFLAGS $(XZ_CFLAGS) export LDFLAGS $(XZ_CONFLDFLAGS) ./configure --host=$(TRIPLE) --prefix=/opt/$(XZ_NAME)-$(XZ_VERSION) $(XZ_CONFIGURE_OPTIONS) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/build-build/.lh_skarnet_installed - exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) LDFLAGS=$(XZ_MAKELDFLAGS) CC=muslgcc +$(OUTPUT)/build-host/.lh_$(XZ_NAME)_built: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_configured | $(OUTPUT)/build-build/.lh_skarnet_installed + exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) LDFLAGS=$(XZ_MAKELDFLAGS) CC=$(BUILD_HOST_CC) exec setuidgid $(NORMALUSER) s6-touch $@ -$(OUTPUT)/build-host/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_built $(OUTPUT)/build-host/bin/muslgcc | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed - exec cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) install DESTDIR=$(OUTPUT)/rootfs +$(OUTPUT)/build-host/.lh_$(XZ_NAME)_installed: $(OUTPUT)/build-host/.lh_$(XZ_NAME)_built | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed + exec cd $(OUTPUT)/build-host/$(XZ_NAME)-$(XZ_VERSION) $(MAKE) install CC=$(BUILD_HOST_CC) DESTDIR=$(OUTPUT)/rootfs exec makenamelink $(OUTPUT)/rootfs/opt $(XZ_NAME) $(XZ_NAME)-$(XZ_VERSION) $(OUTPUT)/tmp exec makelinks $(OUTPUT)/rootfs /bin /opt/$(XZ_NAME)/bin exec setuidgid $(NORMALUSER) s6-touch $@ |