Skip to content

Commit dcd7ee6

Browse files
committed
Silence mksquashfs warnings by excluding btrfs attributes
When mksquashfs encounters btrfs attributes which indicate that the file is transparently compressed, it can't embed this info in the squashfs and prints a warning about that. Silence the warnings by excluding btrfs attributes as done already in the rest of the code base. This aligns the mksquashfs invocation in this regard.
1 parent c8c5ba6 commit dcd7ee6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build_library/prod_image_util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ create_prod_image() {
129129

130130
sudo cp -a "${root_fs_dir}" "${BUILD_DIR}/root_fs_dir2"
131131
sudo rsync -a --delete "${BUILD_DIR}/configroot/etc/portage" "${BUILD_DIR}/root_fs_dir2/etc"
132-
sudo mksquashfs "${BUILD_DIR}/root_fs_dir2" "${BUILD_DIR}/${image_sysext_base}" -noappend
132+
sudo mksquashfs "${BUILD_DIR}/root_fs_dir2" "${BUILD_DIR}/${image_sysext_base}" -noappend -xattrs-exclude '^btrfs.'
133133
sudo rm -rf "${BUILD_DIR}/root_fs_dir2"
134134

135135
# clean-ups of things we do not need

build_sysext

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ if [[ "$FLAGS_generate_pkginfo" = "${FLAGS_TRUE}" ]] ; then
233233
mkdir -p "${BUILD_DIR}/img-pkginfo/var/db"
234234
cp -R "${BUILD_DIR}/install-root/var/db/pkg" "${BUILD_DIR}/img-pkginfo/var/db/"
235235
mksquashfs "${BUILD_DIR}/img-pkginfo" "${BUILD_DIR}/${SYSEXTNAME}_pkginfo.raw" \
236-
-noappend -comp "${FLAGS_compression}" ${FLAGS_mksquashfs_opts}
236+
-noappend -xattrs-exclude '^btrfs.' -comp "${FLAGS_compression}" ${FLAGS_mksquashfs_opts}
237237
fi
238238

239239
info "Writing ${SYSEXTNAME}_packages.txt"
@@ -284,7 +284,7 @@ info "Removing opaque directory markers to always merge all contents"
284284
find "${BUILD_DIR}/install-root" -xdev -type d -exec sh -c 'if [ "$(attr -R -q -g overlay.opaque {} 2>/dev/null)" = y ]; then attr -R -r overlay.opaque {}; fi' \;
285285

286286
mksquashfs "${BUILD_DIR}/install-root" "${BUILD_DIR}/${SYSEXTNAME}.raw" \
287-
-noappend -comp "${FLAGS_compression}" ${FLAGS_mksquashfs_opts}
287+
-noappend -xattrs-exclude '^btrfs.' -comp "${FLAGS_compression}" ${FLAGS_mksquashfs_opts}
288288
rm -rf "${BUILD_DIR}"/{fs-root,install-root,workdir}
289289

290290
# Generate reports

0 commit comments

Comments
 (0)