Misc bumps (branch yem/bumps)

PATCH New Yann E. MORIN 3 participants 8 messages Mar 10, 2014 – Mar 11, 2014

lore

Share & tools

lore

Yann E. MORIN

author

2014-03-10 21:24 UTC #0 lore raw

cover Misc bumps (branch yem/bumps)

From: "Yann E. MORIN" <[email protected]>

Hello All!

Here are a few bumps to:

- linux-firmware: fix a firmware file, bump for new firmwares, offer alternatives for iwlwifi revisions

- rpi-firmware: bump for fixes

- tvheadend: bump for improvements and fixes all over the tree

Regards,
Yann E. MORIN.

The following changes since commit ca4e9a78732bcacddd0c91ab35ee39a60ff040aa:

jack2: fix missing alsa-lib feature dependency (2014-03-10 13:13:03 +0100)

are available in the git repository at:

git://gitorious.org/buildroot/buildroot.git yem/bumps

for you to fetch changes up to 7fe2dbaa3e609fa6bd7d80f29daf6bb28d73c64d:

package/tvheadend: bump version (2014-03-10 18:15:01 +0100)

----------------------------------------------------------------
Yann E. MORIN (5):
package/linux-firmware: fix typo in firmware file for cxgb4 package/linux-firmware: bump for new firmwares package/linux-firmware: different iwlwifi3160/7260 firmwares for different kernels package/rpi-firmware: bump version
package/tvheadend: bump version

 package/linux-firmware/Config.in                   | 28 ++++++++++++++++++++
 package/linux-firmware/linux-firmware.mk           |  8 +++---
 package/rpi-firmware/rpi-firmware.mk               |  2 +-
 .../tvheadend-001-no-auto-download-dvbscans.patch  | 30 +++++++++++-----------
 .../tvheadend/tvheadend-002-no-check_config.patch  |  8 +++---
 .../tvheadend/tvheadend-003-remove-werror.patch    |  9 ++++---
 .../tvheadend-004-dont-run-compiled-code.patch     | 21 ---------------
 package/tvheadend/tvheadend.mk                     |  2 +-
 8 files changed, 58 insertions(+), 50 deletions(-)
 delete mode 100644 package/tvheadend/tvheadend-004-dont-run-compiled-code.patch

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

Yann E. MORIN

author

2014-03-10 21:24 UTC #1 lore raw

PATCH 1/5 package/linux-firmware: fix typo in firmware file for cxgb4

From: "Yann E. MORIN" <[email protected]>

Trivial inversion b/g: cxbg4 -> cxgb4

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Jeremy Kerr <[email protected]>

---
 package/linux-firmware/linux-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/linux-firmware/linux-firmware.mk +1 -1

index c4e7857..45c82c6 100644
@@ -157,7 +157,7 @@ endif
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4),y)
 LINUX_FIRMWARE_FILES += \
 	cxgb4/t4fw-1.9.23.0.bin \
-	cxbg4/t4fw.bin
+	cxgb4/t4fw.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware
 endif

Signature · 1 line

1.8.3.2

Jeremy Kerr

2014-03-10 21:40 UTC #2 lore raw

PATCH 1/5 package/linux-firmware: fix typo in firmware file for cxgb4

Hi Yann.

Quoted 1 line

Trivial inversion b/g: cxbg4 -> cxgb4

Looks good.

Acked-by Jeremy Kerr <[email protected].

Regards,

Jeremy

Yann E. MORIN

author

2014-03-10 21:24 UTC #3 lore raw

PATCH 2/5 package/linux-firmware: bump for new firmwares

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

A bunch of new WiFi firmwares has been added, some have been updated. Not limited to WiFi, but other firmwares are of less interest to Buildroot for now (eg. radeon, myri10ge...).

Fixups in WHENCE file (the all-licenses file).

Signed-off-by "Yann E. MORIN" <[email protected]>

---
 package/linux-firmware/linux-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/linux-firmware/linux-firmware.mk +1 -1

index 45c82c6..307e8ee 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINUX_FIRMWARE_VERSION = 52d77db9f133afe4d2b26aeccfd603745f45fda1
+LINUX_FIRMWARE_VERSION = f8c22c692bdee57a20b092e647464ff6176df3ed
 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git

Signature · 1 line

1.8.3.2

Yann E. MORIN

author

2014-03-10 21:24 UTC #4 lore raw

PATCH 3/5 package/linux-firmware: different iwlwifi3160/7260 firmwares for different kernels

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

The firmwares to use for iwlwifi 3160/7260 are different, depending on which version of the Linux kernel is being used:
- rev. 7 is for linux 3.10 through 3.12 (both included)
- rev. 8 is for linux 3.13 onward

Add a config choice to select the appropriate version.

(See cset a0a6eeb in the linux-firmware repository for the details.)

Signed-off-by "Yann E. MORIN" <[email protected]>

---
 package/linux-firmware/Config.in         | 28 ++++++++++++++++++++++++++++
 package/linux-firmware/linux-firmware.mk |  4 ++--
 2 files changed, 30 insertions(+), 2 deletions(-)

