From c2a52dc4ac855e8d852b114e06db103e55ffef8e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 29 Jan 2023 10:12:20 +0000 Subject: [PATCH 1/2] 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 --- packages/addons/driver/sundtek-mediatv/package.mk | 2 +- packages/addons/script/script.config.vdr/package.mk | 2 +- packages/virtual/toolchain/package.mk | 2 +- scripts/install_addon | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index 1f1ca3c058..c1475a9f32 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/packages/addons/driver/sundtek-mediatv/package.mk @@ -9,7 +9,7 @@ PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" PKG_URL="" -PKG_DEPENDS_TARGET="xmlstarlet:host p7zip:host" +PKG_DEPENDS_TARGET="xmlstarlet:host 7-zip:host" PKG_SECTION="driver/dvb" 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." diff --git a/packages/addons/script/script.config.vdr/package.mk b/packages/addons/script/script.config.vdr/package.mk index e5e47afe15..e2a617cab2 100644 --- a/packages/addons/script/script.config.vdr/package.mk +++ b/packages/addons/script/script.config.vdr/package.mk @@ -10,7 +10,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://libreelec.tv" 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_SHORTDESC="script.config.vdr" PKG_LONGDESC="script.config.vdr" diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk index dc3ff1ea58..9d9340541d 100644 --- a/packages/virtual/toolchain/package.mk +++ b/packages/virtual/toolchain/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" 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_SECTION="virtual" PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages" diff --git a/scripts/install_addon b/scripts/install_addon index 67e7415bb0..9cdcd311cf 100755 --- a/scripts/install_addon +++ b/scripts/install_addon @@ -44,7 +44,7 @@ fi cd ${ADDON_BUILD} 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 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}" mkdir -p "${ADDON_JENKINS_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} sha256sum ${ADDON_JENKINS_ADDON_NAME}.zip > ${ADDON_JENKINS_ADDON_NAME}.zip.sha256 ) From 00913aede1fa2b97e259923ae0a805d641fb9b91 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 29 Jan 2023 10:30:09 +0000 Subject: [PATCH 2/2] p7zip: drop package --- packages/compress/p7zip/package.mk | 46 ------------------------------ 1 file changed, 46 deletions(-) delete mode 100644 packages/compress/p7zip/package.mk diff --git a/packages/compress/p7zip/package.mk b/packages/compress/p7zip/package.mk deleted file mode 100644 index 3a539ceb5e..0000000000 --- a/packages/compress/p7zip/package.mk +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="p7zip" -PKG_VERSION="16.02" -PKG_SHA256="5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f" -PKG_LICENSE="GPL" -PKG_SITE="http://p7zip.sourceforge.net/" -PKG_URL="http://downloads.sourceforge.net/project/p7zip/p7zip/${PKG_VERSION}/p7zip_${PKG_VERSION}_src_all.tar.bz2" -PKG_DEPENDS_HOST="ccache:host" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix." -PKG_TOOLCHAIN="manual" - -pre_build_host() { - rm -fr ${PKG_BUILD}/.${HOST_NAME} - mkdir -p ${PKG_BUILD}/.${HOST_NAME} - cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME} -} - -make_host() { - make CXX=${CXX} CC=${CC} -C ${PKG_BUILD}/.${HOST_NAME} 7za -} - -makeinstall_host() { - mkdir -p ${TOOLCHAIN}/bin - cp ${PKG_BUILD}/.${HOST_NAME}/bin/7za ${TOOLCHAIN}/bin -} - -pre_build_target() { - rm -fr ${PKG_BUILD}/.${TARGET_NAME} - mkdir -p ${PKG_BUILD}/.${TARGET_NAME} - cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} -} - -make_target() { - make CXX=${CXX} CC=${CC} -C ${PKG_BUILD}/.${TARGET_NAME} 7z 7za -} - -makeinstall_target() { - mkdir -p ${INSTALL}/usr/bin - cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7z.so ${INSTALL}/usr/bin - cp -pr ${PKG_BUILD}/.${TARGET_NAME}/bin/Codecs ${INSTALL}/usr/bin - cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7z ${INSTALL}/usr/bin - cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7za ${INSTALL}/usr/bin -}