3.2

[Thorsten Glaser <tg@mirbsd.de>]

root@ara2:~ # cat /proc/version
Linux version 3.2.0-1+m68k.1-atari (Debian 3.2.1-1+m68k.1) (tg@mirbsd.de) (gcc version 4.6.2 (Debian 4.6.2-11) ) #1 Mon Jan 23 06:44:50 UTC 2012

The Debian package has not finished building yet (it’s currently
at the third (bvme*) of the six flavours), but since the Atari
image is done, no kernel modules are needed for regular operation,
and my vacation fell into the water of my friend’s car dieing on
a mountain road, I thought I could test-boot it.

@Ben: debdiff attached; I used minimal changes:
- CFLAGS_KERNEL: pass them to kbuild the right way
- debian/changelog: use parts of them as you see fit
- debian/patches/series/base: this would of course
  be part of debian/patches/series/2 instead if you
  choose to add this to the next upload
- debian/config/defines: similarily
- debian/config/m68k/defines: please add these two
  + compiler: gcc-4.6 (so we’re en par with the other arches)
  + cflags: -ffreestanding (to fix #648996)
- debian/patches/bugfix/m68k/aufs-compile.patch: adding
  this, even though it won’t make it into the mainline
  kernel since Geert thinks static inline functions are
  the way to go, as the least-intrusive way to get kernels
  building for m68k until the aufs people have decided on
  a proper fix; please keep this as debian-local diff until
  such time (and we should prod them from time to time, I
  guess)

Could these patches please be part of the next upload (which
I’m guessing to come soon due to that procfs thing)? Other
than the CFLAGS_KERNEL thing they don’t affect any other
architecture (and cflags are only set by hppa which currently
seems to be stuck in the lenny age anyway) I think.

See you at FOSDEM I suppose,
//mirabilos
-- 
I believe no one can invent an algorithm. One just happens to hit upon it
when God enlightens him. Or only God invents algorithms, we merely copy them.
If you don't believe in God, just consider God as Nature if you won't deny
existence.		-- Coywolf Qi Hunt

--- linux-2.6-3.2.1/debian/rules.real
+++ linux-2.6-3.2.1/debian/rules.real
@@ -114,7 +114,8 @@
 	echo 'endif' >> '$(DIR)/.kernelvariables'
 endif
 ifdef CFLAGS_KERNEL
-	echo 'CFLAGS += $(CFLAGS_KERNEL)'  >> '$(DIR)/.kernelvariables'
+	echo 'CFLAGS_KERNEL += $(CFLAGS_KERNEL)' >> '$(DIR)/.kernelvariables'
+	echo 'CFLAGS_MODULE += $(CFLAGS_KERNEL)' >> '$(DIR)/.kernelvariables'
 endif
 	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' V=1 listnewconfig
 	+yes "" | $(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' oldconfig >/dev/null
--- linux-2.6-3.2.1/debian/changelog
+++ linux-2.6-3.2.1/debian/changelog
@@ -1,3 +1,14 @@
+linux-2.6 (3.2.1-1+m68k.1) unreleased; urgency=low
+
+  * [m68k] Use gcc-4.6 like (almost) all other architectures
+  * Pass the cflags define as CFLAGS_KERNEL and CFLAGS_MODULE to kbuild
+  * [m68k] Use cflags -ffreestanding (Closes: #648996)
+  * Add minimal-intrusive patch to get aufs to compile, until They
+    have agreed on a correct fix
+  * Switch ABI to 1+m68k.1
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Sat, 21 Jan 2012 21:48:01 +0000
+
 linux-2.6 (3.2.1-1) unstable; urgency=low
 
   * New upstream release: http://kernelnewbies.org/Linux_3.2
--- linux-2.6-3.2.1/debian/patches/series/base
+++ linux-2.6-3.2.1/debian/patches/series/base
@@ -16,6 +16,8 @@
 + features/all/aufs3/mark-as-staging.patch
 # fix added exports from security/device_cgroup.c
 + features/all/aufs3/aufs3-fix-export-__devcgroup_inode_permission.patch
+# minimal-intrusive, until they agree on a fix
++ bugfix/m68k/aufs-compile.patch
 
 + bugfix/ia64/hardcode-arch-script-output.patch
 + bugfix/mips/disable-advansys.patch
--- linux-2.6-3.2.1/debian/config/defines
+++ linux-2.6-3.2.1/debian/config/defines
@@ -1,5 +1,5 @@
 [abi]
-abiname: 1
+abiname: 1+m68k.1
 
 [base]
 arches:
--- linux-2.6-3.2.1/debian/config/m68k/defines
+++ linux-2.6-3.2.1/debian/config/m68k/defines
@@ -1,5 +1,6 @@
 [base]
-compiler: gcc-4.4
+compiler: gcc-4.6
+cflags: -ffreestanding
 flavours:
  amiga
  atari
--- linux-2.6-3.2.1.orig/debian/patches/bugfix/m68k/aufs-compile.patch
+++ linux-2.6-3.2.1/debian/patches/bugfix/m68k/aufs-compile.patch
@@ -0,0 +1,17 @@
+Minimal-intrusive patch around the aufs compilation issue.
+
+--- linux-2.6-3.2.1/arch/m68k/include/asm/hardirq.h	2012-01-12 19:42:45.000000000 +0000
++++ linux-2.6-3.2.1/arch/m68k/include/asm/hardirq.h	2012-01-21 21:42:52.000000000 +0000
+@@ -18,10 +18,8 @@
+ 
+ #ifdef CONFIG_MMU
+ 
+-static inline void ack_bad_irq(unsigned int irq)
+-{
+-	pr_crit("unexpected IRQ trap at vector %02x\n", irq);
+-}
++#define ack_bad_irq(irq) pr_crit("unexpected IRQ trap at vector %02x\n", \
++    ((unsigned int)(irq)))
+ 
+ /* entry.S is sensitive to the offsets of these fields */
+ typedef struct {