From 5c69ad0ecdc18cf51b312c7c82848f4438fe1c8d Mon Sep 17 00:00:00 2001
From: Ron Yorston <rmy@pobox.com>
Date: Tue, 4 Aug 2020 08:24:19 +0100
Subject: build system: drop PLATFORM_LINUX

PLATFORM_LINUX is a hidden configuration option which is disabled by
default and enabled at over a hundred locations for features that are
deemed to be Linux specific.

The only effect of PLATFORM_LINUX is to control compilation of
libbb/match_fstype.c.  This file is only needed by mount and umount.

Remove all references to PLATFORM_LINUX and compile match_fstype.c
if mount or umount is enabled.

Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 util-linux/acpid.c       | 1 -
 util-linux/blkdiscard.c  | 1 -
 util-linux/blkid.c       | 1 -
 util-linux/dmesg.c       | 1 -
 util-linux/eject.c       | 1 -
 util-linux/fatattr.c     | 1 -
 util-linux/fbset.c       | 1 -
 util-linux/fdformat.c    | 1 -
 util-linux/fdisk.c       | 1 -
 util-linux/findfs.c      | 1 -
 util-linux/freeramdisk.c | 2 --
 util-linux/fsfreeze.c    | 1 -
 util-linux/fstrim.c      | 1 -
 util-linux/hwclock.c     | 1 -
 util-linux/ionice.c      | 1 -
 util-linux/ipcs.c        | 1 -
 util-linux/losetup.c     | 1 -
 util-linux/lspci.c       | 1 -
 util-linux/lsusb.c       | 1 -
 util-linux/mdev.c        | 1 -
 util-linux/mkfs_ext2.c   | 2 --
 util-linux/mkfs_minix.c  | 1 -
 util-linux/mkfs_reiser.c | 1 -
 util-linux/mkfs_vfat.c   | 2 --
 util-linux/mount.c       | 1 -
 util-linux/nsenter.c     | 1 -
 util-linux/pivot_root.c  | 1 -
 util-linux/readprofile.c | 1 -
 util-linux/rtcwake.c     | 1 -
 util-linux/setarch.c     | 3 ---
 util-linux/setpriv.c     | 1 -
 util-linux/swaponoff.c   | 2 --
 util-linux/switch_root.c | 1 -
 util-linux/uevent.c      | 1 -
 util-linux/umount.c      | 1 -
 util-linux/unshare.c     | 1 -
 36 files changed, 42 deletions(-)

(limited to 'util-linux')

diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index fc8215cce..d473e24fc 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -9,7 +9,6 @@
 //config:config ACPID
 //config:	bool "acpid (9 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	acpid listens to ACPI events coming either in textual form from
 //config:	/proc/acpi/event (though it is marked deprecated it is still widely
diff --git a/util-linux/blkdiscard.c b/util-linux/blkdiscard.c
index a77c7d057..ff2101ed0 100644
--- a/util-linux/blkdiscard.c
+++ b/util-linux/blkdiscard.c
@@ -8,7 +8,6 @@
 //config:config BLKDISCARD
 //config:	bool "blkdiscard (4.3 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	blkdiscard discards sectors on a given device.
 
diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index 008ae5d9e..4a820771f 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -9,7 +9,6 @@
 //config:config BLKID
 //config:	bool "blkid (12 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	select VOLUMEID
 //config:	help
 //config:	Lists labels and UUIDs of all filesystems.
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index a1f269142..dc4e57169 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -11,7 +11,6 @@
 //config:config DMESG
 //config:	bool "dmesg (3.7 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	dmesg is used to examine or control the kernel ring buffer. When the
 //config:	Linux kernel prints messages to the system log, they are stored in
diff --git a/util-linux/eject.c b/util-linux/eject.c
index 3ccb4ae89..29b0a86bd 100644
--- a/util-linux/eject.c
+++ b/util-linux/eject.c
@@ -15,7 +15,6 @@
 //config:config EJECT
 //config:	bool "eject (4 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Used to eject cdroms. (defaults to /dev/cdrom)
 //config:
diff --git a/util-linux/fatattr.c b/util-linux/fatattr.c
index 770b1d2f9..afd70c45d 100644
--- a/util-linux/fatattr.c
+++ b/util-linux/fatattr.c
@@ -11,7 +11,6 @@
 //config:config FATATTR
 //config:	bool "fatattr (1.9 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	fatattr lists or changes the file attributes on a fat file system.
 
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 699a19372..0b9a9a6bc 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -14,7 +14,6 @@
 //config:config FBSET
 //config:	bool "fbset (5.9 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	fbset is used to show or change the settings of a Linux frame buffer
 //config:	device. The frame buffer device provides a simple and unique
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index e1c8561d6..f0466fdbd 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -8,7 +8,6 @@
 //config:config FDFORMAT
 //config:	bool "fdformat (4.4 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	fdformat is used to low-level format a floppy disk.
 
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index f568fe92c..0fb2e3e17 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -10,7 +10,6 @@
 //config:config FDISK
 //config:	bool "fdisk (37 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	The fdisk utility is used to divide hard disks into one or more
 //config:	logical disks, which are generally called partitions. This utility
