summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/build.mk17
-rw-r--r--package/bitlbee/Makefile2
-rw-r--r--target/alix1c/files/etc/network/interfaces5
3 files changed, 20 insertions, 4 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; \
@@ -236,13 +239,19 @@ 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); \
fi
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)
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/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