mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-02-04 00:37:44 +01:00
f4fdb9964a
Some checks are pending
Build all core packages / Build all core packages for selected target (push) Waiting to run
Some packages with variants did not specify the default among the
alternatives, so were left without any apk 'provider_priority'
for that package. This caused the apk solver to select the wrong
variant, silently changing the requested package list.
Notable among these were busybox, procd and the hostapd/wpad suite.
This behavior presented in the imagebuilders when creating the
image as follows, silently replacing packages even when explicitly
requested:
$ make image PACKAGES=busybox
...
( 14/148) Installing busybox-selinux (1.37.0-r6)
...
We add 'DEFAULT_VARIANT:=1' to the packages that were missing one,
providing apk with sufficient information to choose the correct
package.
See link below for further examples and discussion.
Link: https://github.com/openwrt/openwrt/pull/21288#issuecomment-3704101422
Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21358
Signed-off-by: Robert Marko <robimarko@gmail.com>
73 lines
1.7 KiB
Makefile
73 lines
1.7 KiB
Makefile
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=ucert
|
|
PKG_RELEASE:=1
|
|
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ucert.git
|
|
PKG_SOURCE_DATE:=2025-10-03
|
|
PKG_SOURCE_VERSION:=57270b247c91f003db6e3ba1a71d6d1fa5710fef
|
|
PKG_MIRROR_HASH:=a926fefa957f42c40caa9f8592f4c63a0a56af9094a9995eb0dfc5d82c9591cf
|
|
|
|
CMAKE_INSTALL:=1
|
|
PKG_CHECK_FORMAT_SECURITY:=1
|
|
|
|
PKG_LICENSE:=GPL-3.0+
|
|
PKG_LICENSE_FILES:=COPYING
|
|
|
|
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/host-build.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
|
|
CMAKE_HOST_OPTIONS += \
|
|
-DUCERT_FULL=1 \
|
|
-DUCERT_HOST_BUILD=1 \
|
|
-DCMAKE_SKIP_RPATH=FALSE \
|
|
-DUSE_RPATH="${STAGING_DIR_HOST}/lib"
|
|
|
|
HOST_BUILD_DEPENDS:=libubox/host libjson-c/host usign/host
|
|
HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
|
|
PKG_BUILD_DEPENDS:=ucert/host
|
|
|
|
define Package/ucert/Default
|
|
SECTION:=base
|
|
CATEGORY:=Base system
|
|
DEPENDS:=+usign +libubox
|
|
endef
|
|
|
|
define Package/ucert
|
|
$(call Package/ucert/Default)
|
|
TITLE:=OpenWrt certificate verification utility
|
|
VARIANT:=tiny
|
|
DEFAULT_VARIANT:=1
|
|
endef
|
|
|
|
define Package/ucert-full
|
|
$(call Package/ucert/Default)
|
|
TITLE:=OpenWrt certificate generation and verification utility
|
|
DEPENDS+=+libjson-c +libblobmsg-json
|
|
VARIANT:=full
|
|
PROVIDES:=ucert
|
|
endef
|
|
|
|
ifeq ($(BUILD_VARIANT),full)
|
|
CMAKE_OPTIONS += -DUCERT_FULL=1
|
|
endif
|
|
|
|
define Build/Prepare
|
|
mkdir -p $(PKG_BUILD_DIR)
|
|
$(call Build/Prepare/Default)
|
|
endef
|
|
|
|
define Package/ucert/install
|
|
$(INSTALL_DIR) $(1)/usr/bin
|
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ucert $(1)/usr/bin
|
|
endef
|
|
|
|
Package/ucert-full/install = $(Package/ucert/install)
|
|
|
|
$(eval $(call BuildPackage,ucert))
|
|
$(eval $(call BuildPackage,ucert-full))
|
|
$(eval $(call HostBuild))
|