enable TCP ECN by default (see #3001 for more information)

[openwrt.git] / package / opkg / Makefile

diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index e8aebcb..26ae4d2 100644 (file)
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opkg
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opkg

-PKG_REV:=4561
+PKG_REV:=4564

 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 


@@ -36,6 +36,11 @@ define Package/opkg/description
   opkg knows how to install both .ipk and .deb packages.
 endef
 
   opkg knows how to install both .ipk and .deb packages.
 endef
 

+define Package/opkg/conffiles
+/etc/opkg.conf
+endef
+
+TARGET_CFLAGS += $(FPIC)

 EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
 EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib
 EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 


@@ -52,14 +57,17 @@ endef
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \

-               CC=$(TARGET_CC) \
+               CC="$(TARGET_CC)" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
 define Package/opkg/install
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
 define Package/opkg/install

-       $(INSTALL_BIN) ./files/postinst $(1)/CONTROL/postinst
+       $(INSTALL_DIR) $(1)/usr/lib/opkg

        $(INSTALL_DIR) $(1)/bin
        $(INSTALL_DIR) $(1)/bin

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

        $(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/
        $(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/