From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. d9edbc1be44beeb38a64702427867f8e6311d09d
Date: Wed, 10 Oct 2012 21:01:24 +0200 [thread overview]
Message-ID: <20121010190124.8DBF0200A6@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3776 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, thirteen has been updated
via d9edbc1be44beeb38a64702427867f8e6311d09d (commit)
from 47934bca9f4d7d1b3c2b8a19f68a1abbe1a46a7b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d9edbc1be44beeb38a64702427867f8e6311d09d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 10 11:31:03 2012 +0200
mISDN: disable PCI driver on non PCI kernels and enable build on arm.
-----------------------------------------------------------------------
Summary of changes:
lfs/mISDN | 13 +++++++++++++
make.sh | 6 +++---
2 files changed, 16 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/lfs/mISDN b/lfs/mISDN
index e0469c4..0fe76ec 100644
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -82,6 +82,19 @@ 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
cd $(DIR_SRC)/mISDN && make KVERS=$(KVER)-$(VERSUFIX) \
diff --git a/make.sh b/make.sh
index 768fde7..2a71bbf 100755
--- a/make.sh
+++ b/make.sh
@@ -423,7 +423,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"
@@ -436,7 +436,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"
@@ -450,7 +450,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"
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-10-10 19:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121010190124.8DBF0200A6@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox