diff --git a/projects/ROCKNIX/packages/devel/cmake/package.mk b/projects/ROCKNIX/packages/devel/cmake/package.mk deleted file mode 100644 index 888bae585c0..00000000000 --- a/projects/ROCKNIX/packages/devel/cmake/package.mk +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="cmake" -PKG_VERSION="3.30.3" -PKG_LICENSE="BSD" -PKG_SITE="https://cmake.org/" -PKG_URL="https://cmake.org/files/v$(get_pkg_version_maj_min)/cmake-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_HOST="pkg-config:host openssl:host" -PKG_LONGDESC="A cross-platform, open-source make system." -PKG_TOOLCHAIN="configure" -PKG_BUILD_FLAGS="+local-cc" - -configure_host() { - ../configure --prefix=${TOOLCHAIN} \ - --no-qt-gui --no-system-libs \ - -- \ - -DCMAKE_C_FLAGS="-O2 -Wall -pipe -Wno-format-security" \ - -DCMAKE_CXX_FLAGS="-O2 -Wall -pipe -Wno-format-security" \ - -DCMAKE_EXE_LINKER_FLAGS="${HOST_LDFLAGS}" \ - -DCMAKE_USE_OPENSSL=ON \ - -DBUILD_CursesDialog=0 -} diff --git a/projects/ROCKNIX/packages/devel/cmake/patches/cmake-001-disable-free-comp-methods.patch b/projects/ROCKNIX/packages/devel/cmake/patches/cmake-001-disable-free-comp-methods.patch deleted file mode 100644 index 79c961baf79..00000000000 --- a/projects/ROCKNIX/packages/devel/cmake/patches/cmake-001-disable-free-comp-methods.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Utilities/cmcurl/lib/vtls/openssl.c.orig 2016-10-19 19:17:49.615923691 +0200 -+++ b/Utilities/cmcurl/lib/vtls/openssl.c 2016-10-19 19:22:50.849565684 +0200 -@@ -134,6 +134,11 @@ - #define HAVE_SSL_COMP_FREE_COMPRESSION_METHODS 1 - #endif - -+#if !defined(OPENSSL_NO_COMP) || \ -+ OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0+ has no free compression methods */ -+#undef HAVE_SSL_COMP_FREE_COMPRESSION_METHODS /* undef */ -+#endif -+ - #if (OPENSSL_VERSION_NUMBER < 0x0090808fL) - /* not present in older OpenSSL */ - #define OPENSSL_load_builtin_modules(x) diff --git a/projects/ROCKNIX/packages/python/devel/Mako/package.mk b/projects/ROCKNIX/packages/python/devel/Mako/package.mk deleted file mode 100644 index 849df4a1b8b..00000000000 --- a/projects/ROCKNIX/packages/python/devel/Mako/package.mk +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="Mako" -PKG_VERSION="1.3.0" -PKG_LICENSE="GPL" -PKG_SITE="https://pypi.org/project/Mako" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_HOST="Python3:host setuptools:host MarkupSafe:host" -PKG_LONGDESC="Mako is a super-fast templating language that borrows the best ideas from the existing templating languages." -PKG_TOOLCHAIN="manual" - -makeinstall_host() { - exec_thread_safe python3 setup.py install --prefix=${TOOLCHAIN} -} diff --git a/projects/ROCKNIX/packages/python/devel/system/dbussy/package.mk b/projects/ROCKNIX/packages/python/devel/system/dbussy/package.mk deleted file mode 100644 index 3fde20778e8..00000000000 --- a/projects/ROCKNIX/packages/python/devel/system/dbussy/package.mk +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX) - -. ${ROOT}/packages/python/system/dbussy/package.mk - -PKG_TOOLCHAIN="manual" - -make_target() { - exec_thread_safe python3 setup.py build -} - -makeinstall_target() { - exec_thread_safe python3 setup.py install --root=${INSTALL} --prefix=/usr -} diff --git a/projects/ROCKNIX/packages/security/gnupg/package.mk b/projects/ROCKNIX/packages/security/gnupg/package.mk deleted file mode 100644 index d5fddb1d6a3..00000000000 --- a/projects/ROCKNIX/packages/security/gnupg/package.mk +++ /dev/null @@ -1,24 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS) - -PKG_NAME="gnupg" -PKG_VERSION="1.4.23" -PKG_LICENSE="GPL" -PKG_SITE="https://gnupg.org/ftp/gcrypt/gnupg" -PKG_URL="${PKG_SITE}/gnupg-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="toolchain zlib libgpg-error libgcrypt" -PKG_LONGDESC="The GNU Privacy Guard (GnuPG, GPG) is a complete and free implementation -of the OpenPGP and S/MIME standards." - -PKG_CONFIGURE_OPTS_TARGET=" --disable-rpath \ - --enable-minimal \ - --disable-regex \ - --disable-asm \ - --enable-bzip2 \ - --enable-aes \ - --enable-rsa" - -pre_configure_target() { - export CFLAGS="${CFLAGS} -fcommon" -} - diff --git a/projects/ROCKNIX/packages/security/libgpg-error/package.mk b/projects/ROCKNIX/packages/security/libgpg-error/package.mk index e02c4f891fb..2c90dfd321a 100644 --- a/projects/ROCKNIX/packages/security/libgpg-error/package.mk +++ b/projects/ROCKNIX/packages/security/libgpg-error/package.mk @@ -1,18 +1,10 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX) -PKG_NAME="libgpg-error" -PKG_VERSION="1.55" -PKG_SHA256="95b178148863f07d45df0cea67e880a79b9ef71f5d230baddc0071128516ef78" -PKG_LICENSE="GPLv2" -PKG_SITE="https://www.gnupg.org" -PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/${PKG_NAME}-${PKG_VERSION}.tar.bz2" -PKG_DEPENDS_TARGET="autotools:host gcc:host" -PKG_LONGDESC="A library that defines common error values for all GnuPG components." +. ${ROOT}/packages/security/libgpg-error/package.mk pre_configure_target() { - PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=${HOST_CC} --enable-static --enable-shared --disable-nls --disable-rpath --with-gnu-ld --with-pic" + PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=${HOST_CC} --disable-static --enable-shared --disable-nls --disable-rpath --with-gnu-ld --with-pic" # inspired by openembedded case ${TARGET_ARCH} in @@ -32,11 +24,3 @@ pre_configure_target() { cp ${PKG_BUILD}/src/syscfg/lock-obj-pub.${GPGERROR_TUPLE}.h ${PKG_BUILD}/src/syscfg/lock-obj-pub.${GPGERROR_TARGET}.h } - -post_makeinstall_target() { - rm -rf ${INSTALL}/usr/bin - rm -rf ${INSTALL}/usr/share - - sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i src/gpg-error-config - cp src/gpg-error-config ${SYSROOT_PREFIX}/usr/bin -} diff --git a/projects/ROCKNIX/packages/security/openssl/package.mk b/projects/ROCKNIX/packages/security/openssl/package.mk index 0de77dd0881..78831ee34ec 100644 --- a/projects/ROCKNIX/packages/security/openssl/package.mk +++ b/projects/ROCKNIX/packages/security/openssl/package.mk @@ -1,78 +1,7 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX) -PKG_NAME="openssl" -PKG_VERSION="3.3.2" -PKG_LICENSE="Apache-2.0" -PKG_SITE="https://openssl-library.org" -PKG_URL="https://github.com/openssl/openssl/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" -PKG_TOOLCHAIN="configure" -PKG_BUILD_FLAGS="+local-cc" - -PKG_CONFIGURE_OPTS_SHARED="--libdir=lib \ - shared \ - threads \ - no-md2 \ - no-rc5 \ - no-rfc3779 \ - no-unit-test \ - no-zlib \ - no-zlib-dynamic \ - no-static-engine" - -PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN} \ - --openssldir=${TOOLCHAIN}/etc/ssl" -PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ - --openssldir=/etc/ssl" - -post_unpack() { - find ${PKG_BUILD}/apps -type f | xargs -n 1 -t sed 's|./demoCA|/etc/ssl|' -i -} - -pre_configure_host() { - mkdir -p ${PKG_BUILD}/.${HOST_NAME} - cp -a ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME}/ -} - -configure_host() { - cd ${PKG_BUILD}/.${HOST_NAME} - ./Configure ${PKG_CONFIGURE_OPTS_HOST} ${PKG_CONFIGURE_OPTS_SHARED} linux-${MACHINE_HARDWARE_NAME} ${CFLAGS} ${LDFLAGS} -} - -makeinstall_host() { - make install_sw -} - -pre_configure_target() { - mkdir -p ${PKG_BUILD}/.${TARGET_NAME} - cp -a ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME}/ - - case ${TARGET_ARCH} in - x86_64) - OPENSSL_TARGET=linux-x86_64 - PLATFORM_FLAGS=enable-ec_nistp_64_gcc_128 - ;; - arm) - OPENSSL_TARGET=linux-armv4 - ;; - aarch64) - OPENSSL_TARGET=linux-aarch64 - ;; - esac -} - -configure_target() { - cd ${PKG_BUILD}/.${TARGET_NAME} - ./Configure ${PKG_CONFIGURE_OPTS_TARGET} ${PKG_CONFIGURE_OPTS_SHARED} ${PLATFORM_FLAGS} ${OPENSSL_TARGET} ${CFLAGS} ${LDFLAGS} -} - -makeinstall_target() { - make DESTDIR=${INSTALL} install_sw - make DESTDIR=${SYSROOT_PREFIX} install_sw -} +. ${ROOT}/packages/security/openssl/package.mk post_makeinstall_target() { rm -rf ${INSTALL}/etc/ssl/misc @@ -90,7 +19,7 @@ post_makeinstall_target() { ln -sf /run/rocknix/cacert.pem ${INSTALL}/etc/ssl/cacert.pem ln -sf /run/rocknix/cacert.pem ${INSTALL}/etc/ssl/cert.pem - # backwards comatibility + # backwards compatibility mkdir -p ${INSTALL}/etc/pki/tls ln -sf /run/rocknix/cacert.pem ${INSTALL}/etc/pki/tls/cacert.pem mkdir -p ${INSTALL}/etc/pki/tls/certs diff --git a/projects/ROCKNIX/packages/virtual/image/package.mk b/projects/ROCKNIX/packages/virtual/image/package.mk index 0af71de6079..54ce0616dd9 100644 --- a/projects/ROCKNIX/packages/virtual/image/package.mk +++ b/projects/ROCKNIX/packages/virtual/image/package.mk @@ -12,7 +12,7 @@ PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware \ ${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 \ + bash coreutils system-utils autostart quirks powerstate \ gzip six xmlstarlet pyudev dialog network rocknix" PKG_UI="emulationstation es-themes textviewer"