Re: [ptxdist] [APPLIED] opkg: version bump 0.7.0 -> 0.9.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 3be8f231d65a46181446f671b3d8f6d01b497a75.

Michael

[sent from post-receive hook]

On Fri, 17 Oct 2025 10:21:01 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> 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 <s.pueschel@pengutronix.de>
> Message-Id: <20251013141237.2372882-2-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-opkg.in b/rules/host-opkg.in
> index dd42e4087407..190f38e44c52 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 a9fe3d20a363..ff9afd2aa433 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 fa913537c08d..db3b8b418dfd 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 1ceca3ef1563..93eb693fce27 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