From 0b044404cabfdad1ab869d00677b09d476b814ef Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 9 May 2018 22:03:43 +0200 Subject: [PATCH] use sfdisk; remove bb fdisk --- archive-patches/busybox-1.28.3-cst.config | 6 +- make/archives.mk | 4 +- make/bootstrap.mk | 1 + make/libraries.mk | 89 ++++++++++++++++++++++- make/versions.mk | 5 ++ 5 files changed, 96 insertions(+), 9 deletions(-) diff --git a/archive-patches/busybox-1.28.3-cst.config b/archive-patches/busybox-1.28.3-cst.config index 261c570..d2df1d3 100644 --- a/archive-patches/busybox-1.28.3-cst.config +++ b/archive-patches/busybox-1.28.3-cst.config @@ -586,15 +586,15 @@ CONFIG_EJECT=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 # CONFIG_FEATURE_OSF_LABEL is not set # CONFIG_FEATURE_GPT_LABEL is not set -CONFIG_FEATURE_FDISK_ADVANCED=y +# CONFIG_FEATURE_FDISK_ADVANCED is not set # CONFIG_FINDFS is not set # CONFIG_FLOCK is not set # CONFIG_FDFLUSH is not set diff --git a/make/archives.mk b/make/archives.mk index 7daf96d..eda2410 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -210,8 +210,8 @@ $(ARCHIVE)/libtirpc-$(LIBTIRPC_VER).tar.bz2: $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz: $(WGET) https://security.appspot.com/downloads/vsftpd-$(VSFTPD_VER).tar.gz -$(ARCHIVE)/util-linux-2.20.tar.bz2: - $(WGET) http://www.fhloston-paradise.de/util-linux-2.20.tar.bz2 +$(ARCHIVE)/util-linux-$(UTIL_LINUX_VER).tar.xz: + $(WGET) https://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL_LINUX_MAJOR)/util-linux-$(UTIL_LINUX_VER).tar.xz $(ARCHIVE)/hddtemp-0.3-beta15.tar.bz2: $(WGET) http://www.fhloston-paradise.de/hddtemp-0.3-beta15.tar.bz2 diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 7b5f463..9640d71 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -24,6 +24,7 @@ bootstrap: $(BOOTSTRAP) SYSTEM_TOOLS = $(D)/busybox SYSTEM_TOOLS += $(D)/zlib SYSTEM_TOOLS += $(D)/e2fsprogs +SYSTEM_TOOLS += $(D)/util-linux SYSTEM_TOOLS += $(D)/vsftpd SYSTEM_TOOLS += $(D)/mtd-utils SYSTEM_TOOLS += $(D)/procps diff --git a/make/libraries.mk b/make/libraries.mk index 19d87f7..319a2f8 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -71,12 +71,93 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(NCURSES_VER).tar.gz | ncurses-prereq $(TAR $(REMOVE)/ncurses-$(NCURSES_VER) $(TOUCH) +$(D)/util-linux: $(D)/libncurses $(ARCHIVE)/util-linux-$(UTIL_LINUX_VER).tar.xz | $(TARGETPREFIX) + $(START_BUILD) + $(UNTAR)/util-linux-$(UTIL_LINUX_VER).tar.xz + cd $(BUILD_TMP)/util-linux-$(UTIL_LINUX_VER) && \ + autoreconf -fi && \ + $(CONFIGURE) \ + --prefix= \ + --build=$(BUILD) \ + --host=$(TARGET) \ + --mandir=/.remove \ + --disable-static \ + --disable-gtk-doc \ + --disable-nls \ + --disable-rpath \ + --disable-libuuid \ + --disable-libblkid \ + --disable-libmount \ + --disable-libsmartcols \ + --disable-mount \ + --disable-partx \ + --disable-mountpoint \ + --disable-fallocate \ + --disable-unshare \ + --disable-nsenter \ + --disable-setpriv \ + --disable-eject \ + --disable-agetty \ + --disable-cramfs \ + --disable-bfs \ + --disable-minix \ + --disable-fdformat \ + --disable-hwclock \ + --disable-wdctl \ + --disable-switch_root \ + --disable-pivot_root \ + --enable-tunelp \ + --disable-kill \ + --disable-last \ + --disable-utmpdump \ + --disable-line \ + --disable-mesg \ + --disable-raw \ + --disable-rename \ + --disable-reset \ + --disable-vipw \ + --disable-newgrp \ + --disable-chfn-chsh \ + --disable-login \ + --disable-login-chown-vcs \ + --disable-login-stat-mail \ + --disable-nologin \ + --disable-sulogin \ + --disable-su \ + --disable-runuser \ + --disable-ul \ + --disable-more \ + --disable-pg \ + --disable-setterm \ + --disable-schedutils \ + --disable-tunelp \ + --disable-wall \ + --disable-write \ + --disable-bash-completion \ + --disable-pylibmount \ + --disable-pg-bell \ + --disable-use-tty-group \ + --disable-makeinstall-chown \ + --disable-makeinstall-setuid \ + --without-audit \ + --without-ncurses \ + --without-slang \ + --without-utempter \ + --disable-wall \ + --without-python \ + --disable-makeinstall-chown \ + --without-systemdsystemunitdir && \ + $(MAKE) sfdisk && \ + install -m755 sfdisk $(TARGETPREFIX)/sbin/sfdisk + $(REMOVE)/util-linux-$(UTIL_LINUX_VER) + $(TOUCH) + $(D)/libblkid: $(D)/libuuid $(TOUCH) -$(D)/libuuid: $(ARCHIVE)/util-linux-2.20.tar.bz2 | $(TARGETPREFIX) +$(D)/libuuid: $(ARCHIVE)/util-linux-$(UTIL_LINUX_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) - $(UNTAR)/util-linux-2.20.tar.bz2 - cd $(BUILD_TMP)/util-linux-2.20 && \ + $(UNTAR)/util-linux-$(UTIL_LINUX_VER).tar.bz2 + cd $(BUILD_TMP)/util-linux-$(UTIL_LINUX_VER) && \ ./configure --prefix= --build=$(BUILD) --host=$(TARGET) \ --disable-libmount \ --disable-static \ @@ -88,7 +169,7 @@ $(D)/libuuid: $(ARCHIVE)/util-linux-2.20.tar.bz2 | $(TARGETPREFIX) $(MAKE) -C libblkid install DESTDIR=$(TARGETPREFIX) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/blkid.pc - $(REMOVE)/util-linux-2.20 + $(REMOVE)/util-linux-$(UTIL_LINUX_VER) $(TOUCH) $(D)/libmad: $(ARCHIVE)/libmad-0.15.1b.tar.gz | $(TARGETPREFIX) diff --git a/make/versions.mk b/make/versions.mk index 904f902..3c107a1 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -204,6 +204,11 @@ UNFS3_VER=0.9.22 # ushare; uShare is a UPnP (TM) A/V Media Server. USHARE_VER = 1.1a +# The Util-linux package contains miscellaneous utility programs. Among them are utilities for handling file systems, consoles, partitions, and messages +UTIL_LINUX_MAJOR = 2.25 +UTIL_LINUX_MINOR = 2 +UTIL_LINUX_VER = $(UTIL_LINUX_MAJOR).$(UTIL_LINUX_MINOR) + # Very secure ftp-Server VSFTPD_VER = 3.0.3 -- 2.39.5