r1268 - in trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27: config debian
Joshua Kwan
joshk@haydn.debian.org
Mon, 23 Aug 2004 01:57:57 -0600
Author: joshk
Date: 2004-08-23 01:57:54 -0600 (Mon, 23 Aug 2004)
New Revision: 1268
Modified:
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64-smp
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules
Log:
hopefully this should be the last
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32 2004-08-21 22:25:37 UTC (rev 1267)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32 2004-08-23 07:57:54 UTC (rev 1268)
@@ -503,7 +503,7 @@
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
CONFIG_ROMFS_FS=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
# CONFIG_EXT2_FS_XATTR_SHARING is not set
# CONFIG_EXT2_FS_XATTR_USER is not set
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp 2004-08-21 22:25:37 UTC (rev 1267)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc32-smp 2004-08-23 07:57:54 UTC (rev 1268)
@@ -504,7 +504,7 @@
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
CONFIG_ROMFS_FS=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
# CONFIG_EXT2_FS_XATTR_SHARING is not set
# CONFIG_EXT2_FS_XATTR_USER is not set
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64 2004-08-21 22:25:37 UTC (rev 1267)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64 2004-08-23 07:57:54 UTC (rev 1268)
@@ -223,7 +223,7 @@
CONFIG_NET_IPIP=m
# CONFIG_NET_IPGRE is not set
CONFIG_ARPD=y
-CONFIG_INET_ECN=y
+# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
@@ -825,7 +825,7 @@
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
CONFIG_ROMFS_FS=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
# CONFIG_EXT2_FS_XATTR_SHARING is not set
# CONFIG_EXT2_FS_XATTR_USER is not set
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64-smp
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64-smp 2004-08-21 22:25:37 UTC (rev 1267)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/config/sparc64-smp 2004-08-23 07:57:54 UTC (rev 1268)
@@ -224,7 +224,7 @@
CONFIG_NET_IPIP=m
# CONFIG_NET_IPGRE is not set
CONFIG_ARPD=y
-CONFIG_INET_ECN=y
+# CONFIG_INET_ECN is not set
# CONFIG_SYN_COOKIES is not set
CONFIG_INET_AH=m
CONFIG_INET_ESP=m
@@ -826,7 +826,7 @@
# CONFIG_QNX4FS_FS is not set
# CONFIG_QNX4FS_RW is not set
CONFIG_ROMFS_FS=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
CONFIG_EXT2_FS_XATTR=y
# CONFIG_EXT2_FS_XATTR_SHARING is not set
# CONFIG_EXT2_FS_XATTR_USER is not set
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog 2004-08-21 22:25:37 UTC (rev 1267)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/changelog 2004-08-23 07:57:54 UTC (rev 1268)
@@ -20,9 +20,12 @@
- Change Build-Depends on gcc 3.3 to gcc (>= 4:3.3).
- Change to Herbert Xu's kernel build system.
- Add sym53c8xx and ncr53c8xx as modules.
- - Make ext2 built in, so we can continue using these kernels for d-i.
+ - Disable CONFIG_INET_ECN on sparc64, this can be twiddled with a sysctl
+ setting.
+ - Drop the kernel metapackages as we're about to hustle in a unified
+ metapackage source package for all 2.4 kernels in Debian.
- -- Joshua Kwan <joshk@triplehelix.org> Fri, 20 Aug 2004 01:16:56 -0700
+ -- Joshua Kwan <joshk@triplehelix.org> Sat, 21 Aug 2004 19:26:10 -0700
kernel-image-sparc-2.4 (39) unstable; urgency=low
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control 2004-08-21 22:25:37 UTC (rev 1267)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/control 2004-08-23 07:57:54 UTC (rev 1268)
@@ -4,44 +4,8 @@
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Rob Radez <rob@osinvestor.com>, Joshua Kwan <joshk@triplehelix.org>
Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:3.3), kernel-tree-2.4.27-3, debhelper (>= 4), kernel-package
+Build-Depends: gcc (>= 4:3.3), kernel-tree-2.4.27-4, debhelper (>= 4), kernel-package, sparc-utils
-Package: kernel-image-2.4-sparc32
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.27-1-sparc32 (= ${Source-Version})
-Architecture: sparc
-Description: Linux 2.4 kernel binary image for sun4c, sun4m, and sun4d
- This package will always depend on the latest 2.4 kernel for uniprocessor
- 32-bit SPARC machines. Currently the latest version is 2.4.27.
-
-Package: kernel-image-2.4-sparc32-smp
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.27-1-sparc32-smp (= ${Source-Version})
-Architecture: sparc
-Description: Linux 2.4 kernel binary image for SMP sun4c, sun4m, and sun4d
- This package will always depend on the latest 2.4 kernel for multiprocessor
- 32-bit SPARC machines. Currently the latest version is 2.4.27.
-
-Package: kernel-image-2.4-sparc64
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.27-1-sparc64 (= ${Source-Version})
-Architecture: sparc
-Description: Linux 2.4 kernel binary image for UltraSPARC (sparc64) systems
- This package will always depend on the latest 2.4 kernel for uniprocessor
- UltraSPARC machines. Currently the latest version is 2.4.27.
-
-Package: kernel-image-2.4-sparc64-smp
-Section: base
-Priority: optional
-Depends: kernel-image-2.4.27-1-sparc64-smp (= ${Source-Version})
-Architecture: sparc
-Description: Linux 2.4 kernel binary image for SMP UltraSPARC (sparc64) systems
- This package will always depend on the latest 2.4 kernel for multiprocessor
- 64-bit UltraSPARC machines. Currently the latest version is 2.4.27.
-
Package: kernel-build-2.4.27-1
Architecture: sparc
Section: devel
Modified: trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules 2004-08-21 22:25:37 UTC (rev 1267)
+++ trunk/kernel-2.4/sparc/kernel-image-2.4.27-sparc-2.4.27/debian/rules 2004-08-23 07:57:54 UTC (rev 1268)
@@ -24,6 +24,8 @@
appvan := --append_to_version $(debnum)
endif
+STRIP ?= strip
+
flavours := $(shell \
find config -maxdepth 1 -type f ! -name default -printf '%f\n' \
)
@@ -47,8 +49,14 @@
touch $(kdir)/debian/official
install post-install $(kdir)/debian
for i in $(flavours); do \
+ karch=$${i%-smp}; karch=$${karch%32}; \
cp -al $(kdir) build-$$i; \
cp config/$$i build-$$i/.config; \
+ make -C build-$$i ARCH=$$karch oldconfig; \
+ if ! diff -u config/$$i build-$$i/.config; then \
+ echo "oldconfig has changed config/$$i - please fix this problem and try again"; \
+ exit 1; \
+ fi; \
done
cp config/default $(kdir)/.config
ln -s `command -v touch` bin/touch.orig
@@ -61,20 +69,17 @@
for i in $(flavours); do \
cd build-$$i; \
make-kpkg --subarch $${i%-smp} --append_to_version $(debnum)-$$i build; \
- if ! diff -u ../config/$$i .config; then \
- echo "oldconfig changed this config. Please verify and rebuild." >&2; \
- exit 1; \
- fi; \
+ $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux; \
cd ..; \
done
- touch build-stamp
+ touch $@
debnum:
@echo $(debnum)
clean:
- rm -f unpack-stamp build-stamp
+ rm -f *-stamp
rm -rf kernel-source-$(version) build-* install-* bin/touch.orig
dh_clean
@@ -96,7 +101,7 @@
for i in $(flavours); do \
cp -al build-$$i install-$$i; \
cd install-$$i; \
- make-kpkg --subarch $${i%-smp} --append_to_version $(debnum)-$$i --initrd \
+ $${i%-smp} make-kpkg --subarch $${i%-smp} --append_to_version $(debnum)-$$i --initrd \
kernel-image; \
cd ..; \
cat install-$$i/debian/files >> debian/files; \