From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 13 Oct 2025 16:12:58 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1v8JII-007OiQ-34 for lore@lore.pengutronix.de; Mon, 13 Oct 2025 16:12:58 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1v8JII-0000if-LM; Mon, 13 Oct 2025 16:12:58 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1v8JI1-0000aE-2m; Mon, 13 Oct 2025 16:12:41 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Mon, 13 Oct 2025 16:12:14 +0200 Message-ID: <20251013141237.2372882-2-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251013141237.2372882-1-s.pueschel@pengutronix.de> References: <20251013141237.2372882-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 2/2] opkg: version bump 0.7.0 -> 0.9.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Due to access problems, the current releases of opkg are not currently uploaded to the release folder. Therefore get it from the git repo. See: https://lists.yoctoproject.org/g/opkg/topic/release_tarball_for_0_9_0/115374634 opkg switched in version 0.9.0 to CMake as a build system. Use the libsolv library, as the internal SAT solver is marked as deprecated and will probably be removed in a future version. https://git.yoctoproject.org/opkg/tag/?h=v0.8.0 https://git.yoctoproject.org/opkg/tag/?h=v0.9.0 Signed-off-by: Sven Püschel --- rules/host-opkg.in | 2 ++ rules/host-opkg.make | 32 +++++++++++++++----------------- rules/opkg.in | 3 +++ rules/opkg.make | 40 +++++++++++++++++++--------------------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/rules/host-opkg.in b/rules/host-opkg.in index dd42e4087..190f38e44 100644 --- a/rules/host-opkg.in +++ b/rules/host-opkg.in @@ -3,7 +3,9 @@ config HOST_OPKG tristate default y if ALLYES + select HOST_CMAKE select HOST_LIBARCHIVE + select HOST_LIBSOLV select HOST_OPKG_UTILS help opkg is used on the development host to install packets into diff --git a/rules/host-opkg.make b/rules/host-opkg.make index a9fe3d20a..ff9afd2aa 100644 --- a/rules/host-opkg.make +++ b/rules/host-opkg.make @@ -22,23 +22,21 @@ HOST_OPKG_DIR = $(HOST_BUILDDIR)/$(HOST_OPKG) # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# -HOST_OPKG_CONF_TOOL := autoconf +HOST_OPKG_CONF_TOOL := cmake HOST_OPKG_CONF_OPT := \ - $(HOST_AUTOCONF) \ - --disable-libopkg-api \ - --disable-static \ - --disable-xz \ - --disable-bzip2 \ - --disable-lz4 \ - --disable-zstd \ - --disable-curl \ - --disable-sha256 \ - --disable-ssl-curl \ - --disable-gpg \ - --without-static-libopkg \ - --without-libsolv + $(HOST_CMAKE_OPT) \ + -DSTATIC_LIBOPKG=OFF \ + -DUSE_ACL=OFF \ + -DUSE_SOLVER_INTERNAL=OFF \ + -DUSE_SOLVER_LIBSOLV=ON \ + -DUSE_XATTR=OFF \ + -DWITH_BZIP2=OFF \ + -DWITH_CURL=OFF \ + -DWITH_GPGME=OFF \ + -DWITH_LIBOPKG_API=OFF \ + -DWITH_LZ4=OFF \ + -DWITH_SHA256=OFF \ + -DWITH_XZ=OFF \ + -DWITH_ZSTD=OFF # vim: syntax=make diff --git a/rules/opkg.in b/rules/opkg.in index fa913537c..db3b8b418 100644 --- a/rules/opkg.in +++ b/rules/opkg.in @@ -2,8 +2,10 @@ menuconfig OPKG tristate + select HOST_CMAKE select LIBARCHIVE select LIBCURL if OPKG_CURL + select LIBSOLV prompt "opkg " help Opkg is a lightweight package management system based on Ipkg. @@ -29,6 +31,7 @@ config OPKG_SHA256 config OPKG_SSL_CURL bool prompt "libcurl certificate authentication" + depends on OPKG_CURL help FIXME diff --git a/rules/opkg.make b/rules/opkg.make index 1ceca3ef1..93eb693fc 100644 --- a/rules/opkg.make +++ b/rules/opkg.make @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_OPKG) += opkg # # Paths and names # -OPKG_VERSION := 0.7.0 -OPKG_MD5 := 6bf0315a3fd5fd046279d0fd98a39016 +OPKG_VERSION := 0.9.0 +OPKG_MD5 := 3a100d77beaedd4820599d91bc53e302 OPKG := opkg-$(OPKG_VERSION) OPKG_SUFFIX := tar.gz -OPKG_URL := http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFIX) +OPKG_URL := https://git.yoctoproject.org/opkg/snapshot/$(OPKG).$(OPKG_SUFFIX) OPKG_SOURCE := $(SRCDIR)/$(OPKG).$(OPKG_SUFFIX) OPKG_DIR := $(BUILDDIR)/$(OPKG) OPKG_LICENSE := GPL-2.0-or-later @@ -29,25 +29,23 @@ OPKG_LICENSE_FILES := file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# -OPKG_CONF_TOOL := autoconf +OPKG_CONF_TOOL := cmake OPKG_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - $(GLOBAL_LARGE_FILE_OPTION) \ - --disable-libopkg-api \ - --disable-static \ - --disable-xz \ - --disable-bzip2 \ - --disable-lz4 \ - --disable-zstd \ - --$(call ptx/endis, PTXCONF_OPKG_CURL)-curl \ - --$(call ptx/endis, PTXCONF_OPKG_SHA256)-sha256 \ - --$(call ptx/endis, PTXCONF_OPKG_SSL_CURL)-ssl-curl \ - --$(call ptx/endis, PTXCONF_OPKG_GPG)-gpg \ - --without-static-libopkg \ - --without-libsolv + $(CROSS_CMAKE_USR) \ + -DSTATIC_LIBOPKG=OFF \ + -DUSE_ACL=OFF \ + -DUSE_SOLVER_INTERNAL=OFF \ + -DUSE_SOLVER_LIBSOLV=ON \ + -DUSE_XATTR=OFF \ + -DWITH_BZIP2=OFF \ + -DWITH_CURL=$(call ptx/onoff, PTXCONF_OPKG_CURL) \ + -DWITH_GPGME=$(call ptx/onoff, PTXCONF_OPKG_GPG) \ + -DWITH_LIBOPKG_API=OFF \ + -DWITH_LZ4=OFF \ + -DWITH_SHA256=$(call ptx/onoff, PTXCONF_OPKG_SHA256) \ + -DWITH_SSLCURL=$(call ptx/onoff, PTXCONF_OPKG_SSL_CURL) \ + -DWITH_XZ=OFF \ + -DWITH_ZSTD=OFF # ---------------------------------------------------------------------------- # Target-Install -- 2.47.3