use sfdisk; remove bb fdisk

diff --git a/archive-patches/busybox-1.28.3-cst.config b/archive-patches/busybox-1.28.3-cst.config
index 261c570ddeda94b90f6c6bd23360898320e951ec..d2df1d3107b4c1254a990fa9d3d1a30a718715ab 100644 (file)
--- 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 7daf96d41fbdaa7b4c90ec020362a0e5ef48696b..eda24104169a6e8713f1a818da3cac13e1325bff 100755 (executable)
--- 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 7b5f4633a454b0115540f6708fbc55b3b366e012..9640d710017e005efc4f3009c554bd7f0cf857cd 100755 (executable)
--- 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 19d87f7e0ac909382c7558b1d23d413de15affbf..319a2f85a02765830ecee827ea6230b31425f0fd 100755 (executable)
--- 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 904f902c6dd6950efcc0c53d1a07afb2a18c2252..3c107a1b2c4a4254cfb707d57271bc0857dd077c 100644 (file)
--- 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