diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-04-06 19:39:51 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-06 19:39:51 +0000 |
commit | 741a0576ad3184f0f061ff8fd056f933986d110d (patch) | |
tree | 15696903dfd2ffe65ef465923203876f48a2088b /package/system/opkg/Makefile | |
parent | 5731f502797636762931a6447703043ae297adae (diff) | |
download | master-187ad058-741a0576ad3184f0f061ff8fd056f933986d110d.tar.gz master-187ad058-741a0576ad3184f0f061ff8fd056f933986d110d.tar.bz2 master-187ad058-741a0576ad3184f0f061ff8fd056f933986d110d.zip |
build: add integration for managing opkg package feed keys
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45286 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system/opkg/Makefile')
-rw-r--r-- | package/system/opkg/Makefile | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 391adfa0d9..4f30ec2114 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -26,6 +26,8 @@ PKG_REMOVE_FILES = autogen.sh aclocal.m4 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING +PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES + PKG_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -91,7 +93,11 @@ CONFIGURE_ARGS += \ --with-opkglockfile=/var/lock/opkg.lock ifeq ($(BUILD_VARIANT),smime) - CONFIGURE_ARGS += --enable-openssl --enable-sha256 + CONFIGURE_ARGS += --enable-openssl --enable-sha256 --disable-usign +else + ifndef CONFIG_SIGNED_PACKAGES + CONFIGURE_ARGS += --disable-usign + endif endif MAKE_FLAGS = \ @@ -105,6 +111,9 @@ define Package/opkg/Default/install $(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/opkg$(2).conf $(1)/etc/opkg.conf + ifneq ($(CONFIG_SIGNED_PACKAGES),) + echo "option check_signature 1" >> $(1)/etc/opkg.conf + endif ifeq ($(CONFIG_PER_FEED_REPO),) echo "src/gz %n %U" >> $(1)/etc/opkg.conf else @@ -121,7 +130,11 @@ define Package/opkg/Default/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg endef -Package/opkg/install = $(call Package/opkg/Default/install,$(1),) +define Package/opkg/install + $(call Package/opkg/Default/install,$(1),) + mkdir $(1)/usr/sbin + $(INSTALL_BIN) ./files/opkg-key $(1)/usr/sbin/ +endef define Package/opkg-smime/install $(call Package/opkg/Default/install,$(1),-smime) |