From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 21df33072c3592bc445760b7c72e0e81e0b74d78 Date: Mon, 13 Aug 2012 19:41:16 +0200 Message-ID: <20120813174116.EE125200C1@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7516921748101480309==" List-Id: --===============7516921748101480309== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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, kernel-update has been updated via 21df33072c3592bc445760b7c72e0e81e0b74d78 (commit) from 337726bf3a0a21101ade7488264f386d54bbe20f (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 21df33072c3592bc445760b7c72e0e81e0b74d78 Author: Arne Fitzenreiter Date: Mon Aug 13 13:39:34 2012 -0400 compat-wireless: update to 3.5-3-snpc. ----------------------------------------------------------------------- Summary of changes: lfs/compat-wireless | 15 +++++--- make.sh | 4 +- ...at-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch | 37 ------------------= -- ...at-wireless-3.5-build_ath5k_only_with_pci.patch | 16 ++++++++ 4 files changed, 27 insertions(+), 45 deletions(-) delete mode 100644 src/patches/compat-wireless-3.2.5-1-fix_atomic64_t_on_arm= .patch create mode 100644 src/patches/compat-wireless-3.5-build_ath5k_only_with_pci= .patch Difference in files: diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 436d3c3..24ad75b 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -26,7 +26,7 @@ include Config =20 VERSUFIX=3Dipfire$(KCFG) =20 -VER =3D 3.5-1-snpc +VER =3D 3.5-3-snpc =20 ifeq "$(KCFG)" "-xen" KVER =3D 2.6.32.59 @@ -47,7 +47,7 @@ objects =3D $(DL_FILE) asix-4.4.0.tar.xz $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) asix-4.4.0.tar.xz =3D $(DL_FROM)/asix-4.4.0.tar.xz =20 -$(DL_FILE)_MD5 =3D 7099f748a9d2c05fffea7e5ea4f41a0b +$(DL_FILE)_MD5 =3D 66f27eed39aacd567f67025305273cd7 asix-4.4.0.tar.xz_MD5=3D633609e889de41554826e0e2cd7bffde =20 install : $(TARGET) @@ -82,6 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # kfifo has no license info and taints kernel cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39= _kfifo_module_info.patch =20 + # Build ath5k only if target has pci + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.5-bu= ild_ath5k_only_with_pci.patch + # Copy USB-Net drivers from Kernel... mkdir $(DIR_APP)/drivers/net/usb/new cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new @@ -101,12 +104,12 @@ ifneq "$(KCFG)" "-xen" cd $(DIR_APP) && echo export CONFIG_LIBERTAS_UAP=3Dm >> config.mk endif =20 -#ifeq "$(MACHINE_TYPE)" "arm" -# # fix atomic64 functions -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-3.2.5= -1-fix_atomic64_t_on_arm.patch -#endif + # Erase some modules that are obsolete or moved to other path + rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/bluetooth + rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/wl12* =20 cd $(DIR_APP) && make KLIB=3D/lib/modules/$(KVER)-$(VERSUFIX) \ + KLIB_BUILD=3D/lib/modules/$(KVER)-$(VERSUFIX)/build \ KMODPATH_ARG=3D'INSTALL_MOD_PATH=3D' KMODDIR=3Dkernel install-modules =20 # Install firmware udev files... diff --git a/make.sh b/make.sh index 2bf61ba..58f2dfa 100755 --- a/make.sh +++ b/make.sh @@ -441,7 +441,7 @@ buildipfire() { # ipfiremake mISDN KCFG=3D"-rpi" # ipfiremake dahdi KCFG=3D"-rpi" KMOD=3D1 ipfiremake cryptodev KCFG=3D"-rpi" -# ipfiremake compat-wireless KCFG=3D"-rpi" + ipfiremake compat-wireless KCFG=3D"-rpi" # ipfiremake r8169 KCFG=3D"-rpi" # ipfiremake r8168 KCFG=3D"-rpi" # ipfiremake r8101 KCFG=3D"-rpi" @@ -455,7 +455,7 @@ buildipfire() { # ipfiremake mISDN KCFG=3D"-omap" # ipfiremake dahdi KCFG=3D"-omap" KMOD=3D1 ipfiremake cryptodev KCFG=3D"-omap" -# ipfiremake compat-wireless KCFG=3D"-omap" + ipfiremake compat-wireless KCFG=3D"-omap" # ipfiremake r8169 KCFG=3D"-omap" # ipfiremake r8168 KCFG=3D"-omap" # ipfiremake r8101 KCFG=3D"-omap" diff --git a/src/patches/compat-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch = b/src/patches/compat-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch deleted file mode 100644 index adffdfd..0000000 --- a/src/patches/compat-wireless-3.2.5-1-fix_atomic64_t_on_arm.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur compat-wireless-3.2.5-1.org/compat/compat_atomic.c compat-wireles= s-3.2.5-1/compat/compat_atomic.c ---- compat-wireless-3.2.5-1.org/compat/compat_atomic.c 2012-02-07 04:45:51.0= 00000000 +0100 -+++ compat-wireless-3.2.5-1/compat/compat_atomic.c 2012-02-18 15:39:42.00000= 0000 +0100 -@@ -3,6 +3,8 @@ -=20 - #if !((LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,6,31)) && (defined(CONFIG_U= ML) || defined(CONFIG_X86))) && !((LINUX_VERSION_CODE >=3D KERNEL_VERSION(2,6= ,33)) && defined(CONFIG_ARM) && !defined(CONFIG_GENERIC_ATOMIC64)) -=20 -+#include -+ - static DEFINE_SPINLOCK(lock); -=20 - long long atomic64_read(const atomic64_t *v) -diff -Naur compat-wireless-3.2.5-1.org/compat/Makefile compat-wireless-3.2.5= -1/compat/Makefile ---- compat-wireless-3.2.5-1.org/compat/Makefile 2012-02-07 05:25:54.00000000= 0 +0100 -+++ compat-wireless-3.2.5-1/compat/Makefile 2012-02-18 13:35:18.000000000 +0= 100 -@@ -38,3 +38,9 @@ - cordic.o \ - crc8.o -=20 -+ -+ifndef CONFIG_64BIT -+ifndef CONFIG_GENERIC_ATOMIC64 -+ compat-y +=3D compat_atomic.o -+endif -+endif -diff -Naur compat-wireless-3.2.5-1.org/net/mac80211/key.h compat-wireless-3.= 2.5-1/net/mac80211/key.h ---- compat-wireless-3.2.5-1.org/net/mac80211/key.h 2012-02-07 05:25:53.00000= 0000 +0100 -+++ compat-wireless-3.2.5-1/net/mac80211/key.h 2012-02-18 15:40:44.000000000= +0100 -@@ -32,6 +32,8 @@ -=20 - #define NUM_RX_DATA_QUEUES 16 -=20 -+#include -+ - struct ieee80211_local; - struct ieee80211_sub_if_data; - struct sta_info; diff --git a/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch = b/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch new file mode 100644 index 0000000..2e82157 --- /dev/null +++ b/src/patches/compat-wireless-3.5-build_ath5k_only_with_pci.patch @@ -0,0 +1,16 @@ +diff -Naur compat-wireless-3.5-1-snpc.org/config.mk compat-wireless-3.5/conf= ig.mk +--- compat-wireless-3.5-1-snpc.org/config.mk 2012-07-31 17:22:29.000000000 -= 0400 ++++ compat-wireless-3.5/config.mk 2012-08-13 13:09:55.913234600 -0400 +@@ -246,10 +246,12 @@ + # mac80211 test driver + export CONFIG_MAC80211_HWSIM=3Dm +=20 ++ifdef CONFIG_PCI + export CONFIG_ATH5K=3Dm + # export CONFIG_ATH5K_DEBUG=3Dy + # export CONFIG_ATH5K_TRACER=3Dy + # export CONFIG_ATH5K_AHB=3Dy ++endif #CONFIG_PCI +=20 + export CONFIG_ATH9K=3Dm + export CONFIG_ATH9K_HW=3Dm hooks/post-receive -- IPFire 2.x development tree --===============7516921748101480309==--