Skip to content

GitLab

Commit 4707b76b authored by longpanda's avatar longpanda
Browse files

Rebuild some binaries with musl-libc to avoid virus false positive (issue #660)

parent ff0ad76d
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 47 deletions
BUSYBOX/build.txt
View file @ 4707b76b
======== Build busybox 1.32 for aarch64 ======== ======== How to build ash/hexdump/xzcat for aarch64 ========
#How to get ash.config/hexdump.cofig/xzcat.config
ARCH=arm64 CROSS_COMPILE=aarch64-linux- make defconfig #ARCH=arm64 CROSS_COMPILE=aarch64-linux- make allnoconfig
ARCH=arm64 CROSS_COMPILE=aarch64-linux- make menuconfig #ARCH=arm64 CROSS_COMPILE=aarch64-linux- make menuconfig
----> enable static build #----> enable static build
----> enable ar #----> enable xzcat
----> enable inotifyd #get aarch64_xzcat.config
tar xf busybox-1.32.0.tar.bz2
cd busybox-1.32.0
copy aarch64_xzcat.config as .config
ARCH=arm64 CROSS_COMPILE=aarch64-linux- make ARCH=arm64 CROSS_COMPILE=aarch64-linux- make
rename ./busybox to xzcat
======== How to build ash/hexdump/xzcat for x86_64 ==========
#How to get ash.config/hexdump.cofig/xzcat.config
#make allnoconfig
#make menuconfig
#----> enable static build
#----> enable xzcat
#get x86_64_xzcat.config
ARCH=arm64 CROSS_COMPILE=aarch64-linux- make allnoconfig
tar xf busybox-1.32.0.tar.bz2
cd busybox-1.32.0
copy x86_64_xzcat.config as .config
modify Makefile
CC = gcc -specs "/usr/local/musl/lib/musl-gcc.specs"
MODFLAGS = -DMODULE -specs "/usr/local/musl/lib/musl-gcc.specs"
make
rename ./busybox to xzcat
======== use mini-native-x86_64 uclibc to build ash/hexdump/busybox for x86_64 ==========
BUSYBOX/chmod/build.sh
View file @ 4707b76b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
DSTDIR=../../IMG/cpio/ventoy/busybox DSTDIR=../../IMG/cpio/ventoy/busybox
rm -f vtchmod32 vtchmod64 vtchmodaa64 rm -f vtchmod32 vtchmod64 vtchmod64_musl vtchmodaa64
rm -f $DSTDIR/vtchmod32 $DSTDIR/vtchmod64 $DSTDIR/vtchmodaa64 rm -f $DSTDIR/vtchmod32 $DSTDIR/vtchmod64 $DSTDIR/vtchmodaa64
/opt/diet32/bin/diet gcc -Os -m32 vtchmod.c -o vtchmod32 /opt/diet32/bin/diet gcc -Os -m32 vtchmod.c -o vtchmod32
...@@ -10,12 +10,16 @@ rm -f $DSTDIR/vtchmod32 $DSTDIR/vtchmod64 $DSTDIR/vtchmodaa64 ...@@ -10,12 +10,16 @@ rm -f $DSTDIR/vtchmod32 $DSTDIR/vtchmod64 $DSTDIR/vtchmodaa64
aarch64-linux-gcc -Os -static vtchmod.c -o vtchmodaa64 aarch64-linux-gcc -Os -static vtchmod.c -o vtchmodaa64
aarch64-linux-strip --strip-all vtchmodaa64 aarch64-linux-strip --strip-all vtchmodaa64
gcc -specs "/usr/local/musl/lib/musl-gcc.specs" -Os -static vtchmod.c -o vtchmod64_musl
strip --strip-all vtchmod64_musl
chmod 777 vtchmod32 chmod 777 vtchmod32
chmod 777 vtchmod64 chmod 777 vtchmod64
chmod 777 vtchmodaa64 chmod 777 vtchmodaa64
chmod 777 vtchmod64_musl
cp -a vtchmod32 $DSTDIR/ cp -a vtchmod32 $DSTDIR/
cp -a vtchmod64 $DSTDIR/ cp -a vtchmod64 $DSTDIR/
cp -a vtchmodaa64 $DSTDIR/ cp -a vtchmodaa64 $DSTDIR/
cp -a vtchmod64_musl $DSTDIR/
DMSETUP/build.txt
View file @ 4707b76b
...@@ -36,20 +36,16 @@ build for 32bit, static linked with dietlibc ...@@ -36,20 +36,16 @@ build for 32bit, static linked with dietlibc
======================== Build for 64bit dmsetup ========================= ======================== Build for 64bit dmsetup =========================
https://www.uclibc.org/downloads/binaries/0.9.30.1/mini-native-x86_64.tar.bz2
1. extract device mapper source code 1. extract device mapper source code
2. extract mini-native-x86_64.tar.bz2 2. ./configure --disable-nls --disable-selinux --disable-shared --enable-static_link CC='gcc -specs /usr/local/musl/lib/musl-gcc.specs'
3. chroot to mini-native-x86_64 3. touch include/linux/limits.h include/linux/types.h
3. ./configure --disable-nls --disable-selinux --disable-shared --enable-static_link echo '#include <sys/mount.h>' > include/linux/fs.h
4. make 4. make
5. strip dmsetup/dmsetup.static 5. strip --strip-all dmsetup/dmsetup.static
6. get dmsetup/dmsetup.static as the dmsetup64 binary file 6. get dmsetup/dmsetup.static as the dmsetup64 binary file
======================== Build for arm64 dmsetup ========================= ======================== Build for arm64 dmsetup =========================
https://www.uclibc.org/downloads/binaries/0.9.30.1/mini-native-x86_64.tar.bz2
1. extract device mapper source code 1. extract device mapper source code
2. ./configure CC=aarch64-linux-gcc --target=arm --host=x86_64-linux-gnu --disable-nls --disable-selinux --disable-shared --enable-static_link 2. ./configure CC=aarch64-linux-gcc --target=arm --host=x86_64-linux-gnu --disable-nls --disable-selinux --disable-shared --enable-static_link
3. modify include/configure.h file 3. modify include/configure.h file
......
DMSETUP/dmsetup64
View file @ 4707b76b
No preview for this file type
DOC/BuildVentoyFromSource.txt
View file @ 4707b76b
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
2.2 Download third-part source code 2.2 Download third-part source code
https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz ===> /home/Ventoy-master/DOC/dietlibc-0.34.tar.xz https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz ===> /home/Ventoy-master/DOC/dietlibc-0.34.tar.xz
https://musl.libc.org/releases/musl-1.2.1.tar.gz ===> /home/Ventoy-master/DOC/musl-1.2.1.tar.gz
https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz ===> /home/Ventoy-master/GRUB2/grub-2.04.tar.xz https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz ===> /home/Ventoy-master/GRUB2/grub-2.04.tar.xz
https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911 ===> /home/Ventoy-master/EDK2/edk2-edk2-stable201911.zip https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911 ===> /home/Ventoy-master/EDK2/edk2-edk2-stable201911.zip
https://codeload.github.com/relan/exfat/zip/v1.3.0 ===> /home/Ventoy-master/ExFAT/exfat-1.3.0.zip https://codeload.github.com/relan/exfat/zip/v1.3.0 ===> /home/Ventoy-master/ExFAT/exfat-1.3.0.zip
...@@ -34,6 +35,19 @@ ...@@ -34,6 +35,19 @@
https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz ===> /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz ===> /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz
https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2 ===> /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2 https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2 ===> /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2
2.3 Prepare third-part tools
cd /home/Ventoy-master/DOC/
tar xf musl-1.2.1.tar.gz
cd musl-1.2.1
./configure && make install
tar xf /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz -C /opt
tar xf /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2 -C /opt
2.4 Set PATH envrioment
export PATH=$PATH:/opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu/bin:/opt/aarch64--uclibc--stable-2020.08-1/bin
better to add this line to /root/.bashrc and relogin as root
========================================== ==========================================
3. All in one script 3. All in one script
......
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
View file @ 4707b76b
...@@ -1709,6 +1709,7 @@ int ventoy_check_device_result(int ret) ...@@ -1709,6 +1709,7 @@ int ventoy_check_device_result(int ret)
int ventoy_check_device(grub_device_t dev) int ventoy_check_device(grub_device_t dev)
{ {
int workaround = 0;
grub_file_t file; grub_file_t file;
grub_uint64_t offset; grub_uint64_t offset;
char devname[64]; char devname[64];
...@@ -1725,12 +1726,30 @@ int ventoy_check_device(grub_device_t dev) ...@@ -1725,12 +1726,30 @@ int ventoy_check_device(grub_device_t dev)
if (0 == ventoy_check_file_exist("(%s,2)/ventoy/ventoy.cpio", dev->disk->name) || if (0 == ventoy_check_file_exist("(%s,2)/ventoy/ventoy.cpio", dev->disk->name) ||
0 == ventoy_check_file_exist("(%s,2)/grub/localboot.cfg", dev->disk->name) || 0 == ventoy_check_file_exist("(%s,2)/grub/localboot.cfg", dev->disk->name) ||
0 == ventoy_check_file_exist("(%s,2)/tool/mount.exfat-fuse_aarch64", dev->disk->name)) 0 == ventoy_check_file_exist("(%s,2)/tool/mount.exfat-fuse_aarch64", dev->disk->name))
{
#ifndef GRUB_MACHINE_EFI
if (0 == ventoy_check_file_exist("(ventoydisk)/ventoy/ventoy.cpio", dev->disk->name) ||
0 == ventoy_check_file_exist("(ventoydisk)/grub/localboot.cfg", dev->disk->name) ||
0 == ventoy_check_file_exist("(ventoydisk)/tool/mount.exfat-fuse_aarch64", dev->disk->name))
{ {
return ventoy_check_device_result(2 | 0x1000); return ventoy_check_device_result(2 | 0x1000);
} }
else
{
workaround = 1;
}
#endif
}
/* We must have partition 2 */ /* We must have partition 2 */
if (workaround)
{
file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "%s", "(ventoydisk)/ventoy/ventoy.cpio");
}
else
{
file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "(%s,2)/ventoy/ventoy.cpio", dev->disk->name); file = ventoy_grub_file_open(VENTOY_FILE_TYPE, "(%s,2)/ventoy/ventoy.cpio", dev->disk->name);
}
if (!file) if (!file)
{ {
return ventoy_check_device_result(3 | 0x1000); return ventoy_check_device_result(3 | 0x1000);
...@@ -1748,37 +1767,55 @@ int ventoy_check_device(grub_device_t dev) ...@@ -1748,37 +1767,55 @@ int ventoy_check_device(grub_device_t dev)
return ventoy_check_device_result(5); return ventoy_check_device_result(5);
} }
if (workaround)
{
ventoy_part_table *PartTbl = g_ventoy_part_info->MBR.PartTbl;
if (PartTbl[1].StartSectorId != PartTbl[0].StartSectorId + PartTbl[0].SectorCount ||
PartTbl[1].SectorCount != 65536)
{
grub_file_close(file);
return ventoy_check_device_result(6);
}
}
else
{
offset = partition->start + partition->len; offset = partition->start + partition->len;
partition = file->device->disk->partition; partition = file->device->disk->partition;
if ((partition->number != 1) || (partition->len != 65536) || (offset != partition->start)) if ((partition->number != 1) || (partition->len != 65536) || (offset != partition->start))
{ {
grub_file_close(file); grub_file_close(file);
return ventoy_check_device_result(6); return ventoy_check_device_result(7);
}
} }
grub_file_close(file); grub_file_close(file);
if (workaround == 0)
{
grub_snprintf(devname, sizeof(devname), "%s,2", dev->disk->name); grub_snprintf(devname, sizeof(devname), "%s,2", dev->disk->name);
dev2 = grub_device_open(devname); dev2 = grub_device_open(devname);
if (!dev2) if (!dev2)
{ {
return ventoy_check_device_result(7); return ventoy_check_device_result(8);
} }
fs = grub_fs_probe(dev2); fs = grub_fs_probe(dev2);
if (!fs) if (!fs)
{ {
grub_device_close(dev2); grub_device_close(dev2);
return ventoy_check_device_result(8); return ventoy_check_device_result(9);
} }
fs->fs_label(dev2, &label); fs->fs_label(dev2, &label);
if ((!label) || grub_strncmp("VTOYEFI", label, 7)) if ((!label) || grub_strncmp("VTOYEFI", label, 7))
{ {
grub_device_close(dev2); grub_device_close(dev2);
return ventoy_check_device_result(9); return ventoy_check_device_result(10);
} }
grub_device_close(dev2); grub_device_close(dev2);
}
return ventoy_check_device_result(0); return ventoy_check_device_result(0);
} }
......
IMG/cpio/sbin/init
View file @ 4707b76b
...@@ -47,8 +47,8 @@ if [ -e $BUSYBOX_PATH/32h ]; then ...@@ -47,8 +47,8 @@ if [ -e $BUSYBOX_PATH/32h ]; then
if [ -s $BUSYBOX_PATH/busybox ]; then if [ -s $BUSYBOX_PATH/busybox ]; then
$BUSYBOX_PATH/vtchmod64 $BUSYBOX_PATH/busybox $BUSYBOX_PATH/vtchmod64 $BUSYBOX_PATH/busybox
else else
$BUSYBOX_PATH/xzminidec64_uclibc < $BUSYBOX_PATH/busybox64.xz > $BUSYBOX_PATH/busybox $BUSYBOX_PATH/xzminidec64_musl < $BUSYBOX_PATH/busybox64.xz > $BUSYBOX_PATH/busybox
$BUSYBOX_PATH/vtchmod64_uclibc $BUSYBOX_PATH/busybox $BUSYBOX_PATH/vtchmod64_musl $BUSYBOX_PATH/busybox
fi fi
fi fi
else else
......
INSTALL/tool/x86_64/ash
View file @ 4707b76b
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment