[package] broadcom-diag: SimpleShare: expose power button as reset to the system...

[openwrt.git] / package / opkg / Makefile

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 249299f..a3a1da6 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -1,15 +1,16 @@
 #
 #

-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 
 include $(TOPDIR)/rules.mk
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 
 include $(TOPDIR)/rules.mk

+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=opkg
 
 PKG_NAME:=opkg

-PKG_REV:=215
+PKG_REV:=528

 PKG_VERSION:=$(PKG_REV)
 PKG_VERSION:=$(PKG_REV)

-PKG_RELEASE:=1
+PKG_RELEASE:=3

 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)


@@ -17,7 +18,9 @@ PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)
 PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_FIXUP = libtool
 PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_FIXUP = libtool

+

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/package.mk

+include $(INCLUDE_DIR)/host-build.mk

 
 define Package/opkg
   SECTION:=base
 
 define Package/opkg
   SECTION:=base


@@ -37,16 +40,17 @@ define Package/opkg/description
 endef
 
 define Package/opkg/conffiles
 endef
 
 define Package/opkg/conffiles

-/etc/opkg/opkg.conf
+/etc/opkg.conf

 endef
 
 endef
 

-TARGET_CFLAGS += $(FPIC) $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds)
+TARGET_CFLAGS += $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds)

 EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
 EXTRA_CFLAGS += $(TARGET_CPPFLAGS)

-EXTRA_LDFLAGS += $(TARGET_LDFLAGS) -Wl,-rpath-link,$(STAGING_DIR)/usr/lib

 
 CONFIGURE_ARGS += \
        --disable-curl \
        --disable-gpg \
 
 CONFIGURE_ARGS += \
        --disable-curl \
        --disable-gpg \

+       --with-opkgetcdir=/etc \
+       --with-opkglockfile=/var/lock/opkg.lock

 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \
 
 define Build/Configure
        (cd $(PKG_BUILD_DIR); \


@@ -67,12 +71,9 @@ define Package/opkg/install
        $(INSTALL_DIR) $(1)/usr/lib/opkg
        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DIR) $(1)/usr/lib/opkg
        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/etc

-       $(INSTALL_DIR) $(1)/etc/opkg
-       $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/opkg/
-       $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg/opkg.conf
+       $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/
+       $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf

        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg

-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -80,4 +81,27 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/libopkg $(1)/usr/include/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/include/libopkg $(1)/usr/include/
 endef
 

+
+HOST_BUILD_DEPENDS:=libtool/host
+
+HOST_CONFIGURE_ARGS+= \
+       --disable-curl \
+       --disable-gpg \
+       --with-opkgetcdir=/etc \
+       --with-opkglockfile=/tmp/opkg.lock
+
+define Host/Configure
+       (cd $(HOST_BUILD_DIR); autoreconf -v --install || exit 1)
+       $(call Host/Configure/Default)
+endef
+
+define Host/Compile
+       $(MAKE) -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))

+$(eval $(call HostBuild))