Index: Makefile
===================================================================
--- Makefile (nonexistent)
+++ Makefile (revision 5)
@@ -0,0 +1,60 @@
+
+COMPONENT_TARGETS = $(HARDWARE_NOARCH)
+
+
+include ../../../../build-system/constants.mk
+
+
+url = $(DOWNLOAD_SERVER)/sources/packages/a/util-linux
+
+versions = 2.38.1
+pkgname = util-linux
+suffix = tar.xz
+
+tarballs = $(addsuffix .$(suffix), $(addprefix $(pkgname)-, $(versions)))
+sha1s = $(addsuffix .sha1sum, $(tarballs))
+
+patches = $(CURDIR)/patches/util-linux-2.38.1-libuuid-only.patch
+patches += $(CURDIR)/patches/util-linux-2.38.1-fdisk-no-solaris.patch
+patches += $(CURDIR)/patches/util-linux-2.38.1-nolist-ramdevs.patch
+
+.NOTPARALLEL: $(patches)
+
+
+BUILD_TARGETS = $(tarballs) $(sha1s) $(patches)
+
+
+include ../../../../build-system/core.mk
+
+
+.PHONY: download_clean
+
+
+$(tarballs):
+ @echo -e "\n======= Downloading source tarballs =======" ; \
+ for tarball in $(tarballs) ; do \
+ echo "$(url)/$$tarball" | xargs -n 1 -P 100 wget $(WGET_OPTIONS) - & \
+ done ; wait
+
+$(sha1s): $(tarballs)
+ @for sha in $@ ; do \
+ echo -e "\n======= Downloading '$$sha' signature =======\n" ; \
+ echo "$(url)/$$sha" | xargs -n 1 -P 100 wget $(WGET_OPTIONS) - & wait %1 ; \
+ touch $$sha ; \
+ echo -e "\n======= Check the '$$sha' sha1sum =======\n" ; \
+ sha1sum --check $$sha ; ret="$$?" ; \
+ if [ "$$ret" == "1" ]; then \
+ echo -e "\n======= ERROR: Bad '$$sha' sha1sum =======\n" ; \
+ exit 1 ; \
+ fi ; \
+ done
+
+$(patches): $(sha1s)
+ @echo -e "\n======= Create Patches =======\n" ; \
+ ( cd create-2.38.1-libuuid-only-patch ; ./create.patch.sh ) ; \
+ ( cd create-2.38.1-fdisk-no-solaris-patch ; ./create.patch.sh ) ; \
+ ( cd create-2.38.1-nolist-ramdevs-patch ; ./create.patch.sh ) ; \
+ echo -e "\n"
+
+download_clean:
+ @rm -f $(tarballs) $(sha1s) $(patches)
Index: create-2.38.1-fdisk-no-solaris-patch/create.patch.sh
===================================================================
--- create-2.38.1-fdisk-no-solaris-patch/create.patch.sh (nonexistent)
+++ create-2.38.1-fdisk-no-solaris-patch/create.patch.sh (revision 5)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+VERSION=2.38.1
+
+tar --files-from=file.list -xJvf ../util-linux-$VERSION.tar.xz
+mv util-linux-$VERSION util-linux-$VERSION-orig
+
+cp -rf ./util-linux-$VERSION-new ./util-linux-$VERSION
+
+diff --unified -Nr util-linux-$VERSION-orig util-linux-$VERSION > util-linux-$VERSION-fdisk-no-solaris.patch
+
+mv util-linux-$VERSION-fdisk-no-solaris.patch ../patches
+
+rm -rf ./util-linux-$VERSION
+rm -rf ./util-linux-$VERSION-orig
Property changes on: create-2.38.1-fdisk-no-solaris-patch/create.patch.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: create-2.38.1-fdisk-no-solaris-patch/file.list
===================================================================
--- create-2.38.1-fdisk-no-solaris-patch/file.list (nonexistent)
+++ create-2.38.1-fdisk-no-solaris-patch/file.list (revision 5)
@@ -0,0 +1 @@
+util-linux-2.38.1/include/pt-mbr-partnames.h
Index: create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new/include/pt-mbr-partnames.h
===================================================================
--- create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new/include/pt-mbr-partnames.h (nonexistent)
+++ create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new/include/pt-mbr-partnames.h (revision 5)
@@ -0,0 +1,113 @@
+ {0x00, N_("Empty")},
+ {0x01, N_("FAT12")},
+ {0x02, N_("XENIX root")},
+ {0x03, N_("XENIX usr")},
+ {0x04, N_("FAT16 <32M")},
+ {0x05, N_("Extended")}, /* DOS 3.3+ extended partition */
+ {0x06, N_("FAT16")}, /* DOS 16-bit >=32M */
+ {0x07, N_("HPFS/NTFS/exFAT")}, /* OS/2 IFS, eg, HPFS or NTFS or QNX or exFAT */
+ {0x08, N_("AIX")}, /* AIX boot (AIX -- PS/2 port) or SplitDrive */
+ {0x09, N_("AIX bootable")}, /* AIX data or Coherent */
+ {0x0a, N_("OS/2 Boot Manager")},/* OS/2 Boot Manager */
+ {0x0b, N_("W95 FAT32")},
+ {0x0c, N_("W95 FAT32 (LBA)")},/* LBA really is `Extended Int 13h' */
+ {0x0e, N_("W95 FAT16 (LBA)")},
+ {0x0f, N_("W95 Ext'd (LBA)")},
+ {0x10, N_("OPUS")},
+ {0x11, N_("Hidden FAT12")},
+ {0x12, N_("Compaq diagnostics")},
+ {0x14, N_("Hidden FAT16 <32M")},
+ {0x16, N_("Hidden FAT16")},
+ {0x17, N_("Hidden HPFS/NTFS")},
+ {0x18, N_("AST SmartSleep")},
+ {0x1b, N_("Hidden W95 FAT32")},
+ {0x1c, N_("Hidden W95 FAT32 (LBA)")},
+ {0x1e, N_("Hidden W95 FAT16 (LBA)")},
+ {0x24, N_("NEC DOS")},
+ {0x27, N_("Hidden NTFS WinRE")},
+ {0x39, N_("Plan 9")},
+ {0x3c, N_("PartitionMagic recovery")},
+ {0x40, N_("Venix 80286")},
+ {0x41, N_("PPC PReP Boot")},
+ {0x42, N_("SFS")},
+ {0x4d, N_("QNX4.x")},
+ {0x4e, N_("QNX4.x 2nd part")},
+ {0x4f, N_("QNX4.x 3rd part")},
+ {0x50, N_("OnTrack DM")},
+ {0x51, N_("OnTrack DM6 Aux1")}, /* (or Novell) */
+ {0x52, N_("CP/M")}, /* CP/M or Microport SysV/AT */
+ {0x53, N_("OnTrack DM6 Aux3")},
+ {0x54, N_("OnTrackDM6")},
+ {0x55, N_("EZ-Drive")},
+ {0x56, N_("Golden Bow")},
+ {0x5c, N_("Priam Edisk")},
+ {0x61, N_("SpeedStor")},
+ {0x63, N_("GNU HURD or SysV")}, /* GNU HURD or Mach or Sys V/386 (such as ISC UNIX) */
+ {0x64, N_("Novell Netware 286")},
+ {0x65, N_("Novell Netware 386")},
+ {0x70, N_("DiskSecure Multi-Boot")},
+ {0x75, N_("PC/IX")},
+ {0x80, N_("Old Minix")}, /* Minix 1.4a and earlier */
+ {0x81, N_("Minix / old Linux")},/* Minix 1.4b and later */
+ {0x82, N_("Linux swap")},
+ {0x83, N_("Linux")},
+ {0x84, N_("OS/2 hidden or Intel hibernation")},/* OS/2 hidden C: drive,
+ hibernation type Microsoft APM
+ or hibernation Intel Rapid Start */
+ {0x85, N_("Linux extended")},
+ {0x86, N_("NTFS volume set")},
+ {0x87, N_("NTFS volume set")},
+ {0x88, N_("Linux plaintext")},
+ {0x8e, N_("Linux LVM")},
+ {0x93, N_("Amoeba")},
+ {0x94, N_("Amoeba BBT")}, /* (bad block table) */
+ {0x9f, N_("BSD/OS")}, /* BSDI */
+ {0xa0, N_("IBM Thinkpad hibernation")},
+ {0xa5, N_("FreeBSD")}, /* various BSD flavours */
+ {0xa6, N_("OpenBSD")},
+ {0xa7, N_("NeXTSTEP")},
+ {0xa8, N_("Darwin UFS")},
+ {0xa9, N_("NetBSD")},
+ {0xab, N_("Darwin boot")},
+ {0xaf, N_("HFS / HFS+")},
+ {0xb7, N_("BSDI fs")},
+ {0xb8, N_("BSDI swap")},
+ {0xbb, N_("Boot Wizard hidden")},
+ {0xbc, N_("Acronis FAT32 LBA")},/* hidden (+0xb0) Acronis Secure Zone (backup software) */
+ {0xbe, N_("Solaris boot")},
+ {0xbf, N_("Solaris")},
+ {0xc1, N_("DRDOS/sec (FAT-12)")},
+ {0xc4, N_("DRDOS/sec (FAT-16 < 32M)")},
+ {0xc6, N_("DRDOS/sec (FAT-16)")},
+ {0xc7, N_("Syrinx")},
+ {0xda, N_("Non-FS data")},
+ {0xdb, N_("CP/M / CTOS / ...")},/* CP/M or Concurrent CP/M or
+ Concurrent DOS or CTOS */
+ {0xde, N_("Dell Utility")}, /* Dell PowerEdge Server utilities */
+ {0xdf, N_("BootIt")}, /* BootIt EMBRM */
+ {0xe1, N_("DOS access")}, /* DOS access or SpeedStor 12-bit FAT
+ extended partition */
+ {0xe3, N_("DOS R/O")}, /* DOS R/O or SpeedStor */
+ {0xe4, N_("SpeedStor")}, /* SpeedStor 16-bit FAT extended
+ partition < 1024 cyl. */
+
+ /* Linux https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/ */
+ {0xea, N_("Linux extended boot")},
+
+ {0xeb, N_("BeOS fs")},
+ {0xee, N_("GPT")}, /* Intel EFI GUID Partition Table */
+ {0xef, N_("EFI (FAT-12/16/32)")},/* Intel EFI System Partition */
+ {0xf0, N_("Linux/PA-RISC boot")},/* Linux/PA-RISC boot loader */
+ {0xf1, N_("SpeedStor")},
+ {0xf4, N_("SpeedStor")}, /* SpeedStor large partition */
+ {0xf2, N_("DOS secondary")}, /* DOS 3.3+ secondary */
+ {0xf8, N_("EBBR protective")}, /* Arm EBBR firmware protective partition */
+ {0xfb, N_("VMware VMFS")},
+ {0xfc, N_("VMware VMKCORE")}, /* VMware kernel dump partition */
+ {0xfd, N_("Linux raid autodetect")},/* Linux raid partition with
+ autodetect using persistent
+ superblock */
+ {0xfe, N_("LANstep")}, /* SpeedStor >1024 cyl. or LANstep */
+ {0xff, N_("BBT")}, /* Xenix Bad Block Table */
+
+ { 0, NULL }
Index: create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new/include
===================================================================
--- create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new/include (nonexistent)
+++ create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new/include (revision 5)
Property changes on: create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new/include
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new
===================================================================
--- create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new (nonexistent)
+++ create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new (revision 5)
Property changes on: create-2.38.1-fdisk-no-solaris-patch/util-linux-2.38.1-new
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: create-2.38.1-fdisk-no-solaris-patch
===================================================================
--- create-2.38.1-fdisk-no-solaris-patch (nonexistent)
+++ create-2.38.1-fdisk-no-solaris-patch (revision 5)
Property changes on: create-2.38.1-fdisk-no-solaris-patch
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: create-2.38.1-libuuid-only-patch/create.patch.sh
===================================================================
--- create-2.38.1-libuuid-only-patch/create.patch.sh (nonexistent)
+++ create-2.38.1-libuuid-only-patch/create.patch.sh (revision 5)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+VERSION=2.38.1
+
+tar --files-from=file.list -xJvf ../util-linux-$VERSION.tar.xz
+mv util-linux-$VERSION util-linux-$VERSION-orig
+
+cp -rf ./util-linux-$VERSION-new ./util-linux-$VERSION
+
+diff --unified -Nr util-linux-$VERSION-orig util-linux-$VERSION > util-linux-$VERSION-libuuid-only.patch
+
+mv util-linux-$VERSION-libuuid-only.patch ../patches
+
+rm -rf ./util-linux-$VERSION
+rm -rf ./util-linux-$VERSION-orig
Property changes on: create-2.38.1-libuuid-only-patch/create.patch.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: create-2.38.1-libuuid-only-patch/file.list
===================================================================
--- create-2.38.1-libuuid-only-patch/file.list (nonexistent)
+++ create-2.38.1-libuuid-only-patch/file.list (revision 5)
@@ -0,0 +1 @@
+util-linux-2.38.1/Makefile.am
Index: create-2.38.1-libuuid-only-patch/util-linux-2.38.1-new/Makefile.am
===================================================================
--- create-2.38.1-libuuid-only-patch/util-linux-2.38.1-new/Makefile.am (nonexistent)
+++ create-2.38.1-libuuid-only-patch/util-linux-2.38.1-new/Makefile.am (revision 5)
@@ -0,0 +1,367 @@
+AM_CPPFLAGS = \
+ -include config.h \
+ -I$(top_srcdir)/include \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -D_PATH_RUNSTATEDIR=\"${runstatedir}\" \
+ -D_PATH_SYSCONFSTATICDIR=\"${sysconfstaticdir}\"
+
+if USE_VENDORDIR
+AM_CPPFLAGS += \
+ -D_PATH_VENDORDIR=\"${vendordir}\"
+endif
+
+if FUZZING_ENGINE
+if !OSS_FUZZ
+AM_CPPFLAGS += \
+ -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+endif
+endif
+
+AM_CFLAGS = -fsigned-char $(WARN_CFLAGS)
+AM_CXXFLAGS = $(AM_CFLAGS)
+AM_LDFLAGS = $(ASAN_LDFLAGS) $(UBSAN_LDFLAGS) $(FUZZING_ENGINE_LDFLAGS)
+
+# Add gettext stuff to the global LDADD for systems with separate libintl
+# library. The LTLIBINTL is generated by AM_GNU_GETTEXT macro.
+#
+LDADD = $(LTLIBINTL)
+
+LIB_FUZZING_ENGINE ?= -fsanitize=fuzzer
+
+# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) Note
+# that blkid.h, libmount.h, libfdisk.h and libsmartcols.h are generated and
+# stored in build dirs.
+#
+ul_libblkid_incdir = $(top_builddir)/libblkid/src
+ul_libmount_incdir = $(top_builddir)/libmount/src
+ul_libsmartcols_incdir = $(top_builddir)/libsmartcols/src
+ul_libfdisk_incdir = $(top_builddir)/libfdisk/src
+
+ul_libuuid_incdir = $(top_srcdir)/libuuid/src
+
+bashcompletiondir = @bashcompletiondir@
+
+dist_noinst_HEADERS =
+dist_noinst_DATA =
+noinst_PROGRAMS =
+EXTRA_LTLIBRARIES =
+usrbin_exec_PROGRAMS =
+usrsbin_exec_PROGRAMS =
+man_MANS =
+pkgconfig_DATA =
+usrlib_exec_LTLIBRARIES =
+bin_PROGRAMS =
+sbin_PROGRAMS =
+dist_usrbin_exec_SCRIPTS =
+systemdsystemunit_DATA =
+dist_bashcompletion_DATA =
+check_PROGRAMS =
+dist_check_SCRIPTS =
+
+PATHFILES =
+ADOCFILES_COMMON =
+MANPAGES =
+MANLINKS =
+
+INSTALL_EXEC_HOOKS =
+UNINSTALL_HOOKS =
+INSTALL_DATA_HOOKS =
+CLEAN_LOCALS =
+CHECK_LOCALS =
+
+EXTRA_DIST =
+CLEANFILES =
+
+SUBDIRS = po
+
+if ENABLE_ASCIIDOC
+if ENABLE_POMAN
+SUBDIRS += po-man
+endif
+endif
+
+RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
+ -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST += \
+ .version \
+ autogen.sh \
+ Documentation \
+ po/update-potfiles \
+ README.licensing
+
+#include tools/Makemodule.am
+#include include/Makemodule.am
+#include lib/Makemodule.am
+include libuuid/Makemodule.am
+#include libblkid/Makemodule.am
+#include libmount/Makemodule.am
+#include libsmartcols/Makemodule.am
+#include libfdisk/Makemodule.am
+
+#include schedutils/Makemodule.am
+#include text-utils/Makemodule.am
+#include term-utils/Makemodule.am
+#include login-utils/Makemodule.am
+#include sys-utils/Makemodule.am
+#include misc-utils/Makemodule.am
+#include disk-utils/Makemodule.am
+
+#include bash-completion/Makemodule.am
+#include man-common/Makemodule.am
+
+#include tests/Makemodule.am
+
+# Meson files
+EXTRA_DIST += \
+ meson.build \
+ meson_options.txt \
+ tools/meson-make-manpage-stub.sh \
+ tools/meson-make-symlink.sh \
+ \
+ include/meson.build \
+ libblkid/meson.build \
+ libmount/meson.build \
+ libmount/python/meson.build \
+ misc-utils/meson.build \
+ libsmartcols/meson.build \
+ text-utils/meson.build \
+ po/meson.build \
+ lib/meson.build \
+ libuuid/meson.build \
+ sys-utils/meson.build \
+ libfdisk/meson.build \
+ term-utils/meson.build \
+ disk-utils/meson.build \
+ login-utils/meson.build
+
+# pylibmountexec module must be installed after usrlib_exec libraries,
+# otherwise the libtool relink step will fail to find libmount.la and
+# will try -lmount which is possibly not available.
+#
+# So introduce this dependency rule:
+# install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES
+@verbatim_pylibmount_dependency@
+
+#
+# Don't rely on configure.ac AC_CONFIG_FILES for install paths.
+#
+# The paths should be expanded at make time rather than configure:
+# - to support 'make install prefix=/foo DESTDIR=/foo'
+# - to recursively expands the paths (e.g. AC_CONFIG_FILES expands
+# '@usrsbin_execdir@' to ${exec_prefix}/sbin')
+#
+edit_cmd = sed \
+ -e 's|@prefix[@]|$(prefix)|g' \
+ -e 's|@exec_prefix[@]|$(exec_prefix)|g' \
+ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+ -e 's|@datadir[@]|$(datadir)|g' \
+ -e 's|@sbindir[@]|$(sbindir)|g' \
+ -e 's|@bindir[@]|$(bindir)|g' \
+ -e 's|@docdir[@]|$(docdir)|g' \
+ -e 's|@includedir[@]|$(includedir)|g' \
+ -e 's|@runstatedir[@]|$(runstatedir)|g' \
+ -e 's|@usrlib_execdir[@]|$(usrlib_execdir)|g' \
+ -e 's|@usrbin_execdir[@]|$(usrbin_execdir)|g' \
+ -e 's|@usrsbin_execdir[@]|$(usrsbin_execdir)|g' \
+ -e 's|@VERSION[@]|$(VERSION)|g' \
+ -e 's|@ADJTIME_PATH[@]|$(ADJTIME_PATH)|g' \
+ -e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \
+ -e 's|@LIBMOUNT_VERSION[@]|$(LIBMOUNT_VERSION)|g' \
+ -e 's|@LIBMOUNT_MAJOR_VERSION[@]|$(LIBMOUNT_MAJOR_VERSION)|g' \
+ -e 's|@LIBMOUNT_MINOR_VERSION[@]|$(LIBMOUNT_MINOR_VERSION)|g' \
+ -e 's|@LIBMOUNT_PATCH_VERSION[@]|$(LIBMOUNT_PATCH_VERSION)|g' \
+ -e 's|@LIBSMARTCOLS_VERSION[@]|$(LIBSMARTCOLS_VERSION)|g' \
+ -e 's|@LIBFDISK_PC_REQUIRES[@]|$(LIBFDISK_PC_REQUIRES)|g' \
+ -e 's|@LIBFDISK_VERSION[@]|$(LIBFDISK_VERSION)|g' \
+ -e 's|@LIBFDISK_MAJOR_VERSION[@]|$(LIBFDISK_MAJOR_VERSION)|g' \
+ -e 's|@LIBFDISK_MINOR_VERSION[@]|$(LIBFDISK_MINOR_VERSION)|g' \
+ -e 's|@LIBFDISK_PATCH_VERSION[@]|$(LIBFDISK_PATCH_VERSION)|g' \
+ -e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g'
+
+if HAVE_SELINUX
+edit_cmd += -e 's|@LIBSELINUX[@]|libselinux|g'
+else
+edit_cmd += -e 's|@LIBSELINUX[@]||g'
+endif
+
+if HAVE_CRYPTSETUP
+if CRYPTSETUP_VIA_DLOPEN
+edit_cmd += -e 's|@LIBCRYPTSETUP[@]||g'
+edit_cmd += -e 's|@LIBDL[@]|-ldl|g'
+else
+edit_cmd += -e 's|@LIBCRYPTSETUP[@]|libcryptsetup|g'
+edit_cmd += -e 's|@LIBDL[@]||g'
+endif
+else
+edit_cmd += -e 's|@LIBCRYPTSETUP[@]||g'
+edit_cmd += -e 's|@LIBDL[@]||g'
+endif
+
+if USE_VENDORDIR
+edit_cmd += -e 's|@vendordir[@]|$(vendordir)|g'
+else
+edit_cmd += -e 's|@vendordir[@]||g'
+endif
+
+CLEANFILES += $(PATHFILES) $(EXTRA_LTLIBRARIES)
+EXTRA_DIST += $(PATHFILES:=.in)
+
+$(PATHFILES): Makefile
+ @ rm -f $@ $@.tmp
+ $(AM_V_at) $(MKDIR_P) $$(dirname $@)
+ $(AM_V_GEN) srcdir=''; \
+ test -f ./$@.in || srcdir=$(srcdir)/; \
+ $(edit_cmd) $${srcdir}$@.in >$@.tmp
+ @ mv $@.tmp $@
+
+
+if ENABLE_ASCIIDOC
+EXTRA_DIST += $(ADOCFILES_COMMON) $(MANPAGES) $(MANLINKS)
+man_MANS += $(MANPAGES) $(MANLINKS)
+
+$(MANPAGES): $(ADOCFILES_COMMON)
+
+asciidoc_man_cmd = $(ASCIIDOCTOR) \
+ -b manpage \
+ -a 'release-version=$(VERSION)' \
+ -a 'package-docdir=$(docdir)' \
+ -a 'VERSION=$(VERSION)' \
+ -a 'ADJTIME_PATH=$(ADJTIME_PATH)'
+
+SUFFIXES = .1.adoc .3.adoc .5.adoc .8.adoc .1 .3 .5 .8
+.1.adoc.1 .3.adoc.3 .5.adoc.5 .8.adoc.8:
+ $(AM_V_GEN) test -f ./$@ || \
+ $(MKDIR_P) $$(dirname $@) && \
+ $(asciidoc_man_cmd) --base-dir=$(abs_srcdir) \
+ --destination-dir $(abs_builddir)/$$(dirname $@) $<
+
+$(MANLINKS): $(MANPAGES)
+gen-man: $(man_MANS)
+
+# Standard "make" follows BUILD_* macros from ./configure, and in this case, it
+# ignores man pages for disabled tools, but for distribution tarball, we need
+# to generate all man-pages (to avoid dependence on asciidoc). [kzak Jan-2022]
+gen-man-dist:
+ @list=`find -name *.adoc -not -path "*/man-common/*" -not -path "*/po-man/*" | sed -e 's/\.adoc//g'`; \
+ missing=`for p in $$list; do test -f $$p || echo $$p; done`; \
+ if test -n "$$missing"; then \
+ $(MAKE) $(AM_MAKEFLAGS) $$missing; \
+ fi;
+
+
+# !ENABLE_ASCIIDOC
+else
+
+if HAVE_MANPAGES
+EXTRA_DIST += $(ADOCFILES_COMMON) $(MANPAGES) $(MANLINKS)
+man_MANS += $(MANPAGES) $(MANLINKS)
+endif
+
+gen-man:
+gen-man-dist:
+endif
+
+
+# Arrange so that .tarball-version appears only in the distribution
+# tarball, and never in a checked-out repository.
+dist-hook: gen-man-dist
+ echo $(VERSION) > $(distdir)/.tarball-version
+# Set ChangeLog tag reference.
+ sed -i "s!log!log?h=v$(VERSION)!" $(distdir)/ChangeLog
+
+distclean-local:
+ -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f
+ rm -rf autom4te.cache
+
+
+checkincludes:
+ @find * $(RCS_FIND_IGNORE) \
+ -name '*.[hcS]' -type f -print | sort -u \
+ | xargs $(top_srcdir)/tools/checkincludes.pl
+
+checkconfig:
+ @find * $(RCS_FIND_IGNORE) \
+ -name '*.[hcS]' -type f -print | sort -u \
+ | xargs $(top_srcdir)/tools/checkconfig.sh $(top_srcdir)
+
+checkmans:
+ @$(top_srcdir)/tools/checkadoc-missing.sh
+ @$(top_srcdir)/tools/checkadoc-repeat.sh
+
+checkxalloc:
+ @ $(top_srcdir)/tools/checkxalloc.sh
+
+checkdecl:
+ @ $(top_srcdir)/tools/checkdecl.sh
+
+checkcompletion:
+ @ $(top_srcdir)/tools/checkcompletion.sh $(top_srcdir)
+
+checkusage:
+ @ $(top_srcdir)/tools/checkusage.sh \
+ $(bin_PROGRAMS) $(sbin_PROGRAMS) \
+ $(usrbin_exec_PROGRAMS) $(usrsbin_exec_PROGRAMS)
+checklibdoc:
+ @ $(top_srcdir)/tools/checklibdocs.sh \
+ $(top_srcdir)/libmount/src/libmount.sym \
+ $(top_srcdir)/libmount/docs/libmount-sections.txt
+ @ $(top_srcdir)/tools/checklibdocs.sh \
+ $(top_srcdir)/libfdisk/src/libfdisk.sym \
+ $(top_srcdir)/libfdisk/docs/libfdisk-sections.txt
+ @ $(top_srcdir)/tools/checklibdocs.sh \
+ $(top_srcdir)/libsmartcols/src/libsmartcols.sym \
+ $(top_srcdir)/libsmartcols/docs/libsmartcols-sections.txt
+ @ $(top_srcdir)/tools/checklibdocs.sh \
+ $(top_srcdir)/libblkid/src/libblkid.sym \
+ $(top_srcdir)/libblkid/docs/libblkid-sections.txt
+
+DISTCHECK_CONFIGURE_FLAGS = \
+ --disable-makeinstall-chown \
+ --disable-use-tty-group \
+ --disable-silent-rules \
+ --disable-rpath \
+ --enable-all-programs \
+ --enable-gtk-doc \
+ --with-python \
+ --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
+
+BUILT_SOURCES = .version
+.version:
+ echo $(VERSION) > $@-t && mv $@-t $@
+
+CHANGELOG_FILE = v$(VERSION)-ChangeLog
+
+$(CHANGELOG_FILE):
+ @ if test "x$$PREVIOUS_VERSION" == "x"; then \
+ echo "Usage make changelog PREVIOUS_VERSION=<version>"; \
+ exit 1; \
+ fi
+ @ echo "Changes between v$(PREVIOUS_VERSION) and v$(VERSION)" > $(CHANGELOG_FILE)
+ @ echo "--------------------------------------------" >> $(CHANGELOG_FILE)
+ @ echo >> $(CHANGELOG_FILE)
+ $(AM_V_GEN) git log --stat v$(PREVIOUS_VERSION)..HEAD >> $(CHANGELOG_FILE)
+#
+#
+# smatch scan -- smatch and cgcc are expected in $PATH
+#
+checksmatch:
+ $(MAKE) CHECK="smatch --data=$(abs_top_srcdir)/tools/smatch-data" CC=cgcc
+
+check-programs: $(check_PROGRAMS)
+
+changelog: $(CHANGELOG_FILE)
+
+install-exec-hook: $(INSTALL_EXEC_HOOKS)
+
+uninstall-hook: $(UNINSTALL_HOOKS)
+
+install-data-hook: $(INSTALL_DATA_HOOKS)
+
+clean-local: $(CLEAN_LOCALS)
+
+check-local: $(CHECK_LOCALS)
Index: create-2.38.1-libuuid-only-patch/util-linux-2.38.1-new
===================================================================
--- create-2.38.1-libuuid-only-patch/util-linux-2.38.1-new (nonexistent)
+++ create-2.38.1-libuuid-only-patch/util-linux-2.38.1-new (revision 5)
Property changes on: create-2.38.1-libuuid-only-patch/util-linux-2.38.1-new
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: create-2.38.1-libuuid-only-patch
===================================================================
--- create-2.38.1-libuuid-only-patch (nonexistent)
+++ create-2.38.1-libuuid-only-patch (revision 5)
Property changes on: create-2.38.1-libuuid-only-patch
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: create-2.38.1-nolist-ramdevs-patch/create.patch.sh
===================================================================
--- create-2.38.1-nolist-ramdevs-patch/create.patch.sh (nonexistent)
+++ create-2.38.1-nolist-ramdevs-patch/create.patch.sh (revision 5)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+VERSION=2.38.1
+
+tar --files-from=file.list -xJvf ../util-linux-$VERSION.tar.xz
+mv util-linux-$VERSION util-linux-$VERSION-orig
+
+cp -rf ./util-linux-$VERSION-new ./util-linux-$VERSION
+
+diff --unified -Nr util-linux-$VERSION-orig util-linux-$VERSION > util-linux-$VERSION-nolist-ramdevs.patch
+
+mv util-linux-$VERSION-nolist-ramdevs.patch ../patches
+
+rm -rf ./util-linux-$VERSION
+rm -rf ./util-linux-$VERSION-orig
Property changes on: create-2.38.1-nolist-ramdevs-patch/create.patch.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: create-2.38.1-nolist-ramdevs-patch/file.list
===================================================================
--- create-2.38.1-nolist-ramdevs-patch/file.list (nonexistent)
+++ create-2.38.1-nolist-ramdevs-patch/file.list (revision 5)
@@ -0,0 +1 @@
+util-linux-2.38.1/disk-utils/fdisk-list.c
Index: create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new/disk-utils/fdisk-list.c
===================================================================
--- create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new/disk-utils/fdisk-list.c (nonexistent)
+++ create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new/disk-utils/fdisk-list.c (revision 5)
@@ -0,0 +1,547 @@
+#include <libfdisk.h>
+#include <libsmartcols.h>
+#include <assert.h>
+
+#include "c.h"
+#include "xalloc.h"
+#include "nls.h"
+#include "blkdev.h"
+#include "mbsalign.h"
+#include "pathnames.h"
+#include "canonicalize.h"
+#include "strutils.h"
+#include "sysfs.h"
+#include "colors.h"
+#include "ttyutils.h"
+
+#include "fdisk-list.h"
+
+/* see init_fields() */
+static const char *fields_string;
+static int *fields_ids;
+static size_t fields_nids;
+static const struct fdisk_label *fields_label;
+
+static int is_ide_cdrom_or_tape(char *device)
+{
+ int fd, ret;
+
+ if ((fd = open(device, O_RDONLY|O_NONBLOCK)) < 0)
+ return 0;
+ ret = blkdev_is_cdrom(fd);
+
+ close(fd);
+ return ret;
+}
+
+void list_disk_identifier(struct fdisk_context *cxt)
+{
+ struct fdisk_label *lb = fdisk_get_label(cxt, NULL);
+ char *id = NULL;
+
+ if (fdisk_has_label(cxt))
+ fdisk_info(cxt, _("Disklabel type: %s"),
+ fdisk_label_get_name(lb));
+
+ if (!fdisk_is_details(cxt) && fdisk_get_disklabel_id(cxt, &id) == 0 && id) {
+ fdisk_info(cxt, _("Disk identifier: %s"), id);
+ free(id);
+ }
+}
+
+void list_disk_geometry(struct fdisk_context *cxt)
+{
+ struct fdisk_label *lb = fdisk_get_label(cxt, NULL);
+ uint64_t bytes = fdisk_get_nsectors(cxt) * fdisk_get_sector_size(cxt);
+ char *strsz = size_to_human_string(SIZE_DECIMAL_2DIGITS
+ | SIZE_SUFFIX_SPACE
+ | SIZE_SUFFIX_3LETTER, bytes);
+
+ color_scheme_enable("header", UL_COLOR_BOLD);
+ fdisk_info(cxt, _("Disk %s: %s, %ju bytes, %ju sectors"),
+ fdisk_get_devname(cxt), strsz,
+ bytes, (uintmax_t) fdisk_get_nsectors(cxt));
+ color_disable();
+ free(strsz);
+
+ if (fdisk_get_devmodel(cxt))
+ fdisk_info(cxt, _("Disk model: %s"), fdisk_get_devmodel(cxt));
+
+ if (lb && (fdisk_label_require_geometry(lb) || fdisk_use_cylinders(cxt)))
+ fdisk_info(cxt, _("Geometry: %d heads, %ju sectors/track, %ju cylinders"),
+ fdisk_get_geom_heads(cxt),
+ (uintmax_t) fdisk_get_geom_sectors(cxt),
+ (uintmax_t) fdisk_get_geom_cylinders(cxt));
+
+ fdisk_info(cxt, _("Units: %s of %d * %ld = %ld bytes"),
+ fdisk_get_unit(cxt, FDISK_PLURAL),
+ fdisk_get_units_per_sector(cxt),
+ fdisk_get_sector_size(cxt),
+ fdisk_get_units_per_sector(cxt) * fdisk_get_sector_size(cxt));
+
+ fdisk_info(cxt, _("Sector size (logical/physical): %lu bytes / %lu bytes"),
+ fdisk_get_sector_size(cxt),
+ fdisk_get_physector_size(cxt));
+ fdisk_info(cxt, _("I/O size (minimum/optimal): %lu bytes / %lu bytes"),
+ fdisk_get_minimal_iosize(cxt),
+ fdisk_get_optimal_iosize(cxt));
+ if (fdisk_get_alignment_offset(cxt))
+ fdisk_info(cxt, _("Alignment offset: %lu bytes"),
+ fdisk_get_alignment_offset(cxt));
+
+ list_disk_identifier(cxt);
+}
+
+void list_disklabel(struct fdisk_context *cxt)
+{
+ struct fdisk_table *tb = NULL;
+ struct fdisk_partition *pa = NULL;
+ struct fdisk_iter *itr = NULL;
+ struct fdisk_label *lb;
+ struct libscols_table *out = NULL;
+ const char *bold = NULL;
+ int *ids = NULL; /* IDs of fdisk_fields */
+ size_t nids = 0, i;
+ int post = 0;
+
+ /* print label specific stuff by libfdisk FDISK_ASK_INFO API */
+ fdisk_list_disklabel(cxt);
+
+ /* get partitions and generate output */
+ if (fdisk_get_partitions(cxt, &tb) || fdisk_table_get_nents(tb) <= 0)
+ goto done;
+
+ ids = init_fields(cxt, NULL, &nids);
+ if (!ids)
+ goto done;
+
+ itr = fdisk_new_iter(FDISK_ITER_FORWARD);
+ if (!itr) {
+ fdisk_warn(cxt, _("failed to allocate iterator"));
+ goto done;
+ }
+
+ out = scols_new_table();
+ if (!out) {
+ fdisk_warn(cxt, _("failed to allocate output table"));
+ goto done;
+ }
+
+ if (colors_wanted()) {
+ scols_table_enable_colors(out, 1);
+ bold = color_scheme_get_sequence("header", UL_COLOR_BOLD);
+ }
+
+ lb = fdisk_get_label(cxt, NULL);
+ assert(lb);
+
+ /* define output table columns */
+ for (i = 0; i < nids; i++) {
+ int fl = 0;
+ struct libscols_column *co;
+ const struct fdisk_field *field =
+ fdisk_label_get_field(lb, ids[i]);
+ if (!field)
+ continue;
+ if (fdisk_field_is_number(field))
+ fl |= SCOLS_FL_RIGHT;
+ if (fdisk_field_get_id(field) == FDISK_FIELD_TYPE)
+ fl |= SCOLS_FL_TRUNC;
+
+ co = scols_table_new_column(out,
+ _(fdisk_field_get_name(field)),
+ fdisk_field_get_width(field), fl);
+ if (!co)
+ goto done;
+
+ /* set column header color */
+ if (bold)
+ scols_cell_set_color(scols_column_get_header(co), bold);
+ }
+
+ /* fill-in output table */
+ while (fdisk_table_next_partition(tb, itr, &pa) == 0) {
+ struct libscols_line *ln = scols_table_new_line(out, NULL);
+
+ if (!ln) {
+ fdisk_warn(cxt, _("failed to allocate output line"));
+ goto done;
+ }
+
+ for (i = 0; i < nids; i++) {
+ char *data = NULL;
+
+ if (fdisk_partition_to_string(pa, cxt, ids[i], &data))
+ continue;
+ if (scols_line_refer_data(ln, i, data)) {
+ fdisk_warn(cxt, _("failed to add output data"));
+ goto done;
+ }
+ }
+ }
+
+ /* print */
+ if (!scols_table_is_empty(out)) {
+ fdisk_info(cxt, "%s", ""); /* just line break */
+ scols_print_table(out);
+ }
+
+ /* print warnings */
+ fdisk_reset_iter(itr, FDISK_ITER_FORWARD);
+ while (itr && fdisk_table_next_partition(tb, itr, &pa) == 0) {
+ if (!fdisk_partition_has_start(pa))
+ continue;
+ if (!fdisk_lba_is_phy_aligned(cxt, fdisk_partition_get_start(pa))) {
+ if (!post)
+ fdisk_info(cxt, "%s", ""); /* line break */
+ fdisk_warnx(cxt, _("Partition %zu does not start on physical sector boundary."),
+ fdisk_partition_get_partno(pa) + 1);
+ post++;
+ }
+ if (fdisk_partition_has_wipe(cxt, pa)) {
+ if (!post)
+ fdisk_info(cxt, "%s", ""); /* line break */
+
+ fdisk_info(cxt, _("Filesystem/RAID signature on partition %zu will be wiped."),
+ fdisk_partition_get_partno(pa) + 1);
+ post++;
+ }
+ }
+
+ if (fdisk_table_wrong_order(tb)) {
+ if (!post)
+ fdisk_info(cxt, "%s", ""); /* line break */
+ fdisk_info(cxt, _("Partition table entries are not in disk order."));
+ }
+done:
+ scols_unref_table(out);
+ fdisk_unref_table(tb);
+ fdisk_free_iter(itr);
+}
+
+void list_freespace(struct fdisk_context *cxt)
+{
+ struct fdisk_table *tb = NULL;
+ struct fdisk_partition *pa = NULL;
+ struct fdisk_iter *itr = NULL;
+ struct libscols_table *out = NULL;
+ const char *bold = NULL;
+ size_t i;
+ uintmax_t sumsize = 0, bytes = 0;
+ char *strsz;
+
+ static const char *colnames[] = { N_("Start"), N_("End"), N_("Sectors"), N_("Size") };
+ static const int colids[] = { FDISK_FIELD_START, FDISK_FIELD_END, FDISK_FIELD_SECTORS, FDISK_FIELD_SIZE };
+
+ if (fdisk_get_freespaces(cxt, &tb))
+ goto done;
+
+ itr = fdisk_new_iter(FDISK_ITER_FORWARD);
+ if (!itr) {
+ fdisk_warn(cxt, _("failed to allocate iterator"));
+ goto done;
+ }
+
+ out = scols_new_table();
+ if (!out) {
+ fdisk_warn(cxt, _("failed to allocate output table"));
+ goto done;
+ }
+
+ if (colors_wanted()) {
+ scols_table_enable_colors(out, 1);
+ bold = color_scheme_get_sequence("header", UL_COLOR_BOLD);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(colnames); i++) {
+ struct libscols_column *co = scols_table_new_column(out, _(colnames[i]), 5, SCOLS_FL_RIGHT);
+
+ if (!co)
+ goto done;
+ if (bold)
+ scols_cell_set_color(scols_column_get_header(co), bold);
+ }
+
+ /* fill-in output table */
+ while (fdisk_table_next_partition(tb, itr, &pa) == 0) {
+ struct libscols_line *ln = scols_table_new_line(out, NULL);
+ char *data;
+
+ if (!ln) {
+ fdisk_warn(cxt, _("failed to allocate output line"));
+ goto done;
+ }
+ for (i = 0; i < ARRAY_SIZE(colids); i++) {
+ if (fdisk_partition_to_string(pa, cxt, colids[i], &data))
+ continue;
+ if (scols_line_refer_data(ln, i, data)) {
+ fdisk_warn(cxt, _("failed to add output data"));
+ goto done;
+ }
+ }
+
+ if (fdisk_partition_has_size(pa))
+ sumsize += fdisk_partition_get_size(pa);
+ }
+
+ bytes = sumsize * fdisk_get_sector_size(cxt);
+ strsz = size_to_human_string(SIZE_DECIMAL_2DIGITS
+ | SIZE_SUFFIX_SPACE
+ | SIZE_SUFFIX_3LETTER, bytes);
+
+ color_scheme_enable("header", UL_COLOR_BOLD);
+ fdisk_info(cxt, _("Unpartitioned space %s: %s, %ju bytes, %ju sectors"),
+ fdisk_get_devname(cxt), strsz,
+ bytes, sumsize);
+ color_disable();
+ free(strsz);
+
+ fdisk_info(cxt, _("Units: %s of %d * %ld = %ld bytes"),
+ fdisk_get_unit(cxt, FDISK_PLURAL),
+ fdisk_get_units_per_sector(cxt),
+ fdisk_get_sector_size(cxt),
+ fdisk_get_units_per_sector(cxt) * fdisk_get_sector_size(cxt));
+
+ fdisk_info(cxt, _("Sector size (logical/physical): %lu bytes / %lu bytes"),
+ fdisk_get_sector_size(cxt),
+ fdisk_get_physector_size(cxt));
+
+ /* print */
+ if (!scols_table_is_empty(out)) {
+ fdisk_info(cxt, "%s", ""); /* line break */
+ scols_print_table(out);
+ }
+done:
+ scols_unref_table(out);
+ fdisk_unref_table(tb);
+ fdisk_free_iter(itr);
+}
+
+char *next_proc_partition(FILE **f)
+{
+ char line[128 + 1];
+
+ if (!*f) {
+ *f = fopen(_PATH_PROC_PARTITIONS, "r");
+ if (!*f) {
+ warn(_("cannot open %s"), _PATH_PROC_PARTITIONS);
+ return NULL;
+ }
+ }
+
+ while (fgets(line, sizeof(line), *f)) {
+ char buf[PATH_MAX], *cn;
+ dev_t devno;
+
+ if (sscanf(line, " %*d %*d %*d %128[^\n ]", buf) != 1)
+ continue;
+
+ devno = sysfs_devname_to_devno(buf);
+ if (devno <= 0)
+ continue;
+
+ /* Don't list /dev/ram* devices */
+ if (strstr(line, "ram") && devno >= 256)
+ continue;
+
+ if (sysfs_devno_is_dm_private(devno, NULL) ||
+ sysfs_devno_is_wholedisk(devno) <= 0)
+ continue;
+
+ if (!sysfs_devno_to_devpath(devno, buf, sizeof(buf)))
+ continue;
+
+ cn = canonicalize_path(buf);
+ if (!cn)
+ continue;
+
+ if (!is_ide_cdrom_or_tape(cn))
+ return cn;
+ }
+ fclose(*f);
+ *f = NULL;
+
+ return NULL;
+}
+
+int print_device_pt(struct fdisk_context *cxt, char *device, int warnme,
+ int verify, int separator)
+{
+ if (fdisk_assign_device(cxt, device, 1) != 0) { /* read-only */
+ if (warnme || errno == EACCES)
+ warn(_("cannot open %s"), device);
+ return -1;
+ }
+
+ if (separator)
+ fputs("\n\n", stdout);
+
+ list_disk_geometry(cxt);
+
+ if (fdisk_has_label(cxt)) {
+ list_disklabel(cxt);
+ if (verify)
+ fdisk_verify_disklabel(cxt);
+ }
+ fdisk_deassign_device(cxt, 1);
+ return 0;
+}
+
+int print_device_freespace(struct fdisk_context *cxt, char *device, int warnme,
+ int separator)
+{
+ if (fdisk_assign_device(cxt, device, 1) != 0) { /* read-only */
+ if (warnme || errno == EACCES)
+ warn(_("cannot open %s"), device);
+ return -1;
+ }
+
+ if (separator)
+ fputs("\n\n", stdout);
+
+ list_freespace(cxt);
+ fdisk_deassign_device(cxt, 1);
+ return 0;
+}
+
+void print_all_devices_pt(struct fdisk_context *cxt, int verify)
+{
+ FILE *f = NULL;
+ int sep = 0;
+ char *dev;
+
+ while ((dev = next_proc_partition(&f))) {
+ print_device_pt(cxt, dev, 0, verify, sep);
+ free(dev);
+ sep = 1;
+ }
+}
+
+void print_all_devices_freespace(struct fdisk_context *cxt)
+{
+ FILE *f = NULL;
+ int sep = 0;
+ char *dev;
+
+ while ((dev = next_proc_partition(&f))) {
+ print_device_freespace(cxt, dev, 0, sep);
+ free(dev);
+ sep = 1;
+ }
+}
+
+/* usable for example in usage() */
+void list_available_columns(FILE *out)
+{
+ size_t i;
+ int termwidth;
+ struct fdisk_label *lb = NULL;
+ struct fdisk_context *cxt = fdisk_new_context();
+
+ if (!cxt)
+ return;
+
+ termwidth = get_terminal_width(80);
+
+ fprintf(out, USAGE_COLUMNS);
+
+ while (fdisk_next_label(cxt, &lb) == 0) {
+ size_t width = 6; /* label name and separators */
+
+ fprintf(out, " %s:", fdisk_label_get_name(lb));
+ for (i = 1; i < FDISK_NFIELDS; i++) {
+ const struct fdisk_field *fl = fdisk_label_get_field(lb, i);
+ const char *name = fl ? fdisk_field_get_name(fl) : NULL;
+ size_t len;
+
+ if (!name)
+ continue;
+ len = strlen(name) + 1;
+ if (width + len > (size_t) termwidth) {
+ fputs("\n ", out);
+ width = 6;
+ }
+ fprintf(out, " %s", name);
+ width += len;
+ }
+ fputc('\n', out);
+ }
+
+ fdisk_unref_context(cxt);
+}
+
+static int fieldname_to_id(const char *name, size_t namesz)
+{
+ const struct fdisk_field *fl;
+ char buf[namesz + 1];
+
+ assert(name);
+ assert(namesz);
+ assert(fields_label);
+
+ memcpy(buf, name, namesz);
+ buf[namesz] = '\0';
+
+ fl = fdisk_label_get_field_by_name(fields_label, buf);
+ if (!fl) {
+ warnx(_("%s unknown column: %s"),
+ fdisk_label_get_name(fields_label), buf);
+ return -1;
+ }
+ return fdisk_field_get_id(fl);
+}
+
+/*
+ * Initialize array with output columns (fields_ids[]) according to
+ * comma delimited list of columns (@str). If the list string is not
+ * defined then use library defaults. This function is "-o <list>"
+ * backend.
+ *
+ * If the columns are already initialized then returns already existing columns.
+ */
+int *init_fields(struct fdisk_context *cxt, const char *str, size_t *n)
+{
+ int *dflt_ids = NULL;
+ struct fdisk_label *lb;
+
+ if (!fields_string)
+ fields_string = str;
+ if (!cxt)
+ goto done;
+
+ lb = fdisk_get_label(cxt, NULL);
+
+ if (!lb || fields_label != lb) { /* label changed: reset */
+ free(fields_ids);
+ fields_ids = NULL;
+ fields_label = lb;
+ fields_nids = 0;
+ }
+
+ if (!fields_label) /* no label */
+ goto done;
+ if (fields_nids)
+ goto done; /* already initialized */
+
+ /* library default */
+ if (fdisk_label_get_fields_ids(NULL, cxt, &dflt_ids, &fields_nids))
+ goto done;
+
+ fields_ids = xcalloc(FDISK_NFIELDS * 2, sizeof(int));
+
+ /* copy defaults to the list with wanted fields */
+ memcpy(fields_ids, dflt_ids, fields_nids * sizeof(int));
+ free(dflt_ids);
+
+ /* extend or replace fields_nids[] according to fields_string */
+ if (fields_string &&
+ string_add_to_idarray(fields_string, fields_ids, FDISK_NFIELDS * 2,
+ &fields_nids, fieldname_to_id) < 0)
+ exit(EXIT_FAILURE);
+done:
+ fields_label = NULL;
+ if (n)
+ *n = fields_nids;
+ return fields_ids;
+}
+
Index: create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new/disk-utils
===================================================================
--- create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new/disk-utils (nonexistent)
+++ create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new/disk-utils (revision 5)
Property changes on: create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new/disk-utils
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new
===================================================================
--- create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new (nonexistent)
+++ create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new (revision 5)
Property changes on: create-2.38.1-nolist-ramdevs-patch/util-linux-2.38.1-new
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: create-2.38.1-nolist-ramdevs-patch
===================================================================
--- create-2.38.1-nolist-ramdevs-patch (nonexistent)
+++ create-2.38.1-nolist-ramdevs-patch (revision 5)
Property changes on: create-2.38.1-nolist-ramdevs-patch
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: patches/README
===================================================================
--- patches/README (nonexistent)
+++ patches/README (revision 5)
@@ -0,0 +1,6 @@
+
+/* begin *
+
+ TODO: Leave some comment here.
+
+ * end */
Index: patches
===================================================================
--- patches (nonexistent)
+++ patches (revision 5)
Property changes on: patches
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: .
===================================================================
--- . (nonexistent)
+++ . (revision 5)
Property changes on: .
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Radix cross Linux
The main Radix cross Linux repository contains the build scripts of packages, which have the most complete and common functionality for desktop machines
383 Commits
1 Branch
1 Tag