From 8bfd21ababeb65cb8fa1670534a60b7f9cdd7911 Mon Sep 17 00:00:00 2001 From: ston <2424284164@qq.com> Date: Mon, 9 Jan 2023 00:07:41 +0800 Subject: [PATCH] sys-boot/ventoy-bin: bump version Signed-off-by: ston --- .github/workflows/overlay.toml | 7 +++ sys-boot/ventoy-bin/Manifest | 2 +- sys-boot/ventoy-bin/files/sanitize.patch | 63 ++----------------- sys-boot/ventoy-bin/metadata.xml | 2 +- ...1.0.81.ebuild => ventoy-bin-1.0.87.ebuild} | 32 +++++----- 5 files changed, 30 insertions(+), 76 deletions(-) rename sys-boot/ventoy-bin/{ventoy-bin-1.0.81.ebuild => ventoy-bin-1.0.87.ebuild} (73%) diff --git a/.github/workflows/overlay.toml b/.github/workflows/overlay.toml index e82ff60ba..ee4efb489 100644 --- a/.github/workflows/overlay.toml +++ b/.github/workflows/overlay.toml @@ -913,6 +913,13 @@ github = "openSUSE/zypper" use_latest_tag = true github_account = "HougeLangley" +["sys-boot/ventoy-bin"] +source = "github" +github = "ventoy/Ventoy" +use_latest_release = true +prefix = "v" +github_account = "st0nie" + # upstream is no longer actively maintained, ignore it #["sys-devel/ucc"] diff --git a/sys-boot/ventoy-bin/Manifest b/sys-boot/ventoy-bin/Manifest index 87e243bd8..44bc0c6b0 100644 --- a/sys-boot/ventoy-bin/Manifest +++ b/sys-boot/ventoy-bin/Manifest @@ -1 +1 @@ -DIST ventoy-1.0.81-linux.tar.gz 19814925 BLAKE2B fe9e337c3b085fa24b9b01d7fa79b07e885e5512a76c47d91ad8c5a4489102b985ffb9e3366d174d76d7050450c3f7342780bbb72580722dea3f00e5c8033b5e SHA512 95c60536ec94b899b3e67e032f22c80177a9b90e40d68dff58d76717922622077f950f8b11e301d82a80f80c35c99ab2e34fa117848ce88b2dbe268aaf1ebbfc +DIST ventoy-1.0.87-linux.tar.gz 19897340 BLAKE2B 3e11e1dd42b472f6c44569a639f05650312a0a2c65cd30158a87e275da268efe161cc2c6c3306acce8d0e33352a4a8423d8041c17d0ba6dfbc6023e61445979b SHA512 2813892245377a40cc22fd4494a35068d18327a0dbcacc67ee41bc7baf897bd6e4d426e69d600cbc36968299e1f054babe84045335cba6df61d417cb4076aea0 diff --git a/sys-boot/ventoy-bin/files/sanitize.patch b/sys-boot/ventoy-bin/files/sanitize.patch index 18e837e58..ed98be7aa 100644 --- a/sys-boot/ventoy-bin/files/sanitize.patch +++ b/sys-boot/ventoy-bin/files/sanitize.patch @@ -123,68 +123,17 @@ diff -rup old/Ventoy2Disk.sh new/Ventoy2Disk.sh -fi +./tool/VentoyWorker.sh $* 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 +--- VentoyPlugson.sh 2022-12-24 06:00:51.000000000 -0700 ++++ VentoyPlugson.sh 2022-12-24 08:18:59.154268575 -0700 +@@ -34,8 +34,6 @@ if echo $machine | grep -E -q 'aarch64|a TOOLDIR=aarch64 - elif echo $machine | egrep -q 'x86_64|amd64'; then + elif echo $machine | grep -E -q 'x86_64|amd64'; then TOOLDIR=x86_64 --elif echo $machine | egrep -q 'mips64'; then +-elif echo $machine | grep -E -q 'mips64'; then - TOOLDIR=mips64el - elif echo $machine | egrep -q 'i[3-6]86'; then + elif echo $machine | grep -E -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 diff --git a/sys-boot/ventoy-bin/metadata.xml b/sys-boot/ventoy-bin/metadata.xml index 7459c2cdb..10fe5c7b5 100644 --- a/sys-boot/ventoy-bin/metadata.xml +++ b/sys-boot/ventoy-bin/metadata.xml @@ -3,7 +3,7 @@ ston - 2424284164@qq.com + ston.jia@qq.com ventoy/Ventoy diff --git a/sys-boot/ventoy-bin/ventoy-bin-1.0.81.ebuild b/sys-boot/ventoy-bin/ventoy-bin-1.0.87.ebuild similarity index 73% rename from sys-boot/ventoy-bin/ventoy-bin-1.0.81.ebuild rename to sys-boot/ventoy-bin/ventoy-bin-1.0.87.ebuild index f57cd564b..432805bda 100644 --- a/sys-boot/ventoy-bin/ventoy-bin-1.0.81.ebuild +++ b/sys-boot/ventoy-bin/ventoy-bin-1.0.87.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ SLOT="0" KEYWORDS="~amd64" IUSE="" -RESTRICT="strip" +RESTRICT="strip mirror" DEPEND=" sys-fs/dosfstools @@ -29,29 +29,29 @@ CARCH="x86_64" src_prepare() { # Decompress tools - pushd tool/$CARCH + pushd tool/$CARCH || die for file in *.xz; do - xzcat $file > ${file%.xz} - chmod +x ${file%.xz} + xzcat "$file" >"${file%.xz}" || die + fperms +x "${file%.xz}" done # Cleanup .xz crap - rm -fv ./*.xz - popd + rm -fv ./*.xz || die + popd || die # Apply sanitize patch - patch --verbose -p0 < "${FILESDIR}/sanitize.patch" + eapply -p0 "${FILESDIR}/sanitize.patch" # Log location - sed -i 's|log\.txt|/var/log/ventoy.log|g' WebUI/static/js/languages.js tool/languages.json + sed -i 's|log\.txt|/var/log/ventoy.log|g' WebUI/static/js/languages.js tool/languages.json || die # Non-POSIX compliant scripts - sed -i 's|bin/sh|usr/bin/env bash|g' tool/{ventoy_lib.sh,VentoyWorker.sh} + sed -i 's|bin/sh|usr/bin/env bash|g' tool/{ventoy_lib.sh,VentoyWorker.sh} || die # Clean up unused binaries # Preserving mkexfatfs and mount.exfat-fuse because exfatprogs is incompatible for binary in xzcat hexdump; do - rm -fv tool/$CARCH/$binary + rm -fv tool/$CARCH/$binary || die done default } @@ -68,7 +68,7 @@ src_install() { insinto /opt/ventoy/tool/$CARCH/ doins tool/$CARCH/* insinto /opt/ventoy/ - doins *.sh plugin WebUI "VentoyGUI.$CARCH" + doins ./*.sh plugin WebUI "VentoyGUI.$CARCH" # Install .desktop insopts -m0644 @@ -78,13 +78,11 @@ src_install() { # Link system binaries for binary in xzcat hexdump; do - ln -s /usr/bin/$binary ./ - insopts -m0755 - insinto /opt/ventoy/tool/$CARCH - doins $binary + dosym -r /usr/bin/$binary /opt/ventoy/tool/$CARCH/$binary + fperm 0755 /opt/ventoy/tool/$CARCH/$binary done dobin "${FILESDIR}"/ventoy{,gui,web,plugson,-{,extend-}persistent} - rm ../../image/opt/ventoy/tool/x86_64/Ventoy2Disk.gtk2 + rm "${D}"/opt/ventoy/tool/x86_64/Ventoy2Disk.gtk2 || die }