[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#273878: kernel-headers-2.4.27-1-686: dangling includes in makefile



On Tue, Oct 12, 2004 at 07:05:43PM +0900, Horms wrote:
> On Tue, Sep 28, 2004 at 11:41:31AM -0400, Amelia A Lewis wrote:
> > Package: kernel-headers-2.4.27-1-686
> > Version: 2.4.27-2
> > Severity: normal
> > 
> > In attempting to build modules for vmware, the makefile in the kernel
> > headers directory is consulted.  This is actually linked to the makefile
> > included in kernel-headers-2.4.27-1, with a symlink.
> > 
> > Unfortunately, it's broken.  There are two apparently unconditional includes
> > in the makefile, at line 268 and line 551, for the architecture, and for
> > Rules.make.
> > 
> > Rules.make prolly ought to be included in the -2.4.27-1 package, then
> > symlinked from -2.4.27-1-686.  arch ... perhaps should be included in the
> > -2.4.27-1-686 package directly?
> > 
> > The workaround is to install the corresponding kernel-source package and
> > symlink.
> 
> Hi Ameilia,
> 
> That does indeed seem to be an omission in both the 2.4.26 and 2.4.27
> kernel header packages. I think the best thing is to include
> both of the files you mention in kernel-headers-2.4.2[67]-1 and
> then symlink to it from the flavour-specific packages. I will work on
> making this so for the next release.

Hi,

I have made a patch to the kernel-image-2.4.26 package to add the
missing files that you detail above. However the build scripts for
that package only control the files that are addeeed to 
kernel-headers-2.4.26-1-FLAVOUR. To add the missing files to 
kernel-headers-2.4.26-1 itself a patch to kernel-package is required.

Manoj, can you please consider this for inclusion, I won't add
the change to the kernel-image package unless you are in agreement
with this change.

The patches are below. Packages built with these patches can be found at
http://debian.vergenet.net/testing/bug273878/

-- 
Horms
diff -ru kernel-package-8.103/debian/changelog kernel-package-8.103.0.bug.273878/debian/changelog
--- kernel-package-8.103/debian/changelog	2004-10-09 04:21:37.000000000 +0900
+++ kernel-package-8.103.0.bug.273878/debian/changelog	2004-10-14 12:37:40.000000000 +0900
@@ -1,3 +1,12 @@
+kernel-package (8.103.0.bug.273878) unstable; urgency=low
+
+  * Added missing files Rules.make and arch/$(KERNEL_ARCH)/Makefile
+    to kernel-headers packages that are produced. These files
+    are unconditionally included by the top level Makefile supplied
+    by upstream which is included in this package.
+
+ -- Simon Horman <horms@debian.org>  Thu, 14 Oct 2004 12:23:42 +0900
+
 kernel-package (8.103) unstable; urgency=high
 
   * Bug fix: "make-kpkg: fails to unpatch the source", thanks to martin f
Only in kernel-package-8.103.0.bug.273878/debian: files
Only in kernel-package-8.103.0.bug.273878/debian: tmp
diff -ru kernel-package-8.103/kernel/rules kernel-package-8.103.0.bug.273878/kernel/rules
--- kernel-package-8.103/kernel/rules	2004-10-09 04:20:40.000000000 +0900
+++ kernel-package-8.103.0.bug.273878/kernel/rules	2004-10-14 12:50:00.000000000 +0900
@@ -1846,6 +1846,9 @@
 	         $(HEADER_DOC)/Buildinfo
 	chmod 0644 $(HEADER_DOC)/Buildinfo
 	$(install_file) Makefile       $(HEADER_SRC)
+	$(install_file) Rules.make     $(HEADER_SRC)
+	$(make_directory) $(HEADER_SRC)/arch/$(KERNEL_ARCH)
+	$(install_file) arch/$(KERNEL_ARCH)/Makefile $(HEADER_SRC)/arch/$(KERNEL_ARCH)
 ifneq ($(strip $(int_follow_symlinks_in_src)),)
 	-tar cfh - include |        (cd $(HEADER_SRC); umask 000; tar xsf -)
 	(cd $(HEADER_SRC)/include; rm -rf asm; ln -s asm-$(KERNEL_ARCH) asm)
Only in kernel-package-8.103.0.bug.273878/: stamp-binary
Only in kernel-package-8.103.0.bug.273878/: stamp-binary-arch
Only in kernel-package-8.103.0.bug.273878/: stamp-binary-indep
Only in kernel-package-8.103.0.bug.273878/: stamp-build
Only in kernel-package-8.103.0.bug.273878/: stamp-build-arch
Only in kernel-package-8.103.0.bug.273878/: stamp-build-indep
Only in kernel-package-8.103.0.bug.273878/: stamp-indep-bin
Only in kernel-package-8.103.0.bug.273878/: stamp-indep-build
Only in kernel-package-8.103.0.bug.273878/: stamp-indep-conf
Only in kernel-package-8.103.0.bug.273878/: stamp-indep-inst
Index: debian/control
===================================================================
--- debian/control	(revision 1666)
+++ debian/control	(working copy)
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: William Irwin <wli@debian.org>, Sven Luther <luther@debian.org>, Jens Schmalzing <jensen@debian.org>, Jeff Bailey <jbailey@debian.org>, Dann Frazier <dannf@debian.org>, Simon Horman <horms@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), modutils, kernel-tree-2.4.26-6, kernel-package (>= 8.042)
+Build-Depends: debhelper (>= 2), modutils, kernel-tree-2.4.26-6, kernel-package (>= 8.103.0.bug.273878)
 
 Package: kernel-headers-2.4.26-1
 Architecture: i386
Index: debian/changelog
===================================================================
--- debian/changelog	(revision 1666)
+++ debian/changelog	(working copy)
@@ -1,3 +1,16 @@
+kernel-image-2.4.26-i386 (2.4.26-6.0.bug.273878) unstable; urgency=low
+
+  * Added symlinks to missing files Rules.make and 
+    arch/$(KERNEL_ARCH)/Makefile to kernel-headers packages.
+    These files are unconditionally included by the top level 
+    Makefile supplied by upstream which is included in the kernel-headers
+    packages. This requires a patch to kernel-package which is
+    pending accpetance from the maintainer. I have made a
+    very unoffial version of kernel-package, 8.103.0.bug.273878,
+    which includes my proposed patch.
+
+ -- Simon Horman <horms@debian.org>  Thu, 14 Oct 2004 12:31:29 +0900
+
 kernel-image-2.4.26-i386 (2.4.26-6) unstable; urgency=low
 
   * Added myself (Simon Horman <horms@debian.org>) to the list of uploaders,
Index: post-install
===================================================================
--- post-install	(revision 1666)
+++ post-install	(working copy)
@@ -2,6 +2,8 @@
 
 set -e
 
+ARCH=i386
+
 debhelper_pre() {
 	dh_clean -k --package="$1"
 	dh_installdirs --package="$1"
@@ -49,7 +51,11 @@
 mkdir -p $dir/include/linux
 cp -a .config $dir
 ln -s --target-directory=$dir ../kernel-headers-$prefix/Makefile \
-	../kernel-headers-$prefix/kernel-headers.revision
+	../kernel-headers-$prefix/kernel-headers.revision \
+	../kernel-headers-$prefix/Rules.make
+mkdir -p $dir/arch/$ARCH/
+ln -s --target-directory=$dir/arch/$ARCH/ \
+	../../../kernel-headers-$prefix/arch/$ARCH/Makefile
 cd include
 find . -mindepth 1 -maxdepth 1 \
 	! -name config -a ! -name linux \

Reply to: