From cf6b45d277fa44ec128b1d68d3061f2c1ea78879 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 19:13:55 +0100 Subject: fix allmodconfig/allconfig for routerboard targets --- mk/build.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index 67ec849cb..f51c92149 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -225,7 +225,10 @@ $(CONFIG)/mconf: defconfig: @if [ ! -z "$(TARGET)" ];then \ - grep "^config" target/Config.in |grep -i "$(TARGET)"|sed -e "s#^config \(.*\)#\1=y#" > $(TOPDIR)/.defconfig; \ + grep "^config" target/Config.in \ + |grep -i "$(TARGET)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + > $(TOPDIR)/.defconfig; \ for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(TOPDIR)/.defconfig; \ done; \ @@ -235,6 +238,9 @@ ifneq (,$(filter %_qemu,${TARGET})) endif ifneq (,$(filter %_rescue,${TARGET})) @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig +endif +ifneq (,$(filter rb%,${TARGET})) + @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig endif @if [ ! -z "$(TARGET)" ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ @@ -242,7 +248,10 @@ endif modconfig: @if [ ! -z "$(TARGET)" ];then \ - grep "^config" target/Config.in |grep -i "$(TARGET)"|sed -e "s#^config \(.*\)#\1=y#" > $(TOPDIR)/all.config; \ + grep "^config" target/Config.in \ + |grep -i "$(TARGET)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + > $(TOPDIR)/all.config; \ for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(TOPDIR)/all.config; \ done; \ @@ -266,12 +275,14 @@ modconfig: >> $(TOPDIR)/all.config; \ fi ifneq (,$(filter %_qemu,${TARGET})) - @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config endif ifneq (,$(filter %_rescue,${TARGET})) @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config endif +ifneq (,$(filter rb%,${TARGET})) + @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config +endif menuconfig: $(CONFIG)/mconf defconfig @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) -- cgit v1.2.3 From 2725cc8be451a17f80bb91a8c42e51497cb16453 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 19:14:24 +0100 Subject: fix compile for mips --- package/bitlbee/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile index e92957f05..ccfea817f 100644 --- a/package/bitlbee/Makefile +++ b/package/bitlbee/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P do-configure: (cd $(WRKBUILD); \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS) -fPIC" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ STAGING_DIR="$(STAGING_DIR)" \ -- cgit v1.2.3 From 7e9efc2e40250fe9717e1af16465a391a72a4ff6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 19:15:18 +0100 Subject: add default network configuration for alix1c --- target/alix1c/files/etc/network/interfaces | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 target/alix1c/files/etc/network/interfaces diff --git a/target/alix1c/files/etc/network/interfaces b/target/alix1c/files/etc/network/interfaces new file mode 100644 index 000000000..104c1a1b6 --- /dev/null +++ b/target/alix1c/files/etc/network/interfaces @@ -0,0 +1,5 @@ +auto lo +iface lo inet loopback + +auto eth0 +iface eth0 inet dhcp -- cgit v1.2.3 From b706a572926dd8ac76de3928bd1290ee880944f8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 11 Dec 2009 19:56:36 +0100 Subject: try to autodetect host system and make it usable in menusystem --- Config.in | 13 +++++++++++++ mk/build.mk | 12 ++++++++---- target/Config.in | 2 ++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Config.in b/Config.in index c2ffcd903..3f107feaf 100644 --- a/Config.in +++ b/Config.in @@ -7,6 +7,7 @@ config ADKVERSION mainmenu "OpenADK Configuration" + config MODULES bool default y @@ -90,6 +91,18 @@ config ADK_FORCE_PARALLEL help Do not enable this! It's for testing purposes only. +choice +prompt "Hostsystem (do not change!)" +config ADK_HOST_LINUX + prompt "Linux" + boolean + +config ADK_HOST_FREEBSD + prompt "FreeBSD" + boolean + +endchoice + endmenu source "target/Config.in" diff --git a/mk/build.mk b/mk/build.mk index f51c92149..2d1d4e035 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -224,11 +224,17 @@ $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) defconfig: +ifeq (${OStype},Linux) + @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig +endif +ifeq (${OStype},FreeBSD) + @echo ADK_HOST_FREEBSD=y > $(TOPDIR)/.defconfig +endif @if [ ! -z "$(TARGET)" ];then \ grep "^config" target/Config.in \ |grep -i "$(TARGET)" \ |sed -e "s#^config \(.*\)#\1=y#" \ - > $(TOPDIR)/.defconfig; \ + >> $(TOPDIR)/.defconfig; \ for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(TOPDIR)/.defconfig; \ done; \ @@ -242,9 +248,7 @@ endif ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig endif - @if [ ! -z "$(TARGET)" ];then \ - $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ - fi + @$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN) modconfig: @if [ ! -z "$(TARGET)" ];then \ diff --git a/target/Config.in b/target/Config.in index a5e62907c..4d30e4001 100644 --- a/target/Config.in +++ b/target/Config.in @@ -789,4 +789,6 @@ config ADK_TARGET_PACKAGE_RPM endchoice + endmenu + -- cgit v1.2.3