diff --git a/util-linux/findfs.c b/util-linux/findfs.c
index 7ca9dc96b..f5621a1fa 100644
--- a/util-linux/findfs.c
+++ b/util-linux/findfs.c
@@ -10,7 +10,6 @@
 //config:config FINDFS
 //config:	bool "findfs (12 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	select VOLUMEID
 //config:	help
 //config:	Prints the name of a filesystem with given label or UUID.
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index d27113d97..309169d25 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -11,7 +11,6 @@
 //config:config FDFLUSH
 //config:	bool "fdflush (1.3 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	fdflush is only needed when changing media on slightly-broken
 //config:	removable media drives. It is used to make Linux believe that a
@@ -24,7 +23,6 @@
 //config:config FREERAMDISK
 //config:	bool "freeramdisk (1.3 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Linux allows you to create ramdisks. This utility allows you to
 //config:	delete them and completely free all memory that was used for the
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
index fb0b3c4bd..6e2ff0a54 100644
--- a/util-linux/fsfreeze.c
+++ b/util-linux/fsfreeze.c
@@ -7,7 +7,6 @@
 //config:config FSFREEZE
 //config:	bool "fsfreeze (3.5 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	select LONG_OPTS
 //config:	help
 //config:	Halt new accesses and flush writes on a mounted filesystem.
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 48948e839..8d29a6d54 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -10,7 +10,6 @@
 //config:config FSTRIM
 //config:	bool "fstrim (4.4 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Discard unused blocks on a mounted filesystem.
 
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index dc97d8fb4..357906cca 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -9,7 +9,6 @@
 //config:config HWCLOCK
 //config:	bool "hwclock (5.8 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	The hwclock utility is used to read and set the hardware clock
 //config:	on a system. This is primarily used to set the current time on
diff --git a/util-linux/ionice.c b/util-linux/ionice.c
index daf64d537..40c04d5e0 100644
--- a/util-linux/ionice.c
+++ b/util-linux/ionice.c
@@ -9,7 +9,6 @@
 //config:config IONICE
 //config:	bool "ionice (3.8 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Set/set program io scheduling class and priority
 //config:	Requires kernel >= 2.6.13
diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index df86cfb9d..ef2529c05 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -10,7 +10,6 @@
 //config:config IPCS
 //config:	bool "ipcs (11 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	The ipcs utility is used to provide information on the currently
 //config:	allocated System V interprocess (IPC) objects in the system.
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index cc6c2b1d5..ac8b79502 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -9,7 +9,6 @@
 //config:config LOSETUP
 //config:	bool "losetup (5.5 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	losetup is used to associate or detach a loop device with a regular
 //config:	file or block device, and to query the status of a loop device. This
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
index a6b4e850f..2f0b5fab9 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -9,7 +9,6 @@
 //config:config LSPCI
 //config:	bool "lspci (6.3 kb)"
 //config:	default y
-//config:	#select PLATFORM_LINUX
 //config:	help
 //config:	lspci is a utility for displaying information about PCI buses in the
 //config:	system and devices connected to them.
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c
index e27aa7f31..64a00eee2 100644
--- a/util-linux/lsusb.c
+++ b/util-linux/lsusb.c
@@ -9,7 +9,6 @@
 //config:config LSUSB
 //config:	bool "lsusb (4.2 kb)"
 //config:	default y
