diff options
Diffstat (limited to 'sub')
| -rw-r--r-- | sub/dropbear/Makefile | 2 | ||||
| -rw-r--r-- | sub/kernel/Makefile | 10 | ||||
| -rw-r--r-- | sub/kmod/Makefile | 4 | ||||
| -rw-r--r-- | sub/layout/Makefile | 2 | ||||
| -rw-r--r-- | sub/musl/Makefile | 36 | ||||
| -rw-r--r-- | sub/skarnet.org/Makefile | 10 | ||||
| -rw-r--r-- | sub/syslinux/Makefile | 6 | ||||
| -rw-r--r-- | sub/util-linux/Makefile | 7 | ||||
| -rw-r--r-- | sub/xz/Makefile | 4 |
9 files changed, 21 insertions, 60 deletions
diff --git a/sub/dropbear/Makefile b/sub/dropbear/Makefile index 9eecc65..9b094c9 100644 --- a/sub/dropbear/Makefile +++ b/sub/dropbear/Makefile @@ -1,6 +1,6 @@ include sub/dropbear/Makefile.sftp-server -DROPBEAR_VERSION ?= 2017.75 +DROPBEAR_VERSION ?= 2018.76 clean-dropbear: diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile index 476c5e3..d4f0009 100644 --- a/sub/kernel/Makefile +++ b/sub/kernel/Makefile @@ -3,9 +3,6 @@ KERNEL_VERSION ?= 4.14.13 KERNEL_MAJOR := $(firstword $(subst ., ,$(KERNEL_VERSION))) KERNEL_ENV := DEPMOD=$(OUTPUT)/build-build/opt/kmod/bin/depmod INSTALL_MOD_PATH=$(OUTPUT)/rootfs CROSS_COMPILE=$(BUILD_HOST_PREFIX)- ARCH=$(KERNEL_GENERIC_ARCH) INSTALL_MOD_STRIP="-R .note -R .comment -R .note.GNU-stack --strip-debug" -# for Stage 1 - get the kernel headers for the build-build -# these headers are not correct but we don't care - $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz: | $(OUTPUT)/tmp/.lh_prepared cd $(OUTPUT)/sources && setuidgid $(NORMALUSER) wget https://cdn.kernel.org/pub/linux/kernel/v$(KERNEL_MAJOR).x/linux-$(KERNEL_VERSION).tar.xz @@ -22,10 +19,6 @@ $(OUTPUT)/build-build/.lh_kernel_headers_installed: $(OUTPUT)/build-build/.lh_ke exec setuidgid $(NORMALUSER) touch $@ - - -# for Stage 2 - build the kernel - $(OUTPUT)/build-host/kernel/.lh_unpacked: $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz | $(OUTPUT)/build-build/.lh_skarnet_installed exec setuidgid $(NORMALUSER) s6-mkdir -p $(OUTPUT)/build-host/kernel exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel tar Jxpvf $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz @@ -63,6 +56,3 @@ ifeq ($(KERNEL_GENERIC_ARCH),x86) exec s6-ln -sf vmlinuz-$(KERNEL_VERSION) $(OUTPUT)/rootfs/boot/vmlinuz endif exec setuidgid $(NORMALUSER) s6-touch $@ - - -# TODO: copy the config to /boot diff --git a/sub/kmod/Makefile b/sub/kmod/Makefile index 62b3f52..7e49d34 100644 --- a/sub/kmod/Makefile +++ b/sub/kmod/Makefile @@ -15,8 +15,8 @@ KMOD_TARLETTER := J KMOD_CONFIGURE_OPTIONS := --with-gnu-ld --disable-gtk-doc-html --with-xz --disable-manpages --with-bashcompletiondir=$(OUTPUT)/build-build/opt/$(KMOD_NAME)-$(KMOD_VERSION)/bash-completions KMOD_CFLAGS := "" -KMOD_CONFLDFLAGS := "-s -static" -KMOD_MAKELDFLAGS := "-s -all-static -L$(OUTPUT)/build-build/opt/xz/lib" +KMOD_CONFLDFLAGS := "-s" +KMOD_MAKELDFLAGS := "-s -L$(OUTPUT)/build-build/opt/xz/lib" $(OUTPUT)/sources/$(KMOD_NAME)-$(KMOD_VERSION).$(KMOD_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed diff --git a/sub/layout/Makefile b/sub/layout/Makefile index e8772b5..ce9ebd5 100644 --- a/sub/layout/Makefile +++ b/sub/layout/Makefile @@ -1,6 +1,4 @@ -# copies our pre-made layout ("copylayout") in /layout to the output directory -# add our local options to the layout ("configure-localoptions") $(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) diff --git a/sub/musl/Makefile b/sub/musl/Makefile index a4924eb..797d37d 100644 --- a/sub/musl/Makefile +++ b/sub/musl/Makefile @@ -1,7 +1,7 @@ MUSL_BASE ?= /opt/musl-git -# Latest version at 2018-01-16 -MUSL_VERSION := 628cf979b249fa76a80962e2eefe05073216a4db +# Latest version at 2018-03-23 +MUSL_VERSION := 0cf50581ec5f04feeaa77f2eb8b734a4b69ca8ed # Build-build @@ -10,37 +10,11 @@ $(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$(MUSL_BASE)/.lh_copied: $(OUTPUT)/sources/.lh_musl_cloned - exec setuidgid $(NORMALUSER) rm -rf $(OUTPUT)/build-build$(MUSL_BASE)/src - exec setuidgid $(NORMALUSER) mkdir -p $(OUTPUT)/build-build$(MUSL_BASE) - exec setuidgid $(NORMALUSER) cp -a $(OUTPUT)/sources/musl $(OUTPUT)/build-build$(MUSL_BASE)/src +$(OUTPUT)/build-build/.lh_gcc: $(OUTPUT)/build-build/bin/gcc exec setuidgid $(NORMALUSER) touch $@ -$(OUTPUT)/build-build$(MUSL_BASE)/.lh_configured: $(OUTPUT)/build-build$(MUSL_BASE)/.lh_copied - cd $(OUTPUT)/build-build$(MUSL_BASE)/src && setuidgid $(NORMALUSER) ./configure --prefix=$(OUTPUT)/build-build$(MUSL_BASE) --enable-warnings --enable-gcc-wrapper "CC=$(BUILD_BUILD_CC)" - exec setuidgid $(NORMALUSER) touch $@ - -$(OUTPUT)/build-build$(MUSL_BASE)/.lh_built: $(OUTPUT)/build-build$(MUSL_BASE)/.lh_configured - cd $(OUTPUT)/build-build$(MUSL_BASE)/src && setuidgid $(NORMALUSER) $(MAKE) - exec setuidgid $(NORMALUSER) touch $@ - -$(OUTPUT)/build-build$(MUSL_BASE)/.lh_installed: $(OUTPUT)/build-build$(MUSL_BASE)/.lh_built $(OUTPUT)/build-build/.lh_kernel_headers_installed - cd $(OUTPUT)/build-build$(MUSL_BASE)/src && setuidgid $(NORMALUSER) $(MAKE) install syslibdir=$(OUTPUT)/build-build$(MUSL_BASE) - exec setuidgid $(NORMALUSER) makenamelink $(OUTPUT)/build-build$(dir $(MUSL_BASE)) musl $(notdir $(MUSL_BASE)) $(OUTPUT)/tmp - exec setuidgid $(NORMALUSER) makelinks $(OUTPUT)/build-build $(MUSL_BASE)/include /opt/linux/include - exec setuidgid $(NORMALUSER) sub/musl/muslgccmake $(OUTPUT)/build-build$(MUSL_BASE)/bin/musl-gcc $(OUTPUT)/build-build$(MUSL_BASE)/lib/musl-gcc.specs $(BUILD_BUILD_CC) true - exec setuidgid $(NORMALUSER) touch $@ - -$(OUTPUT)/build-build/tmp/libssp_nonshared.o: sub/musl/libssp_nonshared.c | $(OUTPUT)/tmp/.lh_prepared - exec setuidgid $(NORMALUSER) $(BUILD_BUILD_CC) -O2 -o $@ -c $^ - -$(OUTPUT)/build-build$(MUSL_BASE)/lib/libssp_nonshared.a: $(OUTPUT)/build-build$(MUSL_BASE)/.lh_installed $(OUTPUT)/build-build/tmp/libssp_nonshared.o - exec setuidgid $(NORMALUSER) ar cr $@ $(OUTPUT)/build-build/tmp/libssp_nonshared.o - -$(OUTPUT)/build-build/.lh_gcc: $(OUTPUT)/build-build$(MUSL_BASE)/.lh_installed $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build$(MUSL_BASE)/lib/libssp_nonshared.a - exec setuidgid $(NORMALUSER) makelinks $(OUTPUT)/build-build /bin $(dir $(MUSL_BASE))musl/bin - exec setuidgid $(NORMALUSER) ln -sf musl-gcc $(OUTPUT)/build-build/bin/gcc - exec setuidgid $(NORMALUSER) touch $@ +$(OUTPUT)/build-build/bin/gcc: | $(OUTPUT)/tmp/.lh_prepared + ln -sf $(BUILD_BUILD_CC) $(OUTPUT)/build-build/bin/gcc # Build-host diff --git a/sub/skarnet.org/Makefile b/sub/skarnet.org/Makefile index d599efc..c480e8c 100644 --- a/sub/skarnet.org/Makefile +++ b/sub/skarnet.org/Makefile @@ -76,7 +76,7 @@ $(OUTPUT)/build-build/.lh_execline_copied: $(OUTPUT)/sources/.lh_execline_cloned 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 --enable-static-libc --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 + 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 exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_execline_built: $(OUTPUT)/build-build/.lh_execline_configured $(OUTPUT)/build-build/.lh_skalibs_installed @@ -94,7 +94,7 @@ $(OUTPUT)/build-build/.lh_s6pu_copied: $(OUTPUT)/sources/.lh_s6pu_cloned 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 --enable-static-libc --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 + 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 exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_s6pu_built: $(OUTPUT)/build-build/.lh_s6pu_configured $(OUTPUT)/build-build/.lh_skalibs_installed @@ -112,7 +112,7 @@ $(OUTPUT)/build-build/.lh_s6_copied: $(OUTPUT)/sources/.lh_s6_cloned 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 --enable-static-libc --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 + 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 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 @@ -130,7 +130,7 @@ $(OUTPUT)/build-build/.lh_s6rc_copied: $(OUTPUT)/sources/.lh_s6rc_cloned 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 --enable-static-libc --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 + 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 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 @@ -148,7 +148,7 @@ $(OUTPUT)/build-build/.lh_s6dns_copied: $(OUTPUT)/sources/.lh_s6dns_cloned 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 --enable-static-libc --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 + 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 exec setuidgid $(NORMALUSER) touch $@ $(OUTPUT)/build-build/.lh_s6dns_built: $(OUTPUT)/build-build/.lh_s6dns_configured $(OUTPUT)/build-build/.lh_skalibs_installed diff --git a/sub/syslinux/Makefile b/sub/syslinux/Makefile index 1a0b100..8c7f5d2 100644 --- a/sub/syslinux/Makefile +++ b/sub/syslinux/Makefile @@ -17,7 +17,7 @@ SYSLINUX_TAREXT := tar.xz SYSLINUX_TARLETTER := J SYSLINUX_CFLAGS := "-I $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/include" -SYSLINUX_LDFLAGS := "-s -static -L $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/lib" +SYSLINUX_LDFLAGS := "-s -L $(OUTPUT)/build-build/opt/$(LIBUUID_NAME)/lib" SYSLINUX_INSTALLROOT := $(OUTPUT)/build-build/opt/$(SYSLINUX_NAME)-$(SYSLINUX_VERSION) @@ -70,11 +70,11 @@ $(OUTPUT)/build-build/.lh_$(NASM_NAME)_copied: $(OUTPUT)/sources/.lh_$(NASM_NAME 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 export LDFLAGS -static ./configure --prefix=$(OUTPUT)/build-build/opt/$(NASM_NAME)-$(NASM_VERSION) --enable-static + 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) LDFLAGS=-static + 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 diff --git a/sub/util-linux/Makefile b/sub/util-linux/Makefile index 36ea262..eba2823 100644 --- a/sub/util-linux/Makefile +++ b/sub/util-linux/Makefile @@ -6,7 +6,7 @@ UTLX_NAME := util-linux -UTLX_VERSION := 2.31.1 +UTLX_VERSION := 2.32 UTLX_MAJOR := $(word 1, $(subst ., ,$(UTLX_VERSION))) UTLX_MINOR := $(word 2, $(subst ., ,$(UTLX_VERSION))) UTLX_URLDIR := https://cdn.kernel.org/pub/linux/utils/$(UTLX_NAME)/v$(UTLX_MAJOR).$(UTLX_MINOR) @@ -15,10 +15,9 @@ UTLX_TARLETTER := J UTLX_CONFIGURE_OPTIONS := --disable-assert --disable-nls --enable-mount --enable-losetup --disable-bash-completion --disable-pylibmount --disable-pg-bell --disable-makeinstall-chown --disable-makeinstall-setuid --disable-colors-default --with-gnu-ld --without-util --without-termcap --without-libiconv-prefix --without-udev --without-user --without-python --without-ncurses --without-tinfo UTLX_CFLAGS := "" UTLX_CONFLDFLAGS := "" -UTLX_MAKELDFLAGS := "-s -all-static" +UTLX_MAKELDFLAGS := "-s" -# only compiling losetup, other tools are widely available and well defined. You could also add: fdisk losetup mkswap mount -# (Laurent) No, listing all the tools we need allows us to not depend on *any* +# Listing all the tools we need allows us to not depend on any # version of util-linux being installed on the machine. This is intentional: # if we're going to download our own util-linux anyway, we might as well # remove the dependency entirely. diff --git a/sub/xz/Makefile b/sub/xz/Makefile index a600850..e60bd1b 100644 --- a/sub/xz/Makefile +++ b/sub/xz/Makefile @@ -6,8 +6,8 @@ XZ_TAREXT := tar.xz XZ_TARLETTER := J XZ_CONFIGURE_OPTIONS := --disable-nls --with-gnu-ld --enable-threads=posix --disable-shared --disable-scripts --disable-doc --disable-lzma-links --disable-lzmainfo --disable-lzmadec --disable-xzdec --disable-xz XZ_CFLAGS := "" -XZ_CONFLDFLAGS := "-s -static" -XZ_MAKELDFLAGS := "-s -static" +XZ_CONFLDFLAGS := "-s" +XZ_MAKELDFLAGS := "-s" $(OUTPUT)/sources/$(XZ_NAME)-$(XZ_VERSION).$(XZ_TAREXT): | $(OUTPUT)/tmp/.lh_prepared $(OUTPUT)/build-build/.lh_skarnet_installed |