diff --git a/projects/ROCKNIX/packages/compress/unzip/package.mk b/projects/ROCKNIX/packages/compress/unzip/package.mk deleted file mode 100644 index ab83427147..0000000000 --- a/projects/ROCKNIX/packages/compress/unzip/package.mk +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) - -PKG_NAME="unzip" -PKG_VERSION="60" -PKG_SHA256="002da7dccff8314cc6077794343990353935efbd3623a3c457ed0d8a0c1fbea1" -PKG_LICENSE="OSS" -PKG_SITE="http://www.info-zip.org/pub/infozip/" -PKG_URL="https://github.com/madler/unzip/archive/0b82c20ac7375b522215b567174f370be89a4b12.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="UnZip is an extraction utility for archives compressed in .zip format." -PKG_TOOLCHAIN="manual" - -make_target() { - make CC=${CC} RANLIB=$RANLIB AR=${AR} STRIP=${STRIP} \ - -f unix/Makefile generic LOCAL_UNZIP="${CFLAGS}" -} - -makeinstall_target() { - mkdir -p ${INSTALL}/usr/bin - cp unzip ${INSTALL}/usr/bin - ${STRIP} ${INSTALL}/usr/bin/unzip -} diff --git a/projects/ROCKNIX/packages/compress/unzip/patches/fix-compile-with-gcc14.patch b/projects/ROCKNIX/packages/compress/unzip/patches/fix-compile-with-gcc14.patch deleted file mode 100644 index 6ee7a5180d..0000000000 --- a/projects/ROCKNIX/packages/compress/unzip/patches/fix-compile-with-gcc14.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/timezone.c 2004-11-13 08:35:12.000000000 +0000 -+++ b/timezone.c 2024-05-01 09:22:13.780112533 +0000 -@@ -39,6 +39,7 @@ - - #include "zip.h" - #include "timezone.h" -+#include - #include - #include - ---- a/unix/configure 2008-06-20 03:32:20.000000000 +0000 -+++ b/unix/configure 2024-05-01 09:27:12.149292690 +0000 -@@ -544,7 +595,7 @@ - echo Check for errno declaration - cat > conftest.c << _EOF_ - #include --main() -+int main() - { - errno = 0; - return 0; -@@ -556,6 +607,7 @@ - - echo Check for directory libraries - cat > conftest.c << _EOF_ -+#include - int main() { return closedir(opendir(".")); } - _EOF_ - -@@ -621,11 +673,13 @@ - - echo Check for valloc - cat > conftest.c << _EOF_ --main() -+#include -+int main() - { - #ifdef MMAP - valloc(); - #endif -+ return 0; - } - _EOF_ - $CC ${CFLAGS} -c conftest.c > /dev/null 2>/dev/null - diff --git a/projects/ROCKNIX/packages/sysutils/busybox/config/busybox-target.conf b/projects/ROCKNIX/packages/sysutils/busybox/config/busybox-target.conf index 0759e002d4..47b318fd84 100644 --- a/projects/ROCKNIX/packages/sysutils/busybox/config/busybox-target.conf +++ b/projects/ROCKNIX/packages/sysutils/busybox/config/busybox-target.conf @@ -190,8 +190,8 @@ CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_FEATURE_TAR_UNAME_GNAME=y CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y # CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNZIP is not set -# CONFIG_FEATURE_UNZIP_CDF is not set +CONFIG_UNZIP=y +CONFIG_FEATURE_UNZIP_CDF=y # CONFIG_FEATURE_UNZIP_BZIP2 is not set # CONFIG_FEATURE_UNZIP_LZMA is not set # CONFIG_FEATURE_UNZIP_XZ is not set diff --git a/projects/ROCKNIX/packages/sysutils/busybox/package.mk b/projects/ROCKNIX/packages/sysutils/busybox/package.mk index 883bf36c66..cf1fed9849 100644 --- a/projects/ROCKNIX/packages/sysutils/busybox/package.mk +++ b/projects/ROCKNIX/packages/sysutils/busybox/package.mk @@ -9,7 +9,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="gcc:host" -PKG_DEPENDS_TARGET="toolchain busybox:host dosfstools e2fsprogs zip unzip usbutils parted procps-ng gptfdisk libtirpc" +PKG_DEPENDS_TARGET="toolchain busybox:host dosfstools e2fsprogs zip usbutils parted procps-ng gptfdisk libtirpc" PKG_DEPENDS_INIT="toolchain libc:init glibc:init libtirpc" PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into a single small executable." # busybox fails to build with GOLD support enabled with binutils-2.25 diff --git a/projects/ROCKNIX/packages/virtual/image/package.mk b/projects/ROCKNIX/packages/virtual/image/package.mk index aa0ce61f6f..0af71de607 100644 --- a/projects/ROCKNIX/packages/virtual/image/package.mk +++ b/projects/ROCKNIX/packages/virtual/image/package.mk @@ -10,7 +10,7 @@ PKG_LONGDESC="Root package used to build and create complete image" PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host \ mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware \ - ${BOOTLOADER} busybox umtprd util-linux usb-modeswitch unzip poppler jq socat \ + ${BOOTLOADER} busybox umtprd util-linux usb-modeswitch poppler jq socat \ p7zip file initramfs grep util-linux btrfs-progs zstd lz4 empty lzo libzip \ bash coreutils system-utils autostart quirks powerstate gnupg \ gzip six xmlstarlet pyudev dialog network rocknix"