erofs-utils: Provide identical functionality without libuuid
Subsystems (2)
PATCH v2 1/1 erofs-utils: Provide identical functionality without libuuid
The motivation is to have standalone (statically linked) erofs binaries for simple initrd images, that are nevertheless able to (re)create erofs images with a given UUID.
For this reason a few of libuuid functions have implementations added directly in erofs-utils.
A header liberofs_uuid.h provides the new functions, which are always available. A further sideeffect is that code can be simplified which calls into this functionality.
The uuid_unparse function replacement is always a private implementation and split into its own file, this further restricts the (optional) dependency on libuuid only to the erofs-mkfs tool.
---
/* v2 */
- Norbert Lange <[email protected]>
- Change to useing unsigned int
- Some small formatting fixes
- Remove some now useless "not available" inititalisations of uuid strings
---
--- dump/Makefile.am | 2 +- dump/main.c | 10 ++-- fsck/Makefile.am | 2 +- lib/Makefile.am | 4 +- lib/liberofs_uuid.h | 9 ++++ lib/uuid.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ lib/uuid_unparse.c | 21 +++++++++ mkfs/Makefile.am | 6 +-- mkfs/main.c | 23 ++-------- 9 files changed, 153 insertions(+), 32 deletions(-) create mode 100644 lib/liberofs_uuid.h create mode 100644 lib/uuid.c create mode 100644 lib/uuid_unparse.c
dump/Makefile.am +1 -1
@@ -7,4 +7,4 @@ AM_CPPFLAGS = ${libuuid_CFLAGS} dump_erofs_SOURCES = main.c dump_erofs_CFLAGS = -Wall -I$(top_srcdir)/include dump_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} + ${liblz4_LIBS} ${liblzma_LIBS}
dump/main.c +3 -7
@@ -17,10 +17,8 @@#include "erofs/compress.h" #include "erofs/fragments.h" #include "../lib/liberofs_private.h" +#include "../lib/liberofs_uuid.h" -#ifdef HAVE_LIBUUID -#include <uuid.h> -#endif struct erofsdump_cfg {unsigned int totalshow;
@@ -592,7 +590,7 @@ static void erofsdump_print_statistic(void)static void erofsdump_show_superblock (void ) {time_t time = sbi.build_time; -char uuid_str[37 ] ="not available" ; +char uuid_str[37 ];int i =0 ; fprintf(stdout, "Filesystem magic number: 0x%04X\n",
@@ -620,9 +618,7 @@ static void erofsdump_show_superblock(void)if (feat & feature_lists[i].flag)fprintf (stdout,"%s " , feature_lists[i].name); } -#ifdef HAVE_LIBUUID -uuid_unparse_lower (sbi.uuid, uuid_str); -#endif +erofs_uuid_unparse_lower (sbi.uuid, uuid_str);fprintf (stdout,"\nFilesystem UUID: %s\n" , uuid_str); }
fsck/Makefile.am +1 -1
@@ -7,4 +7,4 @@ AM_CPPFLAGS = ${libuuid_CFLAGS} fsck_erofs_SOURCES = main.c fsck_erofs_CFLAGS = -Wall -I$(top_srcdir)/include fsck_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} + ${liblz4_LIBS} ${liblzma_LIBS}
lib/Makefile.am +2 -2
@@ -29,9 +29,9 @@ noinst_HEADERS += compressor.h liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ namei.c data.c compress.c compressor.c zmap.c decompress.c \ compress_hints.c hashmap.c sha256.c blobchunk.c dir.c \ - fragments.c rb_tree.c dedupe.c + fragments.c rb_tree.c dedupe.c uuid_unparse.c uuid.c -liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include +liberofs_la_CFLAGS = -Wall ${libuuid_CFLAGS} -I$(top_srcdir)/include if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS} liberofs_la_SOURCES += compressor_lz4.c
lib/liberofs_uuid.h new file +9 -0
@@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0+ OR Apache-2.0 */ +#ifndef __EROFS_LIB_UUID_H +#define __EROFS_LIB_UUID_H + +void erofs_uuid_generate (unsigned char *out); +void erofs_uuid_unparse_lower (const unsigned char *buf,char *out); +int erofs_uuid_parse (const char *in,unsigned char *uu); + +#endif
lib/uuid.c new file +108 -0
109 lines not on this page · raw message
lib/uuid_unparse.c new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ OR Apache-2.0 +/* +* Copyright (C) 2023 Norbert Lange <[email protected]> +*/ + +#include <stdio.h> + +#include "erofs/config.h" +#include "liberofs_uuid.h" + +void erofs_uuid_unparse_lower (const unsigned char *buf,char *out) { +sprintf (out,"%04x%04x-%04x-%04x-%04x-%04x%04x%04x" , + (buf[0 ] <<8 ) | buf[1 ], + (buf[2 ] <<8 ) | buf[3 ], + (buf[4 ] <<8 ) | buf[5 ], + (buf[6 ] <<8 ) | buf[7 ], + (buf[8 ] <<8 ) | buf[9 ], + (buf[10 ] <<8 ) | buf[11 ], + (buf[12 ] <<8 ) | buf[13 ], + (buf[14 ] <<8 ) | buf[15 ]); +}
mkfs/Makefile.am +3 -3
@@ -2,8 +2,8 @@ AUTOMAKE_OPTIONS = foreign bin_PROGRAMS = mkfs.erofs -AM_CPPFLAGS = ${libuuid_CFLAGS} ${libselinux_CFLAGS} +AM_CPPFLAGS = ${libselinux_CFLAGS} mkfs_erofs_SOURCES = main.c mkfs_erofs_CFLAGS = -Wall -I$(top_srcdir)/include -mkfs_erofs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${liblz4_LIBS} ${liblzma_LIBS} +mkfs_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ + ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS}
mkfs/main.c +5 -18
@@ -26,10 +26,7 @@#include "erofs/blobchunk.h" #include "erofs/fragments.h" #include "../lib/liberofs_private.h" - -#ifdef HAVE_LIBUUID -#include <uuid.h> -#endif +#include "../lib/liberofs_uuid.h" #define EROFS_SUPER_END (EROFS_SUPER_OFFSET + sizeof(struct erofs_super_block))
@@ -90,9 +87,7 @@ static void usage(void)" -EX[,...] X=extended options\n" " -L volume-label set the volume label (maximum 16)\n" " -T# set a fixed UNIX timestamp # to all files\n" -#ifdef HAVE_LIBUUID" -UX use a given filesystem UUID\n" -#endif" --all-root make all files owned by root\n" " --blobdev=X specify an extra device X to store chunked data\n" " --chunksize=# generate chunk-based files with #-byte chunks\n"
@@ -328,14 +323,12 @@ static int mkfs_parse_options_cfg(int argc, char *argv[]) } cfg.c_timeinherit =TIMESTAMP_FIXED ;break ; -#ifdef HAVE_LIBUUID case 'U' : -if (uuid_parse (optarg, sbi.uuid)) { +if (erofs_uuid_parse (optarg, sbi.uuid)) {erofs_err ("invalid UUID %s" , optarg);return -EINVAL ; }break ; -#endif case 2 : opt =erofs_parse_exclude_path (optarg, false);if (opt) {
@@ -626,11 +619,7 @@ static void erofs_mkfs_default_options(void)EROFS_FEATURE_COMPAT_MTIME ;/* generate a default uuid first */ -#ifdef HAVE_LIBUUID -do { -uuid_generate (sbi.uuid); - }while (uuid_is_null (sbi.uuid)); -#endif +erofs_uuid_generate (sbi.uuid); }/* https://reproducible-builds.org/specs/source-date-epoch/ for more details */
@@ -675,7 +664,7 @@ int main(int argc, char **argv)struct stat st;erofs_blk_t nblocks;struct timeval t; -char uuid_str[37 ] ="not available" ; +char uuid_str[37 ];erofs_init_configure ();erofs_mkfs_default_options ();
@@ -803,9 +792,7 @@ int main(int argc, char **argv) erofs_strerror(err)); goto exit; } -#ifdef HAVE_LIBUUID -uuid_unparse_lower (sbi.uuid, uuid_str); -#endif +erofs_uuid_unparse_lower (sbi.uuid, uuid_str);erofs_info ("filesystem UUID: %s" , uuid_str);erofs_inode_manager_init ();
Signature · 1 line
2.39.2
Quoted 10 lines · Norbert Lange
The motivation is to have standalone (statically linked) erofs binaries for simple initrd images, that are nevertheless able to (re)create erofs images with a given UUID.
For this reason a few of libuuid functions have implementations added directly in erofs-utils.
A headerliberofs_uuid.hprovides the new functions, which are always available. A further sideeffect is that code can be simplified which calls into this functionality.
Quoted 5 lines
The
uuid_unparsefunction replacement is always a private implementation and split into its own file, this further restricts the (optional) dependency on libuuid only to the erofs-mkfs tool.Signed-off-by Norbert Lange <[email protected]>
I've rebased it on -dev branch (rather than other branches) and apply it to experimental branch for testing.