package/linux-firmware/Config.in +28 -0

index 0a37a7e..ba9a6c1 100644
@@ -48,6 +48,34 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260
 	  Firmware files for the Intel Wifi 7260 devices supported by
 	  the iwlwifi kernel driver.
 
+if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 || \
+   BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260
+
+choice
+	bool "iwlwifi 3160/7260 revision to use"
+	help
+	  Use revision 7 for kernel 3.10 to 3.12.
+	  Use revision 8 for kernel 3.13 onward.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7
+	prompt "revision 7"
+	help
+	  Use revision 7 for kernel 3.10 to 3.12.
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8
+	prompt "revision 8"
+	help
+	  Use revision 8 for kernel 3.13 onward.
+
+endchoice
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV
+	int
+	default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7
+	default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8
+
+endif # iwlwifi 3160/7260
+
 config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8
 	bool "Libertas SD 8686 v8"
 	help

package/linux-firmware/linux-firmware.mk +2 -2

index 307e8ee..df6c36b 100644
@@ -127,7 +127,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
 
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y)
-LINUX_FIRMWARE_FILES += iwlwifi-3160-7.ucode
+LINUX_FIRMWARE_FILES += iwlwifi-3160-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV).ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif

@@ -141,7 +141,7 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif
 
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260),y)
-LINUX_FIRMWARE_FILES += iwlwifi-7260-7.ucode
+LINUX_FIRMWARE_FILES += iwlwifi-7260-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV).ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif

Signature · 1 line

1.8.3.2

Yann E. MORIN

author

2014-03-10 21:24 UTC #5 lore raw

PATCH 4/5 package/rpi-firmware: bump version

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

Bump to latest changeset:
- fix for detecting monitor

Signed-off-by "Yann E. MORIN" <[email protected]>

---
 package/rpi-firmware/rpi-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/rpi-firmware/rpi-firmware.mk +1 -1

index b6c9667..a849d32 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = bec4bd0f70aa46f55a980996e8774547c0f909c8
+RPI_FIRMWARE_VERSION = a0eb06736a3f1583fc6cd575149c7835dc43582d
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

Signature · 1 line

1.8.3.2

Yann E. MORIN

author

2014-03-10 21:24 UTC #6 lore raw

PATCH 5/5 package/tvheadend: bump version

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

The list of changes is too long to repeat here, but lots of fixes and improvements, plus a brand new rewrite of the DVB handling code.

Refresh patches, except patch 4 which has now been upstreamed.

Signed-off-by "Yann E. MORIN" <[email protected]>

---
 .../tvheadend-001-no-auto-download-dvbscans.patch  | 30 +++++++++++-----------
 .../tvheadend/tvheadend-002-no-check_config.patch  |  8 +++---
 .../tvheadend/tvheadend-003-remove-werror.patch    |  9 ++++---
 .../tvheadend-004-dont-run-compiled-code.patch     | 21 ---------------
 package/tvheadend/tvheadend.mk                     |  2 +-
 5 files changed, 25 insertions(+), 45 deletions(-)
 delete mode 100644 package/tvheadend/tvheadend-004-dont-run-compiled-code.patch

package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch +15 ~~-15~~

index b64627e..f14f302 100644
@@ -8,10 +8,10 @@ it is no longer needed to install those as part of tvheadend.
 
 Signed-off-by: "Yann E. MORIN" <[email protected]>
 
-diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
---- tvheadend-v3.5.orig/configure	2013-02-15 14:41:26.000000000 +0100
-+++ tvheadend-v3.5/configure	2013-02-16 15:41:16.675556099 +0100
-@@ -179,15 +179,16 @@
+diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/configure tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/configure
+--- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/configure	2014-03-07 21:44:39.000000000 +0100
++++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/configure	2014-03-09 14:44:09.350095543 +0100
+@@ -272,15 +272,16 @@
  #
  # DVB scan
  #

@@ -35,12 +35,12 @@ diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure
 +#  echo "ok"
 +#fi
  
- # ###########################################################################
- # Write config
-diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile
---- tvheadend-v3.5.orig/Makefile	2013-02-15 14:41:26.000000000 +0100
-+++ tvheadend-v3.5/Makefile	2013-02-16 15:41:38.218821287 +0100
-@@ -211,7 +211,7 @@
+ #
+ # epoll
+diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile
+--- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile	2014-03-07 21:44:39.000000000 +0100
++++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile	2014-03-09 14:44:09.350095543 +0100
+@@ -255,7 +255,7 @@
  SRCS-${CONFIG_BUNDLE}     += bundle.c
  BUNDLES-yes               += docs/html docs/docresources src/webui/static
  BUNDLES-yes               += data/conf

@@ -49,10 +49,10 @@ diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile
  BUNDLES                    = $(BUNDLES-yes)
  
  #
-diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk
---- tvheadend-v3.5.orig/support/posix.mk	2013-02-15 14:41:26.000000000 +0100
-+++ tvheadend-v3.5/support/posix.mk	2013-02-16 15:42:41.015290003 +0100
-@@ -15,6 +15,10 @@
+diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/support/posix.mk tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/support/posix.mk
+--- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/support/posix.mk	2014-03-07 21:44:39.000000000 +0100
++++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/support/posix.mk	2014-03-09 14:44:09.350095543 +0100
+@@ -17,6 +17,10 @@
  
  	find ${DESTDIR}${datadir}/tvheadend -name .git -exec rm -rf {} \; &>/dev/null || /bin/true

@@ -62,4 +62,4 @@ diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk
 +
  uninstall:
  	rm -f ${DESTDIR}${bindir}/tvheadend
- 	rm -f ${DESTDIR}${mandir}/tvheadend.1
+ 	rm -f ${DESTDIR}${mandir}/man1/tvheadend.1

package/tvheadend/tvheadend-002-no-check_config.patch +4 -4

index aad04e5..b55cbfc 100644
@@ -9,10 +9,10 @@ to a false comparison of the files' dates.
 
 Signed-off-by: "Yann E. MORIN" <[email protected]>
 
-diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile
---- tvheadend-v3.5.orig/Makefile	2013-02-17 15:15:03.228749505 +0100
-+++ tvheadend-v3.5/Makefile	2013-02-17 15:15:51.591923062 +0100
-@@ -250,7 +250,7 @@
+diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile
+--- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile	2014-03-09 14:47:43.780025330 +0100
++++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile	2014-03-09 14:48:40.836539093 +0100
+@@ -294,7 +294,7 @@
  	$(ROOTDIR)/configure $(CONFIGURE_ARGS)
  
  # Binary

package/tvheadend/tvheadend-003-remove-werror.patch +5 -4

index 1b0e687..cc97a18 100644
@@ -2,14 +2,15 @@ tvheadend: remove -Werror from CFLAGS
 
 Signed-off-by: Vicente Olivert Riera <[email protected]>
 
---- tvheadend-2b649954346aa2e9c81834d500a25c528f31f829/Makefile.orig	2013-11-28 15:52:52.284041848 +0000
-+++ tvheadend-2b649954346aa2e9c81834d500a25c528f31f829/Makefile	2013-11-28 15:53:03.715220194 +0000
-@@ -27,7 +27,7 @@ PROG    := $(BUILDDIR)/tvheadend
+diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile
+--- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile	2014-03-09 14:50:48.437688482 +0100
++++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile	2014-03-09 14:54:00.411418749 +0100
+@@ -27,7 +27,7 @@
  # Common compiler flags
  #
  
 -CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
 +CFLAGS  += -Wall -Wwrite-strings -Wno-deprecated-declarations
  CFLAGS  += -Wmissing-prototypes -fms-extensions
- CFLAGS  += -g -funsigned-char -O2 
+ CFLAGS  += -g -funsigned-char -O2
  CFLAGS  += -D_FILE_OFFSET_BITS=64

package/tvheadend/tvheadend-004-dont-run-compiled-code.patch deleted +0 ~~-21~~

deleted file mode 100644
index 8125db1..0000000
@@ -1,21 +0,0 @@
-support: don't try to run compiled code
-
-When cross-compiling, we can't run the compiled code.
-
-Consider the compiler returning success as an indication
-it is working.
-
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff -durN tvheadend.orig/support/configure.inc tvheadend-c7d0335eb10d02b780423bef8e7c740e422fff13/support/configure.inc
---- tvheadend.orig/support/configure.inc	2013-12-01 01:24:26.000000000 +0100
-+++ tvheadend-c7d0335eb10d02b780423bef8e7c740e422fff13/support/configure.inc	2013-12-03 22:34:57.547762178 +0100
-@@ -265,8 +265,6 @@
- EOF
-   $CC $CFLAGS $LDFLAGS $TMPDIR/$$.c -o $TMPDIR/$$.bin $opt #&> /dev/null
-   RET=$?
--  [ $RET -eq 0 ] && $TMPDIR/$$.bin
--  RET=$?
-   rm -f $TMPDIR/$$.{c,bin}
-   return $RET
- }

package/tvheadend/tvheadend.mk +1 -1

index 85240a0..9b1e443 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION           = c7d0335eb10d02b780423bef8e7c740e422fff13
+TVHEADEND_VERSION           = c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3
 TVHEADEND_SITE              = git://github.com/tvheadend/tvheadend.git
 TVHEADEND_LICENSE           = GPLv3+
 TVHEADEND_LICENSE_FILES     = LICENSE

Signature · 1 line

1.8.3.2

Peter Korsgaard

2014-03-11 10:47 UTC #7 lore raw

cover Misc bumps (branch yem/bumps)

In reply to Yann E. MORIN

Quoted 5 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
From: "Yann E. MORIN" <[email protected]>
Hello All!

Quoted 8 lines

Here are a few bumps to:
- linux-firmware: fix a firmware file, bump for new firmwares, offer alternatives for iwlwifi revisions
- rpi-firmware: bump for fixes
- tvheadend: bump for improvements and fixes all over the tree

Committed series, thanks.

Signature · 1 line

Bye, Peter Korsgaard