From 68f0f0a512d738309cda5ee75809fddf4366c773 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Wed, 29 Jun 2022 15:08:42 +0900 Subject: [PATCH] postscript: Add verbatims object for not elf files For files in PROGS or WITHSLIBS, it copies with dependent libraries for elf file, but for non elf file, finding dependency causes mic warning logs. Add verbatims object for non elf files as like initrd-recovery. This removes below mic warning messages: INFO - /etc/blkid.conf: error while loading shared libraries: /etc/blkid.conf: invalid ELF header INFO - /usr/bin/verityctl: error while loading shared libraries: /usr/bin/verityctl: invalid ELF header Change-Id: I9346d210045b489bf2527f8c191003a52ddf4046 Signed-off-by: Seung-Woo Kim --- data/initrd-file-dmverity-upgrade.list | 5 ++++- data/initrd-file-dmverity.list | 5 ++++- data/initrd-file.list | 5 ++++- scripts/mkinitrd.sh | 13 +++++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/data/initrd-file-dmverity-upgrade.list b/data/initrd-file-dmverity-upgrade.list index 5999dab..9a07c45 100644 --- a/data/initrd-file-dmverity-upgrade.list +++ b/data/initrd-file-dmverity-upgrade.list @@ -1,3 +1,7 @@ +VERBATIMS=" +/usr/bin/verityctl +" + WITHLIBS=" /sbin/tune2fs /sbin/veritysetup @@ -6,5 +10,4 @@ WITHLIBS=" /usr/bin/ls /usr/bin/lsblk /usr/bin/tee -/usr/bin/verityctl " diff --git a/data/initrd-file-dmverity.list b/data/initrd-file-dmverity.list index 2de91ad..2825791 100644 --- a/data/initrd-file-dmverity.list +++ b/data/initrd-file-dmverity.list @@ -1,3 +1,7 @@ +VERBATIMS=" +/usr/bin/verityctl +" + PROGS=" /bin/dd /bin/gawk @@ -6,5 +10,4 @@ PROGS=" /sbin/tune2fs /sbin/dmsetup /sbin/veritysetup -/usr/bin/verityctl " diff --git a/data/initrd-file.list b/data/initrd-file.list index f5000a5..c9e421e 100644 --- a/data/initrd-file.list +++ b/data/initrd-file.list @@ -18,6 +18,10 @@ DIR_LINKS=" /lib:usr/lib " +VERBATIMS=" +/etc/blkid.conf +" + PROGS=" /bin/wc /bin/find @@ -36,7 +40,6 @@ PROGS=" /sbin/fsck.ext4 /sbin/resize2fs /sbin/btrfs -/etc/blkid.conf /sbin/fsck.f2fs /sbin/resize.f2fs /sbin/modprobe diff --git a/scripts/mkinitrd.sh b/scripts/mkinitrd.sh index affdfaf..ac2cf78 100755 --- a/scripts/mkinitrd.sh +++ b/scripts/mkinitrd.sh @@ -84,17 +84,20 @@ get_initrd_objects() { for list in ${OBJECTS_SPECIFY_LIST}; do SYS_SKELDIR= DIR_LINKS= + VERBATIMS= PROGS= SYM_LINKS= source "${list}" OBJECTS_SYS_SKELDIR="$OBJECTS_SYS_SKELDIR $SYS_SKELDIR" OBJECTS_DIR_LINKS="$OBJECTS_DIR_LINKS $DIR_LINKS" + OBJECTS_VERBATIMS="$OBJECTS_VERBATIMS $VERBATIMS" OBJECTS_PROGS="$OBJECTS_PROGS $PROGS" OBJECTS_SYM_LINKS="$OBJECTS_SYM_LINKS $SYM_LINKS" done SYS_SKELDIR=$(echo "$OBJECTS_SYS_SKELDIR" | sort | uniq) DIR_LINKS=$(echo "$OBJECTS_DIR_LINKS" | sort | uniq) + VERBATIMS=$(echo "$OBJECTS_VERBATIMS" | sort | uniq) PROGS=$(echo "$OBJECTS_PROGS" | sort | uniq) SYM_LINKS=$(echo "$OBJECTS_SYM_LINKS" | sort | uniq) } @@ -109,6 +112,15 @@ prepare_directory_objects() { } #----------------------------------------------------------------------------- +# Copy verbatim objects +#----------------------------------------------------------------------------- +verbatim_objects() { + for obj in $@; do + do_copy $obj + done +} + +#----------------------------------------------------------------------------- # Copy program objects #----------------------------------------------------------------------------- program_objects() { @@ -147,6 +159,7 @@ make_initrd() { prepare_directory_objects $SYS_SKELDIR symlink_objects $DIR_LINKS + verbatim_objects $VERBATIMS program_objects $PROGS symlink_objects $SYM_LINKS -- 2.7.4