Skip to content

Commit e76f46c

Browse files
committed
Fix cpio_to_iso.sh
1 parent dc7827c commit e76f46c

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

scripts/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ install() {
3535
cp -L $IMAGES_DIR/secret-vm-rootfs-gpu-qemux86-64.rootfs.cpio $ARTIFACTS_DIR/rootfs-gpu.cpio
3636
cp -L $IMAGES_DIR/secret-vm-initramfs-qemux86-64.rootfs.cpio.gz $ARTIFACTS_DIR/initramfs.cpio.gz
3737
cp -L $IMAGES_DIR/ovmf.fd $ARTIFACTS_DIR/ovmf.fd
38-
$SCRIPTS_DIR/cpio_to_iso.sh $ARTIFACTS_DIR/rootfs.cpio $ARTIFACTS_DIR rootfs
39-
$SCRIPTS_DIR/cpio_to_iso.sh $ARTIFACTS_DIR/rootfs-gpu.cpio $ARTIFACTS_DIR rootfs-gpu
38+
$SCRIPTS_DIR/cpio_to_iso.sh $ARTIFACTS_DIR/rootfs.cpio $ARTIFACTS_DIR rootfs.iso
39+
$SCRIPTS_DIR/cpio_to_iso.sh $ARTIFACTS_DIR/rootfs-gpu.cpio $ARTIFACTS_DIR rootfs-gpu.iso
4040
qemu-img create -f qcow2 $ARTIFACTS_DIR/encryptedfs.qcow2 300G
4141
}
4242

scripts/cpio_to_iso.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,29 @@ TMP_PATH=$SCRIPTS_DIR/tmp
77
CPIO_IMG_ABSOLUTE_PATH=$(realpath $1)
88
DESTINATION_DIR=$(realpath $2)
99
FILENAME=$3
10-
SOURCE_DATE_EPOCH="$(date -d20000101 -u +%s)"
10+
export SOURCE_DATE_EPOCH="$(date -d20000101 -u +%s)"
1111

1212
pushd .
1313

1414
mkdir -p $TMP_PATH/rootfs
1515
cd $TMP_PATH/rootfs
1616
cpio -idmv < $CPIO_IMG_ABSOLUTE_PATH
1717

18+
find . -maxdepth 1 -not -path . | LC_ALL=C sort > pathlist
19+
1820
xorriso \
1921
-preparer_id xorriso \
22+
-volume_date 'all' "=$SOURCE_DATE_EPOCH" \
2023
-volume_date 'all_file_dates' "=$SOURCE_DATE_EPOCH" \
24+
-padding 0 \
2125
-as mkisofs \
22-
-R \
26+
-iso-level 3 \
27+
-graft-points \
28+
-full-iso9660-filenames \
2329
-uid 0 \
2430
-gid 0 \
25-
-output $DESTINATION_DIR/$FILENAME.iso \
26-
.
31+
-path-list pathlist \
32+
-output $DESTINATION_DIR/$FILENAME
2733

2834
rm -rf $TMP_PATH
2935

0 commit comments

Comments
 (0)