diff options
| -rw-r--r-- | Config.in | 13 | ||||
| -rw-r--r-- | mk/build.mk | 27 | ||||
| -rw-r--r-- | package/bitlbee/Makefile | 2 | ||||
| -rw-r--r-- | target/Config.in | 2 | ||||
| -rw-r--r-- | target/alix1c/files/etc/network/interfaces | 5 |
5 files changed, 42 insertions, 7 deletions
@@ -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 67ec849cb..2d1d4e035 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -224,8 +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; \ + 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; \ @@ -236,13 +245,17 @@ endif ifneq (,$(filter %_rescue,${TARGET})) @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig endif - @if [ ! -z "$(TARGET)" ];then \ - $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ - fi +ifneq (,$(filter rb%,${TARGET})) + @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig +endif + @$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN) 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 +279,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) 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)" \ 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 + 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 |