X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fsystem%2Fopkg%2FMakefile;h=fafd7c6ac2a0249e21b6bc7544f455c1d006791d;hp=67ceb7cafc23616bd95d08c92cf7e26b606d8132;hb=0c3fe281e3bd56402583689e8450835c6262eb2b;hpb=d0b88b606754cccb39b536dc921af268a1ef3ee8 diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index 67ceb7cafc..fafd7c6ac2 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2006-2015 OpenWrt.org -# Copyright (C) 2016 LEDE Project +# Copyright (C) 2016-2017 LEDE Project # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,18 +11,14 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=opkg -PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d -PKG_VERSION:=$(PKG_REV) -PKG_RELEASE:=13 +PKG_RELEASE:=1 +PKG_FLAGS:=essential PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION) -PKG_SOURCE_URL:=http://git.yoctoproject.org/git/opkg -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -PKG_FIXUP:=autoreconf -PKG_REMOVE_FILES = autogen.sh aclocal.m4 +PKG_SOURCE_URL:=https://git.lede-project.org/project/opkg-lede.git +PKG_SOURCE_DATE:=2017-05-03 +PKG_SOURCE_VERSION:=04e279eb1c0e37e324d955969780cfec272442b9 +PKG_MIRROR_HASH:=f5cbfc6461760e35ac6f352cd9d9d6d668a27457fd66d862d9e6379bf6595dea PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -30,25 +26,35 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Jo-Philipp Wich PKG_FLAGS := nonshared -PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES + +PKG_CONFIG_DEPENDS := \ + CONFIG_SIGNED_PACKAGES \ + CONFIG_TARGET_INIT_PATH \ + CONFIG_PER_FEED_REPO \ + CONFIG_PER_FEED_REPO_ADD_DISABLED \ + CONFIG_PER_FEED_REPO_ADD_COMMENTED \ + $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed)) PKG_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +HOST_BUILD_DEPENDS:=libubox/host + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/cmake.mk -define Package/opkg/Default +define Package/opkg SECTION:=base CATEGORY:=Base system TITLE:=opkg package manager - DEPENDS:=+uclient-fetch - URL:=http://wiki.openmoko.org/wiki/Opkg + DEPENDS:=+uclient-fetch +libpthread +libubox + URL:=https://git.lede-project.org/?p=project/opkg-lede.git MENU:=1 endef -define Package/opkg/Default/description +define Package/opkg/description Lightweight package management system opkg is the opkg Package Management System, for handling installation and removal of packages on a system. It can @@ -58,92 +64,29 @@ define Package/opkg/Default/description opkg knows how to install both .ipk and .deb packages. endef -define Package/opkg/config -config OPKG_SUPPORT_MD5 - bool - default n - depends on PACKAGE_opkg - prompt "Support reading old md5 hashes." - help - Old opkg used md5s, new uses sha. This options enables understanding both while prefering sha. -endef - -define Package/opkg - $(call Package/opkg/Default) - VARIANT:=unsigned -endef - -define Package/opkg/description - $(call Package/opkg/Default/description) -endef - define Package/opkg/conffiles /etc/opkg.conf /etc/opkg/keys/ /etc/opkg/customfeeds.conf endef - -define Package/opkg-smime - $(call Package/opkg/Default) - TITLE+= (with S/MIME signature support) - DEPENDS+=+PACKAGE_opkg-smime:libopenssl - VARIANT:=smime -endef - -define Package/opkg-smime/description - $(call Package/opkg/Default/description) - - This package allows the Package index to be verified with S/MIME. -endef - -define Package/opkg-smime/config -config OPKG_SMIME_SUPPORT_MD5 - bool - default n - depends on PACKAGE_opkg-smime - prompt "Support reading old md5 hashes." - help - Old opkg used md5s, new uses sha. This options enables understanding both while prefering sha. -endef - -Package/opkg-smime/conffiles = $(Package/opkg/conffiles) - TARGET_CFLAGS += -ffunction-sections -fdata-sections EXTRA_CFLAGS += $(TARGET_CPPFLAGS) -CONFIGURE_ARGS += \ - --disable-curl \ - --disable-gpg \ - --enable-sha256 \ - --with-opkgetcdir=/etc \ - --with-opkglockfile=/var/lock/opkg.lock - -ifeq ($(BUILD_VARIANT),smime) - CONFIGURE_ARGS += --enable-openssl --disable-usign - ifeq ($(CONFIG_OPKG_SMIME_SUPPORT_MD5),y) - CONFIGURE_ARGS += --enable-md5 - else - CONFIGURE_ARGS += --disable-md5 - endif -else - ifndef CONFIG_SIGNED_PACKAGES - CONFIGURE_ARGS += --disable-usign - endif - ifeq ($(CONFIG_OPKG_SUPPORT_MD5),y) - CONFIGURE_ARGS += --enable-md5 - else - CONFIGURE_ARGS += --disable-md5 - endif -endif +CMAKE_OPTIONS += \ + -DBUILD_TESTS=OFF \ + -DHOST_CPU=$(PKGARCH) \ + -DPATH_SPEC="$(TARGET_INIT_PATH)" \ + -DVERSION="$(PKG_SOURCE_VERSION) ($(PKG_SOURCE_DATE))" -MAKE_FLAGS = \ - CC="$(TARGET_CC)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - HOST_CPU="$(PKGARCH)" \ - LDFLAGS="-Wl,--gc-sections" \ +CMAKE_HOST_OPTIONS += \ + -DSTATIC_UBOX=ON \ + -DBUILD_TESTS=OFF \ + -DHOST_CPU=$(PKGARCH) \ + -DLOCK_FILE=/tmp/opkg.lock \ + -DVERSION="$(PKG_SOURCE_VERSION) ($(PKG_SOURCE_DATE))" -define Package/opkg/Default/install +define Package/opkg/install $(INSTALL_DIR) $(1)/usr/lib/opkg $(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/etc/opkg @@ -154,44 +97,16 @@ define Package/opkg/Default/install $(VERSION_SED) $(1)/etc/opkg/distfeeds.conf $(INSTALL_BIN) ./files/20_migrate-feeds $(1)/etc/uci-defaults/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg -endef - -define Package/opkg/install - $(call Package/opkg/Default/install,$(1),) ifneq ($(CONFIG_SIGNED_PACKAGES),) echo "option check_signature 1" >> $(1)/etc/opkg.conf endif - mkdir $(1)/usr/sbin + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) ./files/opkg-key $(1)/usr/sbin/ endef -define Package/opkg-smime/install - $(call Package/opkg/Default/install,$(1),-smime) - $(INSTALL_DIR) $(1)/etc/ssl/certs - $(if $(CONFIG_OPKGSMIME_CERT),$(INSTALL_DATA) $(call qstrip,$(CONFIG_OPKGSMIME_CERT)) $(1)/etc/ssl/certs/opkg.pem,) -endef - -define Build/InstallDev - mkdir -p $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libopkg $(1)/usr/include/ -endef - - -HOST_CONFIGURE_ARGS+= \ - --disable-curl \ - --disable-gpg \ - --enable-sha256 \ - --with-opkgetcdir=/etc \ - --with-opkglockfile=/tmp/opkg.lock - -define Host/Compile - +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all -endef - define Host/Install $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/opkg-cl $(STAGING_DIR_HOST)/bin/opkg endef $(eval $(call BuildPackage,opkg)) -$(eval $(call BuildPackage,opkg-smime)) $(eval $(call HostBuild))