Changeset 38220


Ignore:
Timestamp:
2013-09-26T21:51:03+02:00 (4 years ago)
Author:
cyrus
Message:

opkg: add build variant with signature support

Location:
trunk/package/system/opkg
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/system/opkg/Makefile

    r37007 r38220  
    1212PKG_REV:=618 
    1313PKG_VERSION:=$(PKG_REV) 
    14 PKG_RELEASE:=3 
     14PKG_RELEASE:=4 
    1515 
    1616PKG_SOURCE_PROTO:=svn 
     
    1919PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/ 
    2020PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz 
     21PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 
    2122PKG_FIXUP:=autoreconf 
    2223PKG_REMOVE_FILES = autogen.sh aclocal.m4 
     
    3233include $(INCLUDE_DIR)/host-build.mk 
    3334 
    34 define Package/opkg 
     35define Package/opkg/Default 
    3536  SECTION:=base 
    3637  CATEGORY:=Base system 
    37   TITLE:=opkg package management system 
     38  TITLE:=opkg package manager 
    3839  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org> 
    3940  URL:=http://wiki.openmoko.org/wiki/Opkg 
    4041endef 
    4142 
    42 define Package/opkg/description 
     43define Package/opkg/Default/description 
    4344  Lightweight package management system 
    4445  opkg is the opkg Package Management System, for handling 
     
    5051endef 
    5152 
     53define Package/opkg 
     54  $(call Package/opkg/Default) 
     55  VARIANT:=unsigned 
     56endef 
     57 
     58define Package/opkg/description 
     59  $(call Package/opkg/Default/description) 
     60endef 
     61 
    5262define Package/opkg/conffiles 
    5363/etc/opkg.conf 
    5464endef 
     65 
     66 
     67define Package/opkg-smime 
     68  $(call Package/opkg/Default) 
     69  TITLE+= (with S/MIME signature support) 
     70  DEPENDS+=+libopenssl 
     71  VARIANT:=smime 
     72endef 
     73 
     74define Package/opkg-smime/description 
     75  $(call Package/opkg/Default/description) 
     76 
     77  This package allows the Package index to be verified with S/MIME. 
     78endef 
     79 
     80Package/opkg-smime/conffiles = $(Package/opkg/conffiles) 
    5581 
    5682TARGET_CFLAGS += $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds) 
     
    6490        --with-opkglockfile=/var/lock/opkg.lock 
    6591 
     92ifeq ($(BUILD_VARIANT),smime) 
     93        CONFIGURE_ARGS += --enable-openssl 
     94endif 
     95 
    6696MAKE_FLAGS = \ 
    6797                CC="$(TARGET_CC)" \ 
     
    70100                LDFLAGS="-Wl,--gc-sections" \ 
    71101 
    72 define Package/opkg/install 
     102define Package/opkg/Default/install 
    73103        $(INSTALL_DIR) $(1)/usr/lib/opkg 
    74104        $(INSTALL_DIR) $(1)/bin 
    75105        $(INSTALL_DIR) $(1)/etc 
    76         $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/ 
     106        $(INSTALL_DATA) ./files/opkg$(2).conf $(1)/etc/opkg.conf 
    77107        $(VERSION_SED) $(1)/etc/opkg.conf 
    78108        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg 
    79109endef 
     110 
     111Package/opkg/install = $(call Package/opkg/Default/install,$(1),) 
     112Package/opkg-smime/install = $(call Package/opkg/Default/install,$(1),-smime) 
     113 
    80114 
    81115define Build/InstallDev 
     
    100134 
    101135$(eval $(call BuildPackage,opkg)) 
     136$(eval $(call BuildPackage,opkg-smime)) 
    102137$(eval $(call HostBuild)) 
  • trunk/package/system/opkg/patches/007-force_static.patch

    r37007 r38220  
    11--- a/libopkg/Makefile.am 
    22+++ b/libopkg/Makefile.am 
    3 @@ -38,16 +38,10 @@ if HAVE_SHA256 
     3@@ -38,16 +38,10 @@ 
    44 opkg_util_sources += sha256.c sha256.h 
    55 endif 
     
    2020- 
    2121- 
    22 +libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) 
     22+libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a 
    2323--- a/libbb/Makefile.am 
    2424+++ b/libbb/Makefile.am 
    25 @@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@ 
     25@@ -2,9 +2,9 @@ 
    2626 BUILD_CPU=@build_cpu@ 
    2727 ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"$(HOST_CPU)\" -DBUILD_CPU=@build_cpu@ 
     
    3737--- a/tests/Makefile.am 
    3838+++ b/tests/Makefile.am 
    39 @@ -4,11 +4,11 @@ AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 - 
     39@@ -4,11 +4,11 @@ 
    4040 #noinst_PROGRAMS = libopkg_test opkg_active_list_test 
    4141 noinst_PROGRAMS = libopkg_test 
     
    5151 #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir) 
    5252  
    53 @@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test 
     53@@ -16,7 +16,7 @@ 
    5454 #opkg_active_list_test_SOURCES = opkg_active_list_test.c 
    5555 #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir) 
    5656  
    5757-libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la 
    58 +libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a 
     58+libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) 
    5959 libopkg_test_SOURCE = libopkg_test.c 
    6060 libopkg_test_LDFLAGS = -static 
     
    6262--- a/src/Makefile.am 
    6363+++ b/src/Makefile.am 
    64 @@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${AL 
     64@@ -2,5 +2,5 @@ 
    6565 bin_PROGRAMS = opkg-cl 
    6666  
     
    6969-                $(top_builddir)/libbb/libbb.la  
    7070+opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \ 
    71 +                $(top_builddir)/libbb/libbb.a 
     71+                $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) 
Note: See TracChangeset for help on using the changeset viewer.