Skip to contentSkip to conversation

bump kernel headers to latest stable, including scsi patch for latests kernel headers

PATCH New Marcus Osdoba 2 participants 5 messages Sep 4, 2010 – Sep 6, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bump kernel headers to latest stable, including scsi patch for latests kernel headers

bump to latest (begin of September 2010) kernel headers,
scsi.h and scsi_net.h have not changed since April 2010
-> so renaming the scsi patches files in toolchain/kernel-headers/ to match higher versions

---
 toolchain/kernel-headers/Config.in                 |   10 ++-
 ...-types-for-headers-exported-to-user-space.patch |   60 --------------------
 ...-types-for-headers-exported-to-user-space.patch |   60 ++++++++++++++++++++
 ...-types-for-headers-exported-to-user-space.patch |   59 -------------------
 ...-types-for-headers-exported-to-user-space.patch |   59 +++++++++++++++++++
 ...-types-for-headers-exported-to-user-space.patch |   59 +++++++++++++++++++
 6 files changed, 185 insertions(+), 122 deletions(-)
 delete mode 100644 toolchain/kernel-headers/linux-2.6.32.18-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
 create mode 100644 toolchain/kernel-headers/linux-2.6.32.21-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
 delete mode 100644 toolchain/kernel-headers/linux-2.6.34.3-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
 create mode 100644 toolchain/kernel-headers/linux-2.6.34.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
 create mode 100644 toolchain/kernel-headers/linux-2.6.35.4-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
toolchain/kernel-headers/Config.in +7 -3
index e60595f..de8ea01 100644
@@ -45,6 +45,9 @@ choice
 	config BR2_KERNEL_HEADERS_2_6_34
 		bool "Linux 2.6.34.x kernel headers"
 
+	config BR2_KERNEL_HEADERS_2_6_35
+		bool "Linux 2.6.35.x kernel headers"
+
 	config BR2_KERNEL_HEADERS_VERSION
 		bool "Linux 2.6 (manually specified version)"
 
@@ -61,13 +64,14 @@ config BR2_DEFAULT_KERNEL_VERSION
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "2.6.27.50"	if BR2_KERNEL_HEADERS_2_6_27
+	default "2.6.27.53"	if BR2_KERNEL_HEADERS_2_6_27
 	default "2.6.28.10"	if BR2_KERNEL_HEADERS_2_6_28
 	default "2.6.29.6"	if BR2_KERNEL_HEADERS_2_6_29
 	default "2.6.30.10"	if BR2_KERNEL_HEADERS_2_6_30
 	default "2.6.31.14"	if BR2_KERNEL_HEADERS_2_6_31
-	default "2.6.32.18"	if BR2_KERNEL_HEADERS_2_6_32
+	default "2.6.32.21"	if BR2_KERNEL_HEADERS_2_6_32
 	default "2.6.33.7"	if BR2_KERNEL_HEADERS_2_6_33
-	default "2.6.34.3"	if BR2_KERNEL_HEADERS_2_6_34
+	default "2.6.34.6"	if BR2_KERNEL_HEADERS_2_6_34
+	default "2.6.35.4"	if BR2_KERNEL_HEADERS_2_6_35
 	default "2.6"		if BR2_KERNEL_HEADERS_SNAP
 	default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
toolchain/kernel-headers/linux-2.6.32.18-scsi-use-__uX-types-for-headers-exported-to-user-space.patch deleted +0 -60

60 lines not on this page · raw message

toolchain/kernel-headers/linux-2.6.32.21-scsi-use-__uX-types-for-headers-exported-to-user-space.patch new file +60 -0

60 lines not on this page · raw message

toolchain/kernel-headers/linux-2.6.34.3-scsi-use-__uX-types-for-headers-exported-to-user-space.patch deleted +0 -59

59 lines not on this page · raw message

toolchain/kernel-headers/linux-2.6.34.6-scsi-use-__uX-types-for-headers-exported-to-user-space.patch new file +59 -0

59 lines not on this page · raw message

toolchain/kernel-headers/linux-2.6.35.4-scsi-use-__uX-types-for-headers-exported-to-user-space.patch new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 bump kernel headers to latest stable, including scsi patch for latests kernel headers

