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, next has been updated via c5a1afdcd9ceb098c1c569f9d3c3195f181cdcbf (commit) via 7fbc483a76456ca7620c96c8d1dcf7b3a7cb8bc9 (commit) from 1ba26859643db0ec9ca7b3e6f1f78fb708eced33 (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 c5a1afdcd9ceb098c1c569f9d3c3195f181cdcbf Merge: 7fbc483 1ba2685 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Nov 18 08:00:15 2011 +0100

Merge branch 'next' of arne_f@git.ipfire.org:/pub/git/ipfire-2.x into next

commit 7fbc483a76456ca7620c96c8d1dcf7b3a7cb8bc9 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Nov 18 07:59:19 2011 +0100

kernel: fix ssb modules build on arm.

-----------------------------------------------------------------------

Summary of changes: .../kernel/kernel.config.armv5tel-ipfire-kirkwood | 2 +- .../kernel/kernel.config.armv5tel-ipfire-versatile | 2 +- lfs/compat-wireless | 4 ++-- lfs/linux | 3 +++ ...6.32.45_align_ssb_modtable_32bit_boundary.patch | 12 ++++++++++++ 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch

Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index 13a80e5..bddf86b 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1308,7 +1308,7 @@ CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_B44 is not set +CONFIG_B44=m CONFIG_FORCEDETH=m # CONFIG_FORCEDETH_NAPI is not set CONFIG_E100=m diff --git a/config/kernel/kernel.config.armv5tel-ipfire-versatile b/config/kernel/kernel.config.armv5tel-ipfire-versatile index 487e5e7..6bdf4c5 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-versatile +++ b/config/kernel/kernel.config.armv5tel-ipfire-versatile @@ -1294,7 +1294,7 @@ CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m -# CONFIG_B44 is not set +CONFIG_B44=m CONFIG_FORCEDETH=m # CONFIG_FORCEDETH_NAPI is not set CONFIG_E100=m diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 27fb02b..a8902f1 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -91,8 +91,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

ifeq "$(MACHINE_TYPE)" "arm" # B43+B44 driver doesn't build on arm - cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk - cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk +# cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk +# cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk # Add libartas uAP driver cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.0-libertas_uap.patch cd $(DIR_APP)&& echo CONFIG_LIBERTAS_UAP=m >> config.mk diff --git a/lfs/linux b/lfs/linux index 8326023..b8d0dd8 100644 --- a/lfs/linux +++ b/lfs/linux @@ -168,6 +168,9 @@ ifeq "$(KCFG)" "-kirkwood" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45-arm_kirkwood_setups.patch endif

+ifeq "$(MACHINE_TYPE)" "arm" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch +endif

ifeq "$(HEADERS)" "1" # Install the header files diff --git a/src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch b/src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch new file mode 100644 index 0000000..e9b8b82 --- /dev/null +++ b/src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch @@ -0,0 +1,12 @@ +diff -Naur linux-2.6.32.45.org/include/linux/mod_devicetable.h linux-2.6.32.45/include/linux/mod_devicetable.h +--- linux-2.6.32.45.org/include/linux/mod_devicetable.h 2011-08-16 03:57:37.000000000 +0200 ++++ linux-2.6.32.45/include/linux/mod_devicetable.h 2011-11-17 15:07:43.366023632 +0100 +@@ -364,7 +364,7 @@ + __u16 vendor; /* Vendor or SDIO_ANY_ID */ + __u16 device; /* Device ID or SDIO_ANY_ID */ + kernel_ulong_t driver_data /* Data private to the driver */ +- __attribute__((aligned(sizeof(kernel_ulong_t)))); ++ __attribute__((aligned(sizeof(__u32)))); /* align to 32bit boundary */ + }; + + /* SSB core, see drivers/ssb/ */

hooks/post-receive -- IPFire 2.x development tree