| 1 |
Index: linux-source-3.2/scripts/package/builddeb |
| 2 |
=================================================================== |
| 3 |
--- linux-source-3.2.orig/scripts/package/builddeb 2012-03-12 20:22:49.000000000 +0000 |
| 4 |
+++ linux-source-3.2/scripts/package/builddeb 2012-03-14 12:43:06.255964626 +0000 |
| 5 |
@@ -101,32 +101,6 @@ |
| 6 |
mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" |
| 7 |
fi |
| 8 |
|
| 9 |
-# Build and install the kernel |
| 10 |
-if [ "$ARCH" = "um" ] ; then |
| 11 |
- $MAKE linux |
| 12 |
- cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" |
| 13 |
- cp .config "$tmpdir/usr/share/doc/$packagename/config" |
| 14 |
- gzip "$tmpdir/usr/share/doc/$packagename/config" |
| 15 |
- cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version" |
| 16 |
-else |
| 17 |
- cp System.map "$tmpdir/boot/System.map-$version" |
| 18 |
- cp .config "$tmpdir/boot/config-$version" |
| 19 |
- # Not all arches include the boot path in KBUILD_IMAGE |
| 20 |
- if [ -e $KBUILD_IMAGE ]; then |
| 21 |
- cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" |
| 22 |
- else |
| 23 |
- cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" |
| 24 |
- fi |
| 25 |
-fi |
| 26 |
- |
| 27 |
-if grep -q '^CONFIG_MODULES=y' .config ; then |
| 28 |
- INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install |
| 29 |
- if [ "$ARCH" = "um" ] ; then |
| 30 |
- mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" |
| 31 |
- rmdir "$tmpdir/lib/modules/$version" |
| 32 |
- fi |
| 33 |
-fi |
| 34 |
- |
| 35 |
make headers_check |
| 36 |
make headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr" |
| 37 |
|
| 38 |
@@ -237,45 +211,6 @@ |
| 39 |
|
| 40 |
fi |
| 41 |
|
| 42 |
-# Build header package |
| 43 |
-(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles") |
| 44 |
-(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles") |
| 45 |
-(cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") |
| 46 |
-destdir=$kernel_headers_dir/usr/src/linux-headers-$version |
| 47 |
-mkdir -p "$destdir" |
| 48 |
-(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -) |
| 49 |
-(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) |
| 50 |
-rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" |
| 51 |
-arch=$(dpkg --print-architecture) |
| 52 |
- |
| 53 |
-cat <<EOF >> debian/control |
| 54 |
- |
| 55 |
-Package: $kernel_headers_packagename |
| 56 |
-Provides: linux-headers, linux-headers-2.6 |
| 57 |
-Architecture: $arch |
| 58 |
-Description: Linux kernel headers for $KERNELRELEASE on $arch |
| 59 |
- This package provides kernel header files for $KERNELRELEASE on $arch |
| 60 |
- . |
| 61 |
- This is useful for people who need to build external modules |
| 62 |
-EOF |
| 63 |
- |
| 64 |
-create_package "$kernel_headers_packagename" "$kernel_headers_dir" |
| 65 |
- |
| 66 |
-# Do we have firmware? Move it out of the way and build it into a package. |
| 67 |
-if [ -e "$tmpdir/lib/firmware" ]; then |
| 68 |
- mv "$tmpdir/lib/firmware" "$fwdir/lib/" |
| 69 |
- |
| 70 |
- cat <<EOF >> debian/control |
| 71 |
- |
| 72 |
-Package: $fwpackagename |
| 73 |
-Architecture: all |
| 74 |
-Description: Linux kernel firmware, version $version |
| 75 |
- This package contains firmware from the Linux kernel, version $version. |
| 76 |
-EOF |
| 77 |
- |
| 78 |
- create_package "$fwpackagename" "$fwdir" |
| 79 |
-fi |
| 80 |
- |
| 81 |
cat <<EOF >> debian/control |
| 82 |
|
| 83 |
Package: $libc_headers_packagename |
| 84 |
@@ -288,6 +223,5 @@ |
| 85 |
EOF |
| 86 |
|
| 87 |
create_package "$libc_headers_packagename" "$libc_headers_dir" |
| 88 |
-create_package "$packagename" "$tmpdir" |
| 89 |
|
| 90 |
exit 0 |
| 91 |
Index: linux-source-3.2/scripts/package/Makefile |
| 92 |
=================================================================== |
| 93 |
--- linux-source-3.2.orig/scripts/package/Makefile 2012-03-12 20:22:49.000000000 +0000 |
| 94 |
+++ linux-source-3.2/scripts/package/Makefile 2012-03-14 12:42:35.007964039 +0000 |
| 95 |
@@ -96,7 +96,6 @@ |
| 96 |
$(srctree)/scripts/package/builddeb |
| 97 |
|
| 98 |
deb-pkg: FORCE |
| 99 |
- $(MAKE) KBUILD_SRC= |
| 100 |
$(call cmd,builddeb) |
| 101 |
|
| 102 |
clean-dirs += $(objtree)/debian/ |