-- Ben Hutchings Every program is either trivial or else contains at least one bug
diff -Nru kernel-package-12.036+nmu1/debian/changelog kernel-package-12.036+nmu2/debian/changelog
--- kernel-package-12.036+nmu1/debian/changelog 2010-11-09 23:26:20.000000000 +0000
+++ kernel-package-12.036+nmu2/debian/changelog 2012-03-04 01:36:39.000000000 +0000
@@ -1,3 +1,23 @@
+kernel-package (12.036+nmu2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove minimum-version checks that were incorrect for Linux 3.x and
+ were already satisfied by Linux 2.6.26 (lenny) (Closes: #635563)
+ * Look for lguest tools in both Documentation/virtual/lguest and
+ Documentation/lguest (Closes: #638012)
+ * Do not suggest obsolete ksymoops package (Closes: #637421)
+ * Fix incompatibility with make 3.82 due to indentation with spaces
+ (Closes: #635019), thanks to Jens Lody
+ * Fix native builds on armel and armhf (Closes: #633743):
+ - Test for cross-compilation by comparing build CPU name with host
+ CPU name, not host Debian architecture name
+ - Merge armel.mk into arm.mk
+ - Add default configuration for armhf
+ * Change all example revisions in README to begin with a digit, as
+ now expected by dpkg (Closes: #620515)
+
+ -- Ben Hutchings <b...@decadent.org.uk> Sun, 04 Mar 2012 01:36:38 +0000
+
kernel-package (12.036+nmu1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru kernel-package-12.036+nmu1/kernel/Config/config.armhf kernel-package-12.036+nmu2/kernel/Config/config.armhf
--- kernel-package-12.036+nmu1/kernel/Config/config.armhf 1970-01-01 01:00:00.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/Config/config.armhf 2012-03-04 01:30:09.000000000 +0000
@@ -0,0 +1,20 @@
+CONFIG_PACKET=y
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_SLIP_SMART=y
+CONFIG_SUNRPC_GSS=m
+# CONFIG_NFSD_V4 is not set
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CODA_FS_OLD_API is not set
+CONFIG_CIFS_STATS=y
+CONFIG_CIFS_XATTR=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_ECONET_AUNUDP=y
+CONFIG_RXRPC=m
+# CONFIG_CIFS_POSIX is not set
+CONFIG_ECONET_NATIVE=y
+CONFIG_EQUALIZER=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_PACKET_MMAP=y
+CONFIG_AEABI=y
+CONFIG_VFP=y
diff -Nru kernel-package-12.036+nmu1/kernel/Control kernel-package-12.036+nmu2/kernel/Control
--- kernel-package-12.036+nmu1/kernel/Control 2010-07-18 19:08:34.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/Control 2012-03-03 22:05:44.000000000 +0000
@@ -30,7 +30,7 @@
Provides: =ST-source, =ST-source-=CV
Depends: binutils, bzip2, file
Recommends: libc6-dev | libc-dev, gcc | c-compiler, make (>= 3.80-10), po-debconf, gettext, binutils (>= 2.12), util-linux (>= 2.10o), module-init-tools (>= 0.9.10), debianutils (>= 2.30)
-Suggests: libncurses-dev | ncurses-dev, kernel-package, xmlto, libdb3-dev, libncurses-dev, docbook-utils, e2fsprogs (>= 1.29), linux-initramfs-tool, ksymoops
+Suggests: libncurses-dev | ncurses-dev, kernel-package, xmlto, libdb3-dev, libncurses-dev, docbook-utils, e2fsprogs (>= 1.29), linux-initramfs-tool
Description: Linux kernel source for version =V
This package provides the source code for the Linux kernel, specifically,
version =V.
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/arches/armel.mk kernel-package-12.036+nmu2/kernel/ruleset/arches/armel.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/arches/armel.mk 2009-11-18 15:30:16.000000000 +0000
+++ kernel-package-12.036+nmu2/kernel/ruleset/arches/armel.mk 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-######################### -*- Mode: Makefile-Gmake -*- ########################
-## armel.mk ---
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-##
-## arch-tag:
-##
-###############################################################################
-
-### ARM (new abi)
-ifeq ($(strip $(architecture)),armel)
-
- kimage := vmlinuz
- target = zImage
- NEED_DIRECT_GZIP_IMAGE=NO
- kimagesrc = arch/$(KERNEL_ARCH)/boot/zImage
- kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(KERNELRELEASE)
- DEBCONFIG = $(CONFDIR)/config.armel
- kelfimagesrc = vmlinux
- kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(KERNELRELEASE)
- KERNEL_ARCH = arm
-
-endif
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/arches/arm.mk kernel-package-12.036+nmu2/kernel/ruleset/arches/arm.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/arches/arm.mk 2009-11-18 15:30:37.000000000 +0000
+++ kernel-package-12.036+nmu2/kernel/ruleset/arches/arm.mk 2012-03-04 01:28:58.000000000 +0000
@@ -47,7 +47,7 @@
NEED_DIRECT_GZIP_IMAGE=NO
kimagesrc = arch/$(KERNEL_ARCH)/boot/zImage
kimagedest = $(INT_IMAGE_DESTDIR)/vmlinuz-$(KERNELRELEASE)
- DEBCONFIG = $(CONFDIR)/config.arm
+ DEBCONFIG = $(CONFDIR)/config.$(DEB_HOST_ARCH)
endif
kelfimagesrc = vmlinux
kelfimagedest = $(INT_IMAGE_DESTDIR)/vmlinux-$(KERNELRELEASE)
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/arches/s390.mk kernel-package-12.036+nmu2/kernel/ruleset/arches/s390.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/arches/s390.mk 2009-11-18 15:34:54.000000000 +0000
+++ kernel-package-12.036+nmu2/kernel/ruleset/arches/s390.mk 2012-03-03 21:27:48.000000000 +0000
@@ -30,18 +30,6 @@
##
###############################################################################
-# make it possible to build s390x kernels on s390 for 2.4 kernels only
-# because 2.6 always use s390 as architecture.
-ifeq (4,$(PATCHLEVEL))
- ifeq (,$(findstring $(KPKG_SUBARCH),s390 s390x))
- KPKG_SUBARCH = s390
- endif
- KERNEL_ARCH = $(KPKG_SUBARCH)
- ifneq ($(shell uname -m),$(KPKG_SUBARCH))
- UNAME_MACHINE = $(KPKG_SUBARCH)
- export UNAME_MACHINE
- endif
-endif
kimage := vmlinuz
target = image
NEED_DIRECT_GZIP_IMAGE=NO
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/architecture.mk kernel-package-12.036+nmu2/kernel/ruleset/architecture.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/architecture.mk 2009-04-01 21:25:42.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/architecture.mk 2012-03-04 01:22:23.000000000 +0000
@@ -59,9 +59,6 @@
ifeq ($(strip $(architecture)),armeb)
include $(DEBDIR)/ruleset/arches/armeb.mk
endif
-ifeq ($(strip $(architecture)),armel)
-include $(DEBDIR)/ruleset/arches/armel.mk
-endif
##### PowerPC and PowerPC architecture
ifneq ($(strip $(filter ppc powerpc ppc64 powerpc64,$(architecture))),)
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/common/archvars.mk kernel-package-12.036+nmu2/kernel/ruleset/common/archvars.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/common/archvars.mk 2009-08-19 17:42:05.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/common/archvars.mk 2012-03-04 01:51:38.000000000 +0000
@@ -60,6 +60,8 @@
# set the dpkg-architecture vars
export DEB_BUILD_ARCH := $(shell $(DPKG_ARCH) -qDEB_BUILD_ARCH)
+export DEB_BUILD_ARCH_CPU := $(shell $(DPKG_ARCH) -qDEB_BUILD_ARCH_CPU \
+ 2>/dev/null|| true)
export DEB_BUILD_GNU_CPU := $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_CPU)
export DEB_BUILD_GNU_SYSTEM:= $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_SYSTEM)
export DEB_BUILD_GNU_TYPE := $(shell $(DPKG_ARCH) -qDEB_BUILD_GNU_TYPE)
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/kernel_version.mk kernel-package-12.036+nmu2/kernel/ruleset/kernel_version.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/kernel_version.mk 2008-05-02 06:06:28.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/kernel_version.mk 2012-03-03 22:44:29.000000000 +0000
@@ -70,24 +70,24 @@
debian_conf_var:
- @echo "ARCH = $(ARCH)"
- @echo "HOSTCC = $(HOSTCC)"
- @echo "HOSTCFLAGS = $(HOSTCFLAGS)"
- @echo "CROSS_COMPILE = $(CROSS_COMPILE)"
- @echo "AS = $(AS)"
- @echo "LD = $(LD)"
- @echo "CC = $(CC)"
- @echo "CPP = $(CPP)"
- @echo "AR = $(AR)"
- @echo "NM = $(NM)"
- @echo "STRIP = $(STRIP)"
- @echo "OBJCOPY = $(OBJCOPY)"
- @echo "OBJDUMP = $(OBJDUMP)"
- @echo "MAKE = $(MAKE)"
- @echo "GENKSYMS = $(GENKSYMS)"
- @echo "CFLAGS = $(CFLAGS)"
- @echo "AFLAGS = $(AFLAGS)"
- @echo "MODFLAGS = $(MODFLAGS)"
+ @echo "ARCH = $(ARCH)"
+ @echo "HOSTCC = $(HOSTCC)"
+ @echo "HOSTCFLAGS = $(HOSTCFLAGS)"
+ @echo "CROSS_COMPILE = $(CROSS_COMPILE)"
+ @echo "AS = $(AS)"
+ @echo "LD = $(LD)"
+ @echo "CC = $(CC)"
+ @echo "CPP = $(CPP)"
+ @echo "AR = $(AR)"
+ @echo "NM = $(NM)"
+ @echo "STRIP = $(STRIP)"
+ @echo "OBJCOPY = $(OBJCOPY)"
+ @echo "OBJDUMP = $(OBJDUMP)"
+ @echo "MAKE = $(MAKE)"
+ @echo "GENKSYMS = $(GENKSYMS)"
+ @echo "CFLAGS = $(CFLAGS)"
+ @echo "AFLAGS = $(AFLAGS)"
+ @echo "MODFLAGS = $(MODFLAGS)"
# arch-tag: ecfa9843-6306-470e-8ab9-2dfca1d40613
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/misc/defaults.mk kernel-package-12.036+nmu2/kernel/ruleset/misc/defaults.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/misc/defaults.mk 2009-06-29 09:29:20.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/misc/defaults.mk 2012-03-04 03:19:13.000000000 +0000
@@ -124,7 +124,7 @@
ifndef CROSS_COMPILE
ifeq ($(strip $(MAKING_VIRTUAL_IMAGE)),)
- ifneq ($(strip $(architecture)),$(strip $(DEB_BUILD_ARCH)))
+ ifneq ($(strip $(architecture)),$(strip $(word 1,$(DEB_BUILD_ARCH_CPU) $(DEB_BUILD_GNU_CPU))))
#KERNEL_CROSS:=$(architecture)-$(strip $(DEB_HOST_ARCH_OS))-
KERNEL_CROSS:=$(DEB_HOST_GNU_TYPE)-
ifeq ($(architecture), amd64)
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/misc/kernel_arch.mk kernel-package-12.036+nmu2/kernel/ruleset/misc/kernel_arch.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/misc/kernel_arch.mk 2009-04-26 05:49:35.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/misc/kernel_arch.mk 2012-03-04 01:39:27.000000000 +0000
@@ -52,9 +52,6 @@
KERNEL_ARCH = mips64
endif
-ifeq ($(strip $(architecture)),armel)
- KERNEL_ARCH := arm
-endif
ifeq ($(strip $(architecture)),armeb)
KERNEL_ARCH := arm
endif
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/targets/common.mk kernel-package-12.036+nmu2/kernel/ruleset/targets/common.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/targets/common.mk 2010-07-19 07:24:40.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/targets/common.mk 2012-03-04 00:03:25.000000000 +0000
@@ -64,6 +64,8 @@
echo "YES"; \
fi)
+LGUEST_SUBDIR = $(word 1,$(wildcard Documentation/lguest Documentation/virtual/lguest))
+
define save_upstream_debianization
@echo save_upstream_debianization
test ! -e scripts/package/builddeb || mv -f scripts/package/builddeb scripts/package/builddeb.kpkg-dist
@@ -323,8 +325,11 @@
endif
endif
ifneq ($(strip $(shell grep -E ^[^\#]*CONFIG_LGUEST $(CONFIG_FILE))),)
+ ifeq ($(LGUEST_SUBDIR),)
+ $(error Cannot find lguest tools)
+ endif
$(MAKE) $(do_parallel) $(EXTRAV_ARG) $(FLAV_ARG) ARCH=$(KERNEL_ARCH) \
- $(CROSS_ARG) -C Documentation/lguest
+ $(CROSS_ARG) -C $(LGUEST_SUBDIR)
endif
else
ifeq ($(DEB_HOST_ARCH_OS), kfreebsd)
@@ -358,9 +363,10 @@
ifeq ($(strip $(DEB_HOST_ARCH_OS)), linux)
$(save_upstream_debianization)
test ! -f .config || cp -pf .config ,,precious
- test ! -d Documentation/lguest || \
- $(MAKE) $(FLAV_ARG) $(EXTRAV_ARG) $(CROSS_ARG) \
- ARCH=$(KERNEL_ARCH) -C Documentation/lguest clean
+ ifneq ($(LGUEST_SUBDIR),)
+ $(MAKE) $(FLAV_ARG) $(EXTRAV_ARG) $(CROSS_ARG) \
+ ARCH=$(KERNEL_ARCH) -C $(LGUEST_SUBDIR) clean
+ endif
test ! -f Makefile || \
$(MAKE) $(FLAV_ARG) $(EXTRAV_ARG) $(CROSS_ARG) \
ARCH=$(KERNEL_ARCH) distclean
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/targets/doc.mk kernel-package-12.036+nmu2/kernel/ruleset/targets/doc.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/targets/doc.mk 2009-08-21 14:47:53.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/targets/doc.mk 2012-03-03 23:56:52.000000000 +0000
@@ -58,7 +58,9 @@
$(MAKE) mandocs htmldocs
endif
-tar cf - Documentation | (cd $(DOCDIR); umask 000; tar xsf -)
- rm -f $(DOCDIR)/Documentation/lguest/lguest $(DOCDIR)/Documentation/lguest/lguest.lds
+ifneq ($(LGUEST_SUBDIR),)
+ rm -f $(DOCDIR)/$(LGUEST_SUBDIR)/lguest $(DOCDIR)/$(LGUEST_SUBDIR)/lguest.lds
+endif
test ! -d $(DOCDIR)/Documentation/DocBook || \
rm -f $(DOCDIR)/Documentation/DocBook/Makefile \
$(DOCDIR)/Documentation/DocBook/*.sgml \
@@ -75,15 +77,12 @@
######################################################################
####
######################################################################
-ifneq ($(shell if [ $(VERSION) -ge 2 ] && [ $(PATCHLEVEL) -ge 5 ]; then \
- echo new;fi),)
find -name Kconfig -print0 | xargs -0r cat | \
(umask 000 ; cat > $(DOCDIR)/Kconfig.collected)
# removing if empty should be faster than running find twice
if ! test -s $(DOCDIR)/Kconfig.collected ; then \
rm -f $(DOCDIR)/Kconfig.collected ; \
fi
-endif
ifneq ($(strip $(doc_clean_hook)),)
(cd $(DOCDIR); \
test -x $(doc_clean_hook) && $(doc_clean_hook))
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/targets/headers.mk kernel-package-12.036+nmu2/kernel/ruleset/targets/headers.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/targets/headers.mk 2009-09-11 15:24:42.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/targets/headers.mk 2012-03-03 21:31:18.000000000 +0000
@@ -31,9 +31,7 @@
###############################################################################
LINK_ARCH=$(KERNEL_ARCH)
-ifeq ($(shell if [ $(PATCHLEVEL) -eq 6 ] && [ $(SUBLEVEL) -gt 23 ] ; then \
- if [ $(KERNEL_ARCH) = "i386" ] || [ $(KERNEL_ARCH) = "x86_64" ] ; then \
- echo "yes" ; fi ; fi ),yes)
+ifneq ($(filter i386 x86_64,$(KERNEL_ARCH)),)
LINK_ARCH=x86
endif
INSTALL_HDR_PATH=$(SRCDIR)
diff -Nru kernel-package-12.036+nmu1/kernel/ruleset/targets/image.mk kernel-package-12.036+nmu2/kernel/ruleset/targets/image.mk
--- kernel-package-12.036+nmu1/kernel/ruleset/targets/image.mk 2010-07-18 17:18:06.000000000 +0100
+++ kernel-package-12.036+nmu2/kernel/ruleset/targets/image.mk 2012-03-04 00:17:51.000000000 +0000
@@ -117,8 +117,8 @@
mv System.precious System.map
endif
ifneq ($(strip ($CONFIG_LGUEST)),)
- test ! -f Documentation/lguest/lguest || \
- $(install_file) Documentation/lguest/lguest $(TMPTOP)/lib/modules/$(KERNELRELEASE)/lguest
+ test ! -f $(LGUEST_SUBDIR)/lguest || \
+ $(install_file) $(LGUEST_SUBDIR)/lguest $(TMPTOP)/lib/modules/$(KERNELRELEASE)/lguest
test ! -f $(TMPTOP)/lib/modules/$(KERNELRELEASE)/lguest || \
chmod 755 $(TMPTOP)/lib/modules/$(KERNELRELEASE)/lguest
endif
@@ -335,9 +335,10 @@
ifeq ($(strip $(do_clean)),YES)
# just to be sure we are not nuking ./debian
$(MAKE) $(EXTRAV_ARG) $(FLAV_ARG) $(CROSS_ARG) ARCH=$(KERNEL_ARCH) clean
- test ! -d Documentation/lguest || \
- $(MAKE) $(EXTRAV_ARG) $(FLAV_ARG) $(CROSS_ARG) ARCH=$(KERNEL_ARCH) \
- -C Documentation/lguest clean
+ ifneq ($(LGUEST_SUBDIR),)
+ $(MAKE) $(EXTRAV_ARG) $(FLAV_ARG) $(CROSS_ARG) ARCH=$(KERNEL_ARCH) \
+ -C $(LGUEST_SUBDIR) clean
+ endif
rm -f stamp-$(package)
endif
@echo done > $@
diff -Nru kernel-package-12.036+nmu1/README kernel-package-12.036+nmu2/README
--- kernel-package-12.036+nmu1/README 2009-11-12 06:01:09.000000000 +0000
+++ kernel-package-12.036+nmu2/README 2012-03-03 23:00:06.000000000 +0000
@@ -62,13 +62,13 @@
Or just rm -rf ./debian, if you do not want to get rid of the
previous state and only rebuild whatever required for any
changes.
- 4% $Get_Root make-kpkg --revision=custom.1.0 kernel_image
+ 4% $Get_Root make-kpkg --revision=1.0.custom kernel_image
(Get_Root is whatever you need to become root -- fakeroot or
sudo are examples that come to mind). NOTE: if you have
instructed your boot loader to expect initrd kernels (which is
the norm for recent kernel image packages) you need to
add --initrd to the line above.
- % $Get_Root make-kpkg --initrd --revision=custom.1.0 kernel_image
+ % $Get_Root make-kpkg --initrd --revision=1.0.custom kernel_image
Personally, I prefer non initrd images for my personal machines,
since then adding third party modules to the machine has fewer
gotchas. Note that you will have to arrange for the actual
@@ -235,13 +235,13 @@
I've found that using a two-level scheme where the major level starts
with a letter nicely does the job -- unless epochs are used,
-(--revision custom.Y, so the image package become
-kernel-image-X.X.XX-custom.Y.deb), and dselect and dpkg -BOGiE will
+(--revision Y.custom, so the image package become
+kernel-image-X.X.XX-Y.custom.deb), and dselect and dpkg -BOGiE will
refuse to downgrade to a generic kernel (don't give the BOG arguments
to dpkg if you actually do want to downgrade later).
The reason for telling kernel-package that the package has a version
-"custom-x.y.whatever.you-want.to+add.more-just.do.not+use.an=underscore"
+"x.y.whatever.you-want.to+add.more-just.do.not+use.an=underscore"
is that to dpkg that is always a higher version number than any version
number starting with a numeral ( e.g. "a" > "2" like "b" > "a". ) This way,
dselect will not try to upgrade your "roll-it-yourself" kernel-image when
@@ -251,8 +251,8 @@
Unfortunately, this fails if the upstream maintainer uses epochs to
correct a version misnumbering ;-(. The good news is that you can add
your own epoch to your customized image, ugly though that may
-be. (--revision 1:custom.Y; the kernel image file shall remain
-kernel-image-X.X.XX-custom.Y.deb, but dpkg shall know that it should
+be. (--revision 1:Y.custom; the kernel image file shall remain
+kernel-image-X.X.XX-Y.custom.deb, but dpkg shall know that it should
not replace that with a standard kernel with an epoch. Hopefully, we
shall never see an epoch greater than 1 on a standard kernel, but who
knows. Choose your epoch, if you must use it, wisely. I fear, though,
@@ -264,7 +264,7 @@
make-kpkg clean
(or just rm -rf ./debian, if you do not want to rebuild from the
beginning)
- $Get_Root make-kpkg --revision=3:custom.1.0 kernel_image
+ $Get_Root make-kpkg --revision=3:1.0.custom kernel_image
(Get_Root is whatever you need to become root -- fakeroot or
sudo are examples that come to mind).
@@ -273,7 +273,7 @@
kernel enabled, you'll type:
make-kpkg clean
(or just rm -rf ./debian)
- $Get_Root make-kpkg --revision=3:custom.2.0 kernel_image
+ $Get_Root make-kpkg --revision=3:2.0.custom kernel_image
(Get_Root is whatever you need to become root -- fakeroot or
sudo are examples that come to mind).
(remember to do rm -rf ./debian or a make-kpkg clean before you
@@ -304,7 +304,7 @@
make-kpkg clean
(or just rm -rf ./debian, if you do not want to rebuild from the
beginning)
- $Get_Root make-kpkg --initrd --revision=3:custom.2.0 kernel_image
+ $Get_Root make-kpkg --initrd --revision=3:2.0.custom kernel_image
With the new kernel-package conventions, you also need the example
scripts in /etc/kernel/postinst.d/ and /etc/kernel/postrm.d, to create
@@ -368,9 +368,9 @@
When make-kpkg is finished, you'll have
-kernel-image-2.0.29_custom.1.0_i386.deb and all it takes now is to
+kernel-image-2.0.29_1.0.custom_i386.deb and all it takes now is to
install the package (as root):
-# dpkg -i kernel-image-2.0.29_custom.1.0_i386.deb
+# dpkg -i kernel-image-2.0.29_1.0.custom_i386.deb
This will install the kernel, the modules, the map file and do some other
administrativia and finally it will ask you if you want to make a
@@ -388,7 +388,7 @@
old modules directory before installation, like so (need to be root):
# mv /lib/modules/2.0.29 /lib/modules/2.0.29.save
- # dpkg -i kernel-image-2.0.29_custom.1.0_i386.deb
+ # dpkg -i kernel-image-2.0.29_1.0.custom_i386.deb
and later get rid of the .save directory.
People who want to have multiple flavors of the same kernel version
@@ -550,10 +550,10 @@
To generate a new kernel image, just run
% make-kpkg clean
(or just rm -rf ./debian)
-% $Get_Root make-kpkg --revision=custom.1.0 kernel_image
+% $Get_Root make-kpkg --revision=1.0.custom kernel_image
(Get_Root is whatever you need to become root -- fakeroot or
sudo are examples that come to mind) or (if you use initrd)
- $Get_Root make-kpkg --initrd --revision=3:custom.2.0 kernel_image
+ $Get_Root make-kpkg --initrd --revision=3:2.0.custom kernel_image
This will create a default kernel image (as in the image package or
available on the boot disks. The kernel image package produced, on
@@ -577,10 +577,10 @@
With a custom .config file in place (created as above) run again:
% make-kpkg clean
(or just rm -rf ./debian)
-% $Get_Root make-kpkg --revision=custom.1.0 kernel_image
+% $Get_Root make-kpkg --revision=1.0.custom kernel_image
(Get_Root is whatever you need to become root -- fakeroot or
sudo are examples that come to mind).
- $Get_Root make-kpkg --initrd --revision=3:custom.2.0 kernel_image
+ $Get_Root make-kpkg --initrd --revision=3:2.0.custom kernel_image
|-----------------------------------------------------------------------|
| Special needs |
@@ -588,8 +588,8 @@
| whatever reasons that maybe -- I think that the separate step as |
| non-fake-root is not required, but that is a personal opinion) |
| % test ! -d debian || rm -rf debian |
-| % make-kpkg --revision=custom.1.0 build |
-| % $Get_Root make-kpkg --revision=custom.1.0 kernel_image |
+| % make-kpkg --revision=1.0.custom build |
+| % $Get_Root make-kpkg --revision=1.0.custom kernel_image |
| (Get_Root is whatever you need to become root -- fakeroot or |
| sudo are examples that come to mind) |
| |
@@ -605,24 +605,24 @@
| If you use initrd images (and have told your boot loader so) you need |
| to include the --initrd option on the command line, like so |
| |
-| % $Get_Root make-kpkg --initrd --revision=3:custom.2.0 kernel_image |
+| % $Get_Root make-kpkg --initrd --revision=3:2.0.custom kernel_image |
| |
-------------------------------------------------------------------------
To create a source or header package, run
% make-kpkg clean
(or rm -rf ./debian)
-% $Get_Root make-kpkg --revision=custom.1.0 kernel_source
-% $Get_Root make-kpkg --revision=custom.1.0 kernel_headers
+% $Get_Root make-kpkg --revision=1.0.custom kernel_source
+% $Get_Root make-kpkg --revision=1.0.custom kernel_headers
Note: You only need one of these.
(Get_Root is whatever you need to become root -- fakeroot or
sudo are examples that come to mind).
Similarly, the documentation package is built by:
-% $Get_Root make-kpkg --revision=custom.1.0 kernel_doc
+% $Get_Root make-kpkg --revision=1.0.custom kernel_doc
Or if you want to generate the whole package,
-% $Get_Root make-kpkg --revision=custom.1.0 \
+% $Get_Root make-kpkg --revision=1.0.custom \
--pgpsign="Your pgp ID" buildpackage
Note that this needs a pgp key.
(Get_Root is whatever you need to become root -- fakeroot or
@@ -965,7 +965,7 @@
make-kpkg clean
(or just rm -rf ./debian)
make-kpkg -rootcmd fakeroot --append-to-version -custom.${VER} \
- --revision custom.${VER} kernel_image modules-image
+ --revision ${VER}.custom kernel_image modules-image
This one also builds any stand-alone modules packages you may have
installed on your machine.
signature.asc
Description: This is a digitally signed message part
