Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen

This commit is contained in:
Arne Fitzenreiter
2012-10-14 15:07:37 +02:00
2 changed files with 16 additions and 3 deletions

View File

@@ -81,6 +81,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifeq "$(MACHINE_TYPE)" "arm"
# Remove unsupported timestampcounter on arm. the result seems to be unused
cd $(DIR_SRC)/mISDN && sed -i -e "s|rdtscl(pChan->ulTimestampIn);||g" drivers/isdn/mISDN/octvqe/octvqe_linux.c
endif
ifeq "$(NOPCI)" "1"
# Disable PCI drivers if kernel has no PCI
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCPCI|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_HFCMULTI|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_XHFC|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_AVMFRITZ|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_SPEEDFAX|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_INFINEON|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_W6692|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_NETJET|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_IPAC|#&|g" mISDN.cfg.default
cd $(DIR_SRC)/mISDN && sed -i -e "s|^CONFIG_MISDN_ISAR|#&|g" mISDN.cfg.default
endif
cd $(DIR_SRC)/mISDN && ./configure --with-kerneldir=/usr/src/linux
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) modules

View File

@@ -421,7 +421,7 @@ buildipfire() {
ipfiremake linux KCFG="-rpi"
ipfiremake v4l-dvb KCFG="-rpi"
# ipfiremake kvm-kmod KCFG="-rpi"
# ipfiremake mISDN KCFG="-rpi"
ipfiremake mISDN KCFG="-rpi" NOPCI=1
ipfiremake cryptodev KCFG="-rpi"
ipfiremake compat-wireless KCFG="-rpi"
# ipfiremake r8169 KCFG="-rpi"
@@ -434,7 +434,7 @@ buildipfire() {
ipfiremake linux KCFG="-omap"
ipfiremake v4l-dvb KCFG="-omap"
# ipfiremake kvm-kmod KCFG="-omap"
# ipfiremake mISDN KCFG="-omap"
ipfiremake mISDN KCFG="-omap" NOPCI=1
ipfiremake cryptodev KCFG="-omap"
ipfiremake compat-wireless KCFG="-omap"
# ipfiremake r8169 KCFG="-omap"
@@ -448,7 +448,7 @@ buildipfire() {
ipfiremake linux KCFG="-kirkwood"
ipfiremake v4l-dvb KCFG="-kirkwood"
# ipfiremake kvm-kmod KCFG="-kirkwood"
# ipfiremake mISDN KCFG="-kirkwood"
ipfiremake mISDN KCFG="-kirkwood"
ipfiremake cryptodev KCFG="-kirkwood"
ipfiremake compat-wireless KCFG="-kirkwood"
# ipfiremake r8169 KCFG="-kirkwood"