Author: joshk
Date: 2004-07-16 02:34:08 -0600 (Fri, 16 Jul 2004)
New Revision: 909
Added:
trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control
Removed:
trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control.in
Modified:
trunk/kernel/sparc/kernel-image-sparc-2.6/config/sparc64
trunk/kernel/sparc/kernel-image-sparc-2.6/debian/changelog
trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules
Log:
add headers stuff, eschew control.in (pita)
Modified: trunk/kernel/sparc/kernel-image-sparc-2.6/config/sparc64
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/config/sparc64 2004-07-15 21:43:22 UTC (rev 908)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/config/sparc64 2004-07-16 08:34:08 UTC (rev 909)
@@ -947,7 +947,7 @@
# CONFIG_EXT3_FS_SECURITY is not set
CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=m
+CONFIG_FS_MBCACHE=y
CONFIG_REISERFS_FS=m
# CONFIG_REISERFS_CHECK is not set
# CONFIG_REISERFS_PROC_INFO is not set
Modified: trunk/kernel/sparc/kernel-image-sparc-2.6/debian/changelog
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/debian/changelog 2004-07-15 21:43:22 UTC (rev 908)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/debian/changelog 2004-07-16 08:34:08 UTC (rev 909)
@@ -1,4 +1,4 @@
-kernel-image-sparc-2.6 (2.6.7-1) unstable; urgency=low
+kernel-image-sparc-2.6 (2.6.7-1) UNRELEASED; urgency=low
* Initial Release.
* Not for sparc32, unfortunately.
@@ -8,5 +8,6 @@
- Switch to an initrd scheme, finally.
* Add dependency on module-init-tools.
* Remove build-dependency on gcc-3.3, handled by build-essential already.
+ * Add a partial kernel-headers package in the style of i386. (incomplete)
- -- Joshua Kwan <joshk@triplehelix.org> Thu, 15 Jul 2004 08:57:14 -0700
+ -- Joshua Kwan <joshk@triplehelix.org> Fri, 16 Jul 2004 01:33:13 -0700
Added: trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control 2004-07-15 21:43:22 UTC (rev 908)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control 2004-07-16 08:34:08 UTC (rev 909)
@@ -0,0 +1,137 @@
+Source: kernel-image-sparc-2.6
+Section: devel
+Priority: optional
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Uploaders: Joshua Kwan <joshk@triplehelix.org>, Ben Collins <bcollins@debian.org>
+Standards-Version: 3.6.1.0
+Build-Depends: kernel-source-2.6.7, debhelper (>= 4), kernel-package, dpatch
+
+Package: kernel-image-2.6-sparc64
+Section: base
+Priority: optional
+Depends: kernel-image-2.6.7-sparc64 (= ${Source-Version})
+Architecture: sparc
+Description: Linux 2.6 kernel binary image for UltraSPARC (sparc64) systems
+ This package will always depend on the latest 2.6 kernel for uniprocessor
+ UltraSPARC machines. Currently the latest version is 2.6.7.
+
+Package: kernel-image-2.6-sparc64-smp
+Section: base
+Priority: optional
+Depends: kernel-image-2.6.7-sparc64-smp (= ${Source-Version})
+Architecture: sparc
+Description: Linux 2.6 kernel binary image for SMP UltraSPARC (sparc64) systems
+ This package will always depend on the latest 2.6 kernel for multiprocessor
+ 64-bit UltraSPARC machines. Currently the latest version is 2.6.7.
+
+Package: kernel-headers-2.6-sparc64
+Architecture: sparc
+Section: devel
+Priority: optional
+Depends: kernel-headers-2.6.7-sparc64 (= ${Source-Version})
+Description: Linux 2.6 kernel headers for UltraSPARC
+ This is a dummy package that will always depend on the latest version of
+ the kernel headers for Linux 2.6.x, uniprocessor sparc64 (UltraSPARC)
+ machines. If your machine has more than one processor, please install the
+ kernel-headers-2.6-sparc64-smp package instead.
+ .
+ Currently the latest version is 2.6.7.
+
+Package: kernel-headers-2.6.7-sparc64
+Architecture: sparc
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-1
+Provides: kernel-headers, kernel-headers-2.6
+Description: Linux 2.6.7 kernel headers for UltraSPARC
+ This package provides kernel header files for kernel version 2.6.7 on
+ sparc64 (UltraSPARC) uniprocessor machines. They are used to build modules
+ from external sources without needing a full copy of the kernel source.
+ .
+ If your kernel has more than one processor, you should install the
+ kernel-headers-2.6.7-sparc64-smp package instead.
+ .
+ Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
+ details.
+
+Package: kernel-headers-2.6-sparc64-smp
+Architecture: sparc
+Section: devel
+Priority: optional
+Depends: kernel-headers-2.6.7-sparc64-smp (= ${Source-Version})
+Description: Linux 2.6 kernel headers for UltraSPARC (SMP)
+ This is a dummy package that will always depend on the latest version of
+ the kernel headers for Linux 2.6.x, multiprocessor sparc64 (UltraSPARC)
+ machines. If your machine only has one processor, please install the
+ kernel-headers-2.6-sparc64 package instead.
+ .
+ Currently the latest version is 2.6.7.
+
+Package: kernel-headers-2.6.7-sparc64-smp
+Architecture: sparc
+Section: devel
+Priority: optional
+Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.7-1
+Provides: kernel-headers, kernel-headers-2.6
+Description: Linux 2.6.7 kernel headers for UltraSPARC (SMP)
+ This package provides kernel header files for kernel version 2.6.7 on
+ sparc64 (UltraSPARC) multiprocessor machines. They are used to build modules
+ from external sources without needing a full copy of the kernel source.
+ .
+ If your kernel has only one processor, you should install the
+ kernel-headers-2.6.7-sparc64 package instead.
+ .
+ Please read /usr/share/doc/kernel-headers-2.6.7-1/debian.README.gz for
+ details.
+
+Package: kernel-image-2.6.7-sparc64
+Section: base
+Architecture: sparc
+Priority: optional
+Provides: kernel-image, kernel-image-2.6
+Depends: module-init-tools
+Suggests: silo, fdutils, kernel-doc-2.6.7
+Description: Linux kernel binary image for UltraSPARC (sparc64) systems
+ This package contains the Linux kernel image, the System.map file,
+ and the modules built by the packager. It also contains scripts that
+ try to ensure that the system is not left in a unbootable state
+ after an update.
+ .
+ If you wish to update a bootdisk, or to use a bootloader to make
+ installing and using the image easier, we suggest you install the latest
+ fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
+ powerful bootloader. Of course, both these are optional.
+ .
+ Kernel image packages are generally produced using kernel-package,
+ and it is suggested that you install that package if you wish to
+ create a custom kernel from the sources.
+ .
+ NOTE: This kernel is strictly for UltraSPARC (sparc64) class systems. If you
+ do not have an UltraSPARC, then most likely you want the sparc32 image.
+
+Package: kernel-image-2.6.7-sparc64-smp
+Section: base
+Architecture: sparc
+Priority: optional
+Provides: kernel-image, kernel-image-2.6
+Suggests: silo, fdutils, kernel-doc-2.6.7
+Depends: module-init-tools
+Description: Linux kernel binary image for SMP UltraSPARC (sparc64) systems
+ This package contains the Linux kernel image, the System.map file,
+ and the modules built by the packager. It also contains scripts that
+ try to ensure that the system is not left in a unbootable state
+ after an update.
+ .
+ If you wish to update a bootdisk, or to use a bootloader to make
+ installing and using the image easier, we suggest you install the latest
+ fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
+ powerful bootloader. Of course, both these are optional.
+ .
+ Kernel image packages are generally produced using kernel-package,
+ and it is suggested that you install that package if you wish to
+ create a custom kernel from the sources.
+ .
+ NOTE: This kernel is strictly for UltraSPARC (sparc64) class systems. If you
+ do not have an UltraSPARC, then most likely you want the sparc32 image.
+ Also, this kernel is specifically for SMP (multiple processors) systems. If
+ you do not have more than one CPU, then choose the non-SMP kernel image.
Deleted: trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control.in
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control.in 2004-07-15 21:43:22 UTC (rev 908)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/debian/control.in 2004-07-16 08:34:08 UTC (rev 909)
@@ -1,77 +0,0 @@
-Source: kernel-image-sparc-2.6
-Section: devel
-Priority: optional
-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Joshua Kwan <joshk@triplehelix.org>, Ben Collins <bcollins@debian.org>
-Standards-Version: 3.6.1.0
-Build-Depends: kernel-source-=V, debhelper (>= 4), kernel-package, dpatch
-
-Package: kernel-image-2.6-sparc64
-Section: base
-Priority: optional
-Depends: kernel-image-=V-sparc64 (= ${Source-Version})
-Architecture: sparc
-Description: Linux 2.6 kernel binary image for UltraSPARC (sparc64) systems
- This package will always depend on the latest 2.6 kernel for uniprocessor
- UltraSPARC machines. Currently the latest version is =V.
-
-Package: kernel-image-2.6-sparc64-smp
-Section: base
-Priority: optional
-Depends: kernel-image-=V-sparc64-smp (= ${Source-Version})
-Architecture: sparc
-Description: Linux 2.6 kernel binary image for SMP UltraSPARC (sparc64) systems
- This package will always depend on the latest 2.6 kernel for multiprocessor
- 64-bit UltraSPARC machines. Currently the latest version is =V.
-
-Package: kernel-image-=V-sparc64
-Section: base
-Architecture: sparc
-Priority: optional
-Provides: kernel-image, kernel-image-2.6
-Depends: module-init-tools
-Suggests: silo, fdutils, kernel-doc-=V
-Description: Linux kernel binary image for UltraSPARC (sparc64) systems
- This package contains the Linux kernel image, the System.map file,
- and the modules built by the packager. It also contains scripts that
- try to ensure that the system is not left in a unbootable state
- after an update.
- .
- If you wish to update a bootdisk, or to use a bootloader to make
- installing and using the image easier, we suggest you install the latest
- fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
- powerful bootloader. Of course, both these are optional.
- .
- Kernel image packages are generally produced using kernel-package,
- and it is suggested that you install that package if you wish to
- create a custom kernel from the sources.
- .
- NOTE: This kernel is strictly for UltraSPARC (sparc64) class systems. If you
- do not have an UltraSPARC, then most likely you want the sparc32 image.
-
-Package: kernel-image-=V-sparc64-smp
-Section: base
-Architecture: sparc
-Priority: optional
-Provides: kernel-image, kernel-image-2.6
-Suggests: silo, fdutils, kernel-doc-=V
-Depends: module-init-tools
-Description: Linux kernel binary image for SMP UltraSPARC (sparc64) systems
- This package contains the Linux kernel image, the System.map file,
- and the modules built by the packager. It also contains scripts that
- try to ensure that the system is not left in a unbootable state
- after an update.
- .
- If you wish to update a bootdisk, or to use a bootloader to make
- installing and using the image easier, we suggest you install the latest
- fdutils (for formatting a floppy to be used as boot disk), and LILO, for a
- powerful bootloader. Of course, both these are optional.
- .
- Kernel image packages are generally produced using kernel-package,
- and it is suggested that you install that package if you wish to
- create a custom kernel from the sources.
- .
- NOTE: This kernel is strictly for UltraSPARC (sparc64) class systems. If you
- do not have an UltraSPARC, then most likely you want the sparc32 image.
- Also, this kernel is specifically for SMP (multiple processors) systems. If
- you do not have more than one CPU, then choose the non-SMP kernel image.
Modified: trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules
===================================================================
--- trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules 2004-07-15 21:43:22 UTC (rev 908)
+++ trunk/kernel/sparc/kernel-image-sparc-2.6/debian/rules 2004-07-16 08:34:08 UTC (rev 909)
@@ -29,7 +29,7 @@
endif
ifneq ($(DEB_HOST_ARCH),$(KPKG_ARCH))
-ifneq (,$(filter-out debian/control clean stamps/build-dummy-%-stamp stamps/patch-stamp stamps/unpack-stamp patch unpatch,$(MAKECMDGOALS)))
+ifneq (,$(filter-out clean stamps/build-dummy-%-stamp stamps/patch-stamp stamps/unpack-stamp patch unpatch,$(MAKECMDGOALS)))
$(error Use dpkg-buildpackage -asparc! ($(DEB_HOST_ARCH) != $(KPKG_ARCH)))
endif
endif
@@ -40,8 +40,8 @@
export KPKG_MAINTAINER KPKG_EMAIL KPKG_ARCH CROSS_COMPILE do_clean HEADER_CLEAN_HOOK
-all_subarches := $(foreach subarch,$(shell ls config),stamps/build-$(subarch)-stamp stamps/build-$(subarch)-smp-stamp)
-all_dummies := $(foreach subarch,sparc64,stamps/build-dummy-2.6-$(subarch)-stamp stamps/build-dummy-2.6-$(subarch)-smp-stamp)
+all_subarches := $(foreach subarch, $(shell ls config), stamps/build-$(subarch)-stamp stamps/build-$(subarch)-smp-stamp)
+all_dummies := $(foreach subarch, $(shell ls config), stamps/build-dummy-2.6-$(subarch)-stamp stamps/build-dummy-2.6-$(subarch)-smp-stamp stamps/build-headers-dummy-2.6-$(subarch)-stamp stamps/build-headers-dummy-2.6-$(subarch)-smp-stamp)
stamps/unpack-stamp:
tar --bzip2 -xf /usr/src/$(kdir).tar.bz2
@@ -58,9 +58,18 @@
endif
rm -f stamps/patch-stamp
-debian/control: debian/control.in debian/rules
- sed -e 's/=V/$(VERSION)/g' debian/control.in > debian/control
+stamps/build-headers-dummy-%-stamp:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -pkernel-headers-$*
+ dh_installdeb -pkernel-headers-$*
+ dh_installdocs -pkernel-headers-$*
+ dh_installchangelogs -pkernel-headers-$*
+ dh_compress -pkernel-headers-$*
+ dh_gencontrol -pkernel-headers-$*
+ dh_builddeb -pkernel-headers-$*
+
stamps/build-dummy-%-stamp:
dh_testdir
dh_testroot
@@ -86,16 +95,18 @@
make-kpkg --subarch $* --append-to-version "-$*" build; \
$(CROSS_COMPILE)-strip -R .comment -R .note -K sun4u_init -K _end -K _start vmlinux; \
make-kpkg $(ROOT) --initrd --subarch $* --append-to-version "-$*" kernel-image; \
+ make-kpkg $(ROOT) --subarch $* --append-to-version "-$*" kernel-headers; \
cat debian/files >> ../debian/files; \
);"
mv -f kernel-image-$(VERSION)-$*_$(debver)_sparc.deb ../
+ mv -f kernel-headers-$(VERSION)-$*_$(debver)_sparc.deb ../
touch $@
config/%-smp: config/%
sed -e 's/# CONFIG_SMP is not set/CONFIG_SMP=y/' $< > $@
echo "CONFIG_NR_CPUS=$(SMP_CPU_COUNT)" >> $@
-clean: debian/control
+clean:
rm -rf $(kdir) debian/patched
rm -f *.deb debian/files stamps/* config/*-smp
dh_clean
@@ -106,7 +117,7 @@
# Build architecture-dependent files here.
binary-arch: $(all_dummies) build
-build: debian/control stamps/build-stamp
+build: stamps/build-stamp
stamps/build-stamp: stamps/patch-stamp $(all_subarches)
touch $@