makedeb
makedeb
An utility to directly boot image files without reformating the USB
Click here to go back to the commit logs for ventoy-bin.
Hash: 3fae6c75f7f1b60e967b08e6111e813f9a12b5c3
Message: update: ventoy-bin 1.0.62-3
adapt sanitize patch
diff --git a/.SRCINFO b/.SRCINFO
index 9026f47..5e89520 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ventoy-bin
pkgdesc = A new multiboot USB solution
pkgver = 1.0.62
- pkgrel = 2
+ pkgrel = 3
url = http://www.ventoy.net
install = ventoy.install
arch = aarch64
@@ -23,8 +23,8 @@ pkgbase = ventoy-bin
source = https://github.com/ventoy/Ventoy/releases/download/v1.0.62/ventoy-1.0.62-linux.tar.gz
source = ventoy
source = ventoygui
- source = ventoyplugson
source = ventoyweb
+ source = ventoyplugson
source = ventoy-persistent
source = ventoy-extend-persistent
source = ventoy.desktop
@@ -32,11 +32,11 @@ pkgbase = ventoy-bin
sha256sums = 073828200289bb07c9598ffc1ca82292ba62ec90a05ad34e3f489a292158f8dc
sha256sums = 1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000
sha256sums = cbe6f47007981ada5e27a092fac7620a926301a704b59186295552d9f64cb0e7
- sha256sums = 1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6
sha256sums = c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f
+ sha256sums = 1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6
sha256sums = 51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff
sha256sums = 00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df
sha256sums = 22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900
- sha256sums = 67c8c95719490376515719db41f84e812afb8d9f62b7a79ba8ede09afe6bf02c
+ sha256sums = 100ae29bc4e87a2dede71882689f7737041d5c0f1d7f30f23098cda74d9e9510
pkgname = ventoy-bin
diff --git a/PKGBUILD b/PKGBUILD
index 97ef8dd..42d254e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=ventoy-bin
pkgver=1.0.62
-pkgrel=2
+pkgrel=3
pkgdesc="A new multiboot USB solution"
arch=('aarch64' 'i686' 'x86_64')
url="http://www.ventoy.net"
@@ -22,8 +22,8 @@ install="${pkgname%-bin}.install"
source=("https://github.com/ventoy/Ventoy/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-linux.tar.gz"
"${pkgname%-bin}"
"${pkgname%-bin}gui"
- "${pkgname%-bin}plugson"
"${pkgname%-bin}web"
+ "${pkgname%-bin}plugson"
"${pkgname%-bin}-persistent"
"${pkgname%-bin}-extend-persistent"
"${pkgname%-bin}.desktop"
@@ -31,12 +31,12 @@ source=("https://github.com/ventoy/Ventoy/releases/download/v${pkgver}/${pkgname
sha256sums=('073828200289bb07c9598ffc1ca82292ba62ec90a05ad34e3f489a292158f8dc'
'1ad5d314e02b84127a5a59f3871eb1d28617218cad07cde3eeddcac391473000'
'cbe6f47007981ada5e27a092fac7620a926301a704b59186295552d9f64cb0e7'
- '1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6'
'c3d4463a878a89d96e5f0bc4e1a43e48f27af5965bd4c977567695d7cf91fe5f'
+ '1bbe66b52398be96402604562bddb5c9fbebfe345f0de184709e1c74086f2be6'
'51029745da197dded6e007aee3f30f7ea1aa6e898172a6ea176cc2f3a842d0ff'
'00dec31721a052d5e6c928e3b38b870959bdb42188f34717898d99c0cef950df'
'22225d48023806d0d15e059216ef4921de70cdb78348630be109fa9c669e2900'
- '67c8c95719490376515719db41f84e812afb8d9f62b7a79ba8ede09afe6bf02c')
+ '100ae29bc4e87a2dede71882689f7737041d5c0f1d7f30f23098cda74d9e9510')
prepare() {
cd "${pkgname%-bin}-$pkgver"
@@ -53,10 +53,10 @@ prepare() {
popd
# Apply sanitize patch
- patch --verbose -Np1 -i "$srcdir/sanitize.patch"
+ patch --verbose -p0 < "$srcdir/sanitize.patch"
# Log location
- sed -i 's|log\.txt|/var/log/ventoy.log|g' WebUI/static/js/languages.js
+ sed -i 's|log\.txt|/var/log/ventoy.log|g' WebUI/static/js/languages.js tool/languages.json
# Non-POSIX compliant scripts
sed -i 's|bin/sh|usr/bin/env bash|g' tool/{ventoy_lib.sh,VentoyWorker.sh}
@@ -72,7 +72,7 @@ package() {
cd "${pkgname%-bin}-$pkgver"
install -Dm644 -vt "$pkgdir/opt/${pkgname%-bin}/boot/" boot/*
install -Dm644 -vt "$pkgdir/opt/${pkgname%-bin}/${pkgname%-bin}/" "${pkgname%-bin}"/*
- install -Dm755 -vt "$pkgdir/opt/${pkgname%-bin}/tool/" tool/*.{cer,glade,json,sh,xz
+ install -Dm755 -vt "$pkgdir/opt/${pkgname%-bin}/tool/" tool/*.{cer,glade,json,sh}
install -Dm755 -vt "$pkgdir/opt/${pkgname%-bin}/tool/$CARCH/" tool/$CARCH/*
install -Dm755 -vt "$pkgdir/opt/${pkgname%-bin}/" *.sh
cp --no-preserve=o -avt "$pkgdir/opt/${pkgname%-bin}/" plugin WebUI
@@ -86,5 +86,5 @@ package() {
ln -svf /usr/bin/$binary "$pkgdir/opt/${pkgname%-bin}/tool/$CARCH/"
done
- install -Dm755 "$srcdir/${pkgname%-bin}"{,gui,plugson,web,-{,extend-}persistent} -vt "$pkgdir"/usr/bin/
+ install -Dm755 "$srcdir/${pkgname%-bin}"{,gui,web,-{,extend-}persistent,plugson} -vt "$pkgdir"/usr/bin/
}
diff --git a/sanitize.patch b/sanitize.patch
index 78c7e8d..c8f9e6a 100644
--- a/sanitize.patch
+++ b/sanitize.patch
@@ -5,10 +5,10 @@ Let me do some optimisations.
If you are interested to improve this patch, welcome to mail me.
-diff --unified --recursive --text ventoy-1.0.62.orig/tool/ventoy_lib.sh ventoy-1.0.62.new/tool/ventoy_lib.sh
---- ventoy-1.0.62.orig/tool/ventoy_lib.sh 2021-12-02 04:53:22.000000000 -0700
-+++ ventoy-1.0.62.new/tool/ventoy_lib.sh 2021-12-02 09:09:33.339996473 -0700
-@@ -29,7 +29,7 @@
+diff -rup old/tool/ventoy_lib.sh new/tool/ventoy_lib.sh
+--- tool/ventoy_lib.sh 2021-12-02 16:59:42.148650182 +0100
++++ tool/ventoy_lib.sh 2021-12-02 17:01:17.214720518 +0100
+@@ -29,7 +29,7 @@ vterr() {
}
vtdebug() {
@@ -17,7 +17,7 @@ diff --unified --recursive --text ventoy-1.0.62.orig/tool/ventoy_lib.sh ventoy-1
}
vtoy_gen_uuid() {
-@@ -52,30 +52,6 @@
+@@ -52,30 +52,6 @@ vtoy_gen_uuid() {
check_tool_work_ok() {
@@ -48,7 +48,7 @@ diff --unified --recursive --text ventoy-1.0.62.orig/tool/ventoy_lib.sh ventoy-1
vtdebug "tool check success ..."
ventoy_true
}
-@@ -269,7 +245,7 @@
+@@ -269,7 +245,7 @@ format_ventoy_disk_mbr() {
else
vtdebug "format disk by fdisk ..."
@@ -57,11 +57,10 @@ diff --unified --recursive --text ventoy-1.0.62.orig/tool/ventoy_lib.sh ventoy-1
o
n
p
-Only in ventoy-1.0.62.new/tool: ventoy_lib.sh.orig
-diff --unified --recursive --text ventoy-1.0.62.orig/tool/VentoyWorker.sh ventoy-1.0.62.new/tool/VentoyWorker.sh
---- ventoy-1.0.62.orig/tool/VentoyWorker.sh 2021-12-02 04:53:22.000000000 -0700
-+++ ventoy-1.0.62.new/tool/VentoyWorker.sh 2021-12-02 09:09:33.339996473 -0700
-@@ -99,7 +99,7 @@
+diff -rup old/tool/VentoyWorker.sh new/tool/VentoyWorker.sh
+--- tool/VentoyWorker.sh 2021-12-02 16:59:31.485642239 +0100
++++ tool/VentoyWorker.sh 2021-12-02 17:02:00.326752183 +0100
+@@ -99,7 +99,7 @@ vtdebug "MODE=$MODE FORCE=$FORCE RESERVE
if check_tool_work_ok; then
vtdebug "check tool work ok"
else
@@ -70,10 +69,10 @@ diff --unified --recursive --text ventoy-1.0.62.orig/tool/VentoyWorker.sh ventoy
exit 1
fi
-diff --unified --recursive --text ventoy-1.0.62.orig/Ventoy2Disk.sh ventoy-1.0.62.new/Ventoy2Disk.sh
---- ventoy-1.0.62.orig/Ventoy2Disk.sh 2021-12-02 04:53:22.000000000 -0700
-+++ ventoy-1.0.62.new/Ventoy2Disk.sh 2021-12-02 09:11:09.285825629 -0700
-@@ -32,48 +32,4 @@
+diff -rup old/Ventoy2Disk.sh new/Ventoy2Disk.sh
+--- Ventoy2Disk.sh 2021-12-02 16:59:05.205622608 +0100
++++ Ventoy2Disk.sh 2021-12-02 17:03:29.037816991 +0100
+@@ -32,48 +32,4 @@ echo " https://www.ventoy.net"
echo '**********************************************'
echo ''
@@ -123,10 +122,73 @@ diff --unified --recursive --text ventoy-1.0.62.orig/Ventoy2Disk.sh ventoy-1.0.6
- fi
-fi
+./tool/VentoyWorker.sh $*
-diff --unified --recursive --text ventoy-1.0.62.orig/VentoyWeb.sh ventoy-1.0.62.new/VentoyWeb.sh
---- ventoy-1.0.62.orig/VentoyWeb.sh 2021-12-02 04:53:22.000000000 -0700
-+++ ventoy-1.0.62.new/VentoyWeb.sh 2021-12-02 09:09:33.339996473 -0700
-@@ -15,12 +15,6 @@
+diff -rup old/VentoyPlugson.sh new/VentoyPlugson.sh
+--- VentoyPlugson.sh 2021-12-02 17:54:36.055868878 +0100
++++ VentoyPlugson.sh 2021-12-02 18:04:40.919633986 +0100
+@@ -25,8 +19,6 @@ if echo $machine | egrep -q 'aarch64|arm
+ TOOLDIR=aarch64
+ elif echo $machine | egrep -q 'x86_64|amd64'; then
+ TOOLDIR=x86_64
+-elif echo $machine | egrep -q 'mips64'; then
+- TOOLDIR=mips64el
+ elif echo $machine | egrep -q 'i[3-6]86'; then
+ TOOLDIR=i386
+ else
+@@ -35,38 +27,6 @@ else
+ fi
+
+
+-if ! [ -f "$OLDDIR/tool/plugson.tar.xz" ]; then
+- echo "Please run under the correct directory!"
+- exit 1
+-fi
+-
+-echo "############# VentoyPlugson $* [$TOOLDIR] ################" >> ./VentoyPlugson.log
+-date >> ./VentoyPlugson.log
+-
+-echo "decompress tools" >> ./VentoyPlugson.log
+-cd ./tool/$TOOLDIR
+-
+-ls *.xz > /dev/null 2>&1
+-if [ $? -eq 0 ]; then
+- [ -f ./xzcat ] && chmod +x ./xzcat
+-
+- for file in $(ls *.xz); do
+- echo "decompress $file" >> ./VentoyPlugson.log
+- xzcat $file > ${file%.xz}
+- [ -f ./${file%.xz} ] && chmod +x ./${file%.xz}
+- [ -f ./$file ] && rm -f ./$file
+- done
+-fi
+-
+-cd ../../
+-chmod +x -R ./tool/$TOOLDIR
+-
+-if ! [ -f "$OLDDIR/tool/$TOOLDIR/Plugson" ]; then
+- echo "$OLDDIR/tool/$TOOLDIR/Plugson does not exist!"
+- exit 1
+-fi
+-
+-
+ PATH=./tool/$TOOLDIR:$PATH
+
+ HOST="127.0.0.1"
+@@ -208,11 +168,3 @@ if [ -f /proc/$wID/maps ]; then
+
+ wait $wID
+ fi
+-
+-
+-if [ -n "$OLDDIR" ]; then
+- CURDIR=$(pwd)
+- if [ "$CURDIR" != "$OLDDIR" ]; then
+- cd "$OLDDIR"
+- fi
+-fi
+diff -rup old/VentoyWeb.sh new/VentoyWeb.sh
+--- VentoyWeb.sh 2021-12-02 16:58:51.885612627 +0100
++++ VentoyWeb.sh 2021-12-02 17:04:43.437871014 +0100
+@@ -15,12 +15,6 @@ print_err() {
echo ""
}
@@ -139,7 +201,7 @@ diff --unified --recursive --text ventoy-1.0.62.orig/VentoyWeb.sh ventoy-1.0.62.
OLDDIR=$(pwd)
if uname -m | egrep -q 'aarch64|arm64'; then
-@@ -85,8 +79,8 @@
+@@ -85,8 +79,8 @@ if ps -ef | grep "V2DServer.*$HOST.*$POR
exit 1
fi
diff --git a/ventoygui b/ventoygui
old mode 100644
new mode 100755
diff --git a/ventoyplugson b/ventoyplugson
old mode 100644
new mode 100755