projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] opkg: reenable global upgrade, refresh patches
[openwrt.git]
/
package
/
swconfig
/
Makefile
diff --git
a/package/swconfig/Makefile
b/package/swconfig/Makefile
index 0d86438a792533b6b98c3de55a3b127969ad0133..24ebaee456a0bc4283714dd54df2816dffa3fcec 100644
(file)
--- a/
package/swconfig/Makefile
+++ b/
package/swconfig/Makefile
@@
-1,31
+1,32
@@
-#
-# Copyright (C) 200
6
OpenWrt.org
+#
+# Copyright (C) 200
8-2010
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-PKG_NAME:=kmod-swconfig
-PKG_RELEASE:=1
-PKG_BUILD_DEPENDS:=libnl
+PKG_NAME:=swconfig
+PKG_RELEASE:=6
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
define Package/swconfig
SECTION:=base
CATEGORY:=Base system
define Package/swconfig
SECTION:=base
CATEGORY:=Base system
- DEPENDS:=@
LINUX_2_6_26||LINUX_2_6_27
+ DEPENDS:=@
!TARGET_brcm47xx +libuci +libnl-tiny
TITLE:=Switch configuration utility
endef
TITLE:=Switch configuration utility
endef
-TARGET_CPPFLAGS += \
- -I$(STAGING_DIR)/usr/include \
+TARGET_CPPFLAGS := \
+ -D_GNU_SOURCE \
+ -I$(STAGING_DIR)/usr/include/libnl-tiny \
-I$(LINUX_DIR)/include \
-I$(LINUX_DIR)/include \
- -I$(PKG_BUILD_DIR)
+ -I$(LINUX_DIR)/arch/$(LINUX_KARCH)/include \
+ -I$(PKG_BUILD_DIR) \
+ $(TARGET_CPPFLAGS)
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
@@
-33,15
+34,16
@@
define Build/Prepare
endef
define Build/Compile
endef
define Build/Compile
- CFLAGS="$(TARGET_C
FLAGS) $(TARGET_CPP
FLAGS)" \
+ CFLAGS="$(TARGET_C
PPFLAGS) $(TARGET_C
FLAGS)" \
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
- LIBS="$(
STAGING_DIR)/usr/lib/libnl.a -lm
"
+ LIBS="$(
TARGET_LDFLAGS) -lnl-tiny -lm -luci
"
endef
define Package/swconfig/install
endef
define Package/swconfig/install
- $(INSTALL_DIR) $(1)/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/bin/swconfig
+ $(INSTALL_DIR) $(1)/sbin $(1)/lib/network
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/swconfig $(1)/sbin/swconfig
+ $(INSTALL_DATA) ./files/switch.sh $(1)/lib/network/
endef
$(eval $(call BuildPackage,swconfig))
endef
$(eval $(call BuildPackage,swconfig))