Am 04.09.2010 20:49, schrieb Marcus Osdoba:

Quoted 6 lines

bump to latest (begin of September 2010) kernel headers,
scsi.h and scsi_net.h have not changed since April 2010
-> so renaming the scsi patches files in toolchain/kernel-headers/ to match higher versions

---

I have tested building toolchains with recent headers 2.6.32, 2.6.34 and 2.6.35.

#2 lore raw

PATCH 1/1 bump kernel headers to latest stable, including scsi patch for latests kernel headers

In reply to Marcus Osdoba
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Marcus" == Marcus Osdoba <[email protected]> writes:

Marcus> bump to latest (begin of September 2010) kernel headers,

Thanks, but something seems to have gotten wrong, git am cannot apply it. I've made the bump myself and at the same time removed 2.6.27/2.6.28.

Marcus> scsi.h and scsi_net.h have not changed since April 2010 Marcus> so renaming the scsi patches files in toolchain/kernel-headers/ Marcus> to match higher versions

Yeah, the fix is finally in mainline for 2.6.36.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 bump kernel headers to latest stable, including scsi patch for latests kernel headers

Am 06.09.2010 09:37, schrieb Peter Korsgaard:

Quoted 3 lines

Thanks, but something seems to have gotten wrong, git am cannot apply it. I've made the bump myself and at the same time removed 2.6.27/2.6.28.

I'm using git of the current debian squeeze (which ist 1.7.1 or so). I used the built in git feature:
git format-patch
and
git send-email with the formerly generated patch

I have other patches in branch which introduce util-linux-ng. Can you give the output of the git am error?
Does this patch
(http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/24766) cause the same error?

Quoted 5 lines
  Marcus>  scsi.h and scsi_net.h have not changed since April 2010
  Marcus>  so renaming the scsi patches files in toolchain/kernel-headers/
  Marcus>  to match higher versions

Yeah, the fix is finally in mainline for 2.6.36.

;-)

#4 lore raw

PATCH 1/1 bump kernel headers to latest stable, including scsi patch for latests kernel headers

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Marcus" == Marcus Osdoba <[email protected]> writes:

Hi,

Marcus> I'm using git of the current debian squeeze (which ist 1.7.1 or so). I Marcus> used the built in git feature:
Marcus> git format-patch
Marcus> and
Marcus> git send-email with the formerly generated patch

And this was from an uptodate clone of the buildroot tree with no other local changes?

Marcus> I have other patches in branch which introduce util-linux-ng. Can you Marcus> give the output of the git am error?

git am -3 -s /tmp/linux.patch ~/source/buildroot
Applying: bump kernel headers to latest stable, including scsi patch for latests kernel headers Using index info to reconstruct a base tree...
<stdin>:146: trailing whitespace.

<stdin>:157: space before tab in indent.
__be16 service_action;
<stdin>:158: space before tab in indent.
/* service specific data follows */
<stdin>:173: trailing whitespace.

<stdin>:174: trailing whitespace.

error: patch failed: toolchain/kernel-headers/linux-2.6.32.18-scsi-use-__uX-types-for-headers-exported-to-user-space.patch:1
error: toolchain/kernel-headers/linux-2.6.32.18-scsi-use-__uX-types-for-headers-exported-to-user-space.patch: patch does not apply
error: patch failed: toolchain/kernel-headers/linux-2.6.34.3-scsi-use-__uX-types-for-headers-exported-to-user-space.patch:1
error: toolchain/kernel-headers/linux-2.6.34.3-scsi-use-__uX-types-for-headers-exported-to-user-space.patch: patch does not apply Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 bump kernel headers to latest stable, including scsi patch for latests kernel headers When you have resolved this problem run "git am -3 --resolved".
If you would prefer to skip this patch, instead run "git am -3 --skip".
To restore the original branch and stop patching run "git am -3 --abort".

I didn't see any obvious mangling of your patch (E.G. by your mailer), but it doesn't like it.

Marcus> Does this patch
Marcus> (http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/24766) cause Marcus> the same error?

No, that one applies without problem.

Signature · 1 line
Bye, Peter Korsgaard