-//config:	#select PLATFORM_LINUX
 //config:	help
 //config:	lsusb is a utility for displaying information about USB buses in the
 //config:	system and devices connected to them.
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 207a112c1..f42bebc20 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -10,7 +10,6 @@
 //config:config MDEV
 //config:	bool "mdev (17 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	mdev is a mini-udev implementation for dynamically creating device
 //config:	nodes in the /dev directory.
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index d568f4be5..1f525d75b 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -10,14 +10,12 @@
 //config:config MKE2FS
 //config:	bool "mke2fs (10 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Utility to create EXT2 filesystems.
 //config:
 //config:config MKFS_EXT2
 //config:	bool "mkfs.ext2 (10 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Alias to "mke2fs".
 
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 8f791cf66..3c72e5419 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -65,7 +65,6 @@
 //config:config MKFS_MINIX
 //config:	bool "mkfs.minix (10 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	The minix filesystem is a nice, small, compact, read-write filesystem
 //config:	with little overhead. If you wish to be able to create minix
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index d2eaf5f94..44a743147 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -9,7 +9,6 @@
 //config:config MKFS_REISER
 //config:	bool "mkfs_reiser"
 //config:	default n
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Utility to create ReiserFS filesystems.
 //config:	Note: this applet needs a lot of testing and polishing.
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index 16c1fac00..844d965f8 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -10,14 +10,12 @@
 //config:config MKDOSFS
 //config:	bool "mkdosfs (7.2 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Utility to create FAT32 filesystems.
 //config:
 //config:config MKFS_VFAT
 //config:	bool "mkfs.vfat (7.2 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Alias to "mkdosfs".
 
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 84c85c057..b92e2c297 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -20,7 +20,6 @@
 //config:config MOUNT
 //config:	bool "mount (23 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	All files and filesystems in Unix are arranged into one big directory
 //config:	tree. The 'mount' utility is used to graft a filesystem onto a
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index 304f2d748..c48dcf885 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -9,7 +9,6 @@
 //config:config NSENTER
 //config:	bool "nsenter (6.5 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Run program with namespaces of other processes.
 
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 41f29da32..ecc891100 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -11,7 +11,6 @@
 //config:config PIVOT_ROOT
 //config:	bool "pivot_root (1.1 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	The pivot_root utility swaps the mount points for the root filesystem
 //config:	with some other mounted filesystem. This allows you to do all sorts
diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c
index c4ea374be..32d9987e7 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -34,7 +34,6 @@
 //config:config READPROFILE
 //config:	bool "readprofile (7.1 kb)"
 //config:	default y
-//config:	#select PLATFORM_LINUX
 //config:	help
 //config:	This allows you to parse /proc/profile for basic profiling.
 
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index cad0f9d64..823e55662 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -25,7 +25,6 @@
 //config:config RTCWAKE
 //config:	bool "rtcwake (6.8 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Enter a system sleep state until specified wakeup time.
 
diff --git a/util-linux/setarch.c b/util-linux/setarch.c
index 57051a683..cf8ef0064 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -9,7 +9,6 @@
 //config:config SETARCH
 //config:	bool "setarch (3.6 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	The linux32 utility is used to create a 32bit environment for the
 //config:	specified program (usually a shell). It only makes sense to have
@@ -19,14 +18,12 @@
 //config:config LINUX32
 //config:	bool "linux32 (3.3 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Alias to "setarch linux32".
 //config:
 //config:config LINUX64
 //config:	bool "linux64 (3.3 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Alias to "setarch linux64".
 
diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index e5cf96957..37e8821a1 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -9,7 +9,6 @@
 //config:config SETPRIV
 //config:	bool "setpriv (6.6 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	select LONG_OPTS
 //config:	help
 //config:	Run a program with different Linux privilege settings.
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 567869cc7..e2ff4b5cc 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -9,7 +9,6 @@
 //config:config SWAPON
 //config:	bool "swapon (15 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	Once you have created some swap space using 'mkswap', you also need
 //config:	to enable your swap space with the 'swapon' utility. The 'swapoff'
@@ -36,7 +35,6 @@
 //config:config SWAPOFF
 //config:	bool "swapoff (14 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:
 //config:config FEATURE_SWAPONOFF_LABEL
 //config:	bool "Support specifying devices by label or UUID"
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index a483893ed..c65096c27 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -9,7 +9,6 @@
 //config:config SWITCH_ROOT
 //config:	bool "switch_root (5.5 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	The switch_root utility is used from initramfs to select a new
 //config:	root device. Under initramfs, you have to use this instead of
diff --git a/util-linux/uevent.c b/util-linux/uevent.c
index 7a1d7d4a7..57d9328ef 100644
--- a/util-linux/uevent.c
+++ b/util-linux/uevent.c
@@ -6,7 +6,6 @@
 //config:config UEVENT
 //config:	bool "uevent (3.1 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	uevent is a netlink listener for kernel uevent notifications
 //config:	sent via netlink. It is usually used for dynamic device creation.
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 077b635c8..63a3bf504 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -10,7 +10,6 @@
 //config:config UMOUNT
 //config:	bool "umount (5.1 kb)"
 //config:	default y
-//config:	select PLATFORM_LINUX
 //config:	help
 //config:	When you want to remove a mounted filesystem from its current mount
 //config:	point, for example when you are shutting down the system, the
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index a943e7b03..2087413e8 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -10,7 +10,6 @@
 //config:	bool "unshare (7.2 kb)"
 //config:	default y
 //config:	depends on !NOMMU
-//config:	select PLATFORM_LINUX
 //config:	select LONG_OPTS
 //config:	help
 //config:	Run program with some namespaces unshared from parent.
-- 
cgit v1.2.3