mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-23 08:20:00 +00:00
toolchain: migrate from p7zip to 7-zip
The -l option to 7za is not included the 7-Zip 22.01 version,
it was an option added to the p7zip version:
don't store symlinks; store the files/directories they point to
(CAUTION : the scanning stage can never end because of recursive
symlinks like 'ln -s .. ldir')
The default for p7zip 16.02 7za was to store symlinks.
The default for 7-zip 22.01 7za is not to store symlinks.
test output is below and the -l option has been dropped from scripts/install_addon
$ ls -l test
total 4
-rw-r--r-- 1 docker docker 4 Jan 29 10:35 abc
lrwxrwxrwx 1 docker docker 3 Jan 29 10:35 def -> abc
7-Zip (a) 22.01 (x64) : Copyright (c) 1999-2022 Igor Pavlov : 2022-07-15
64-bit locale=en_US.UTF-8 Threads:16
$ 7za a -mx9 -bsp0 -bso0 -tzip test.zip test
$ unzip -v test.zip
Archive: test.zip
Length Method Size Cmpr Date Time CRC-32 Name
-------- ------ ------- ---- ---------- ----- -------- ----
0 Stored 0 0% 2023-01-29 10:36 00000000 test/
4 Stored 4 0% 2023-01-29 10:35 4788814e test/abc
4 Stored 4 0% 2023-01-29 10:35 4788814e test/def
-------- ------- --- -------
8 8 0% 3 files
7-Zip (a) [64] 16.02 : Copyright (c) 1999-2016 Igor Pavlov : 2016-05-21
p7zip Version 16.02 (locale=en_US.UTF-8,Utf16=on,HugeFiles=on,64 bits,16 CPUs x64)
$ 7za a -mx9 -bsp0 -bso0 -tzip test.zip test
$ unzip -v test.zip
Length Method Size Cmpr Date Time CRC-32 Name
-------- ------ ------- ---- ---------- ----- -------- ----
0 Stored 0 0% 2023-01-29 10:35 00000000 test/
4 Stored 4 0% 2023-01-29 10:35 4788814e test/abc
3 Stored 3 0% 2023-01-29 10:35 352441c2 test/def
-------- ------- --- -------
7 7 0% 3 files
7-Zip (a) [64] 16.02 : Copyright (c) 1999-2016 Igor Pavlov : 2016-05-21
p7zip Version 16.02 (locale=en_US.UTF-8,Utf16=on,HugeFiles=on,64 bits,16 CPUs x64)
$ 7za a -l -mx9 -bsp0 -bso0 -tzip test.zip test
$ unzip -v test.zip
Archive: test.zip
Length Method Size Cmpr Date Time CRC-32 Name
-------- ------ ------- ---- ---------- ----- -------- ----
0 Stored 0 0% 2023-01-29 10:35 00000000 test/
4 Stored 4 0% 2023-01-29 10:35 4788814e test/abc
4 Stored 4 0% 2023-01-29 10:35 4788814e test/def
-------- ------- --- -------
8 8 0% 3 files
This commit is contained in:
Rudi Heitbaum
parent
f128cc4746
commit
c2a52dc4ac
@ -9,7 +9,7 @@ PKG_ARCH="any"
|
|||||||
PKG_LICENSE="nonfree"
|
PKG_LICENSE="nonfree"
|
||||||
PKG_SITE="http://support.sundtek.com/"
|
PKG_SITE="http://support.sundtek.com/"
|
||||||
PKG_URL=""
|
PKG_URL=""
|
||||||
PKG_DEPENDS_TARGET="xmlstarlet:host p7zip:host"
|
PKG_DEPENDS_TARGET="xmlstarlet:host 7-zip:host"
|
||||||
PKG_SECTION="driver/dvb"
|
PKG_SECTION="driver/dvb"
|
||||||
PKG_SHORTDESC="Sundtek MediaTV: a Linux driver to add support for SUNDTEK USB DVB devices"
|
PKG_SHORTDESC="Sundtek MediaTV: a Linux driver to add support for SUNDTEK USB DVB devices"
|
||||||
PKG_LONGDESC="Install this to add support for Sundtek USB DVB devices."
|
PKG_LONGDESC="Install this to add support for Sundtek USB DVB devices."
|
||||||
|
|||||||
@ -10,7 +10,7 @@ PKG_ARCH="any"
|
|||||||
PKG_LICENSE="OSS"
|
PKG_LICENSE="OSS"
|
||||||
PKG_SITE="https://libreelec.tv"
|
PKG_SITE="https://libreelec.tv"
|
||||||
PKG_URL="https://github.com/LibreELEC/script.config.vdr/archive/${PKG_VERSION}.tar.gz"
|
PKG_URL="https://github.com/LibreELEC/script.config.vdr/archive/${PKG_VERSION}.tar.gz"
|
||||||
PKG_DEPENDS_TARGET="xmlstarlet:host p7zip:host"
|
PKG_DEPENDS_TARGET="xmlstarlet:host 7-zip:host"
|
||||||
PKG_SECTION=""
|
PKG_SECTION=""
|
||||||
PKG_SHORTDESC="script.config.vdr"
|
PKG_SHORTDESC="script.config.vdr"
|
||||||
PKG_LONGDESC="script.config.vdr"
|
PKG_LONGDESC="script.config.vdr"
|
||||||
|
|||||||
@ -7,7 +7,7 @@ PKG_VERSION=""
|
|||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="https://libreelec.tv"
|
PKG_SITE="https://libreelec.tv"
|
||||||
PKG_URL=""
|
PKG_URL=""
|
||||||
PKG_DEPENDS_HOST="autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host p7zip:host pigz:host sed:host xmlstarlet:host xz:host"
|
PKG_DEPENDS_HOST="7-zip:host autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host pigz:host sed:host xmlstarlet:host xz:host"
|
||||||
PKG_DEPENDS_TARGET="toolchain:host gcc:host"
|
PKG_DEPENDS_TARGET="toolchain:host gcc:host"
|
||||||
PKG_SECTION="virtual"
|
PKG_SECTION="virtual"
|
||||||
PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"
|
PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"
|
||||||
|
|||||||
@ -44,7 +44,7 @@ fi
|
|||||||
|
|
||||||
cd ${ADDON_BUILD}
|
cd ${ADDON_BUILD}
|
||||||
build_msg "CLR_INFO" "*** compressing addon ${PKG_ADDON_ID} ... ***"
|
build_msg "CLR_INFO" "*** compressing addon ${PKG_ADDON_ID} ... ***"
|
||||||
${TOOLCHAIN}/bin/7za a -l -mx9 -bsp0 -bso0 -tzip ${PKG_ADDON_ID}-${ADDONVER}.zip ${PKG_ADDON_ID}
|
${TOOLCHAIN}/bin/7za a -mx9 -bsp0 -bso0 -tzip ${PKG_ADDON_ID}-${ADDONVER}.zip ${PKG_ADDON_ID}
|
||||||
cd - &>/dev/null
|
cd - &>/dev/null
|
||||||
|
|
||||||
mkdir -p ${ADDON_INSTALL_DIR}
|
mkdir -p ${ADDON_INSTALL_DIR}
|
||||||
@ -79,7 +79,7 @@ if [ "${ADDON_JENKINS}" = "yes" ]; then
|
|||||||
ADDON_JENKINS_ADDON_NAME="${ADDON_VERSION}-${DEVICE:-${PROJECT}}-${TARGET_ARCH}-${PKG_ADDON_ID}-${ADDONVER}"
|
ADDON_JENKINS_ADDON_NAME="${ADDON_VERSION}-${DEVICE:-${PROJECT}}-${TARGET_ARCH}-${PKG_ADDON_ID}-${ADDONVER}"
|
||||||
mkdir -p "${ADDON_JENKINS_DIR}"
|
mkdir -p "${ADDON_JENKINS_DIR}"
|
||||||
cd ${ADDON_INSTALL_DIR}
|
cd ${ADDON_INSTALL_DIR}
|
||||||
${TOOLCHAIN}/bin/7za a -l -mx0 -bsp0 -bso0 -tzip ${ADDON_JENKINS_DIR}/${ADDON_JENKINS_ADDON_NAME}.zip ${PKG_ADDON_ID}-${ADDONVER}.zip resources/
|
${TOOLCHAIN}/bin/7za a -mx0 -bsp0 -bso0 -tzip ${ADDON_JENKINS_DIR}/${ADDON_JENKINS_ADDON_NAME}.zip ${PKG_ADDON_ID}-${ADDONVER}.zip resources/
|
||||||
( cd ${ADDON_JENKINS_DIR}
|
( cd ${ADDON_JENKINS_DIR}
|
||||||
sha256sum ${ADDON_JENKINS_ADDON_NAME}.zip > ${ADDON_JENKINS_ADDON_NAME}.zip.sha256
|
sha256sum ${ADDON_JENKINS_ADDON_NAME}.zip > ${ADDON_JENKINS_ADDON_NAME}.zip.sha256
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user