History

deb-pkg: use KCONFIG_CONFIG instead of .config file directly

Anisse Astier committed 13 years ago

Commit d2091761 parent 2174d291 file · +7 −6Browse files

Showing the changes to scripts (1 of 1 file). Show all

Unified · Split

scripts/package/builddeb+7−6
@@ -41,9 +41,9 @@ create_package() { · 40 unmodified lines
41 parisc*)41 parisc*)
42 debarch=hppa ;;42 debarch=hppa ;;
43 mips*)43 mips*)
44 debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;;44 debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el) ;;
45 arm*)45 arm*)
46 debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;;46 debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el) ;;
47 *)47 *)
48 echo "" >&248 echo "" >&2
49 echo "** ** ** WARNING ** ** **" >&249 echo "** ** ** WARNING ** ** **" >&2
@@ -106,12 +106,12 @@ fi · 56 unmodified lines
106if [ "$ARCH" = "um" ] ; then106if [ "$ARCH" = "um" ] ; then
107 $MAKE linux107 $MAKE linux
108 cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"108 cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
109 cp .config "$tmpdir/usr/share/doc/$packagename/config"109 cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
110 gzip "$tmpdir/usr/share/doc/$packagename/config"110 gzip "$tmpdir/usr/share/doc/$packagename/config"
111 cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"111 cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"
112else 112else
113 cp System.map "$tmpdir/boot/System.map-$version"113 cp System.map "$tmpdir/boot/System.map-$version"
114 cp .config "$tmpdir/boot/config-$version"114 cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
115 # Not all arches include the boot path in KBUILD_IMAGE115 # Not all arches include the boot path in KBUILD_IMAGE
116 if [ -e $KBUILD_IMAGE ]; then116 if [ -e $KBUILD_IMAGE ]; then
117 cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"117 cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
@@ -120,7 +120,7 @@ else · 2 unmodified lines
120 fi120 fi
121fi121fi
122 122
123if grep -q '^CONFIG_MODULES=y' .config ; then123if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
124 INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install124 INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
125 rm -f "$tmpdir/lib/modules/$version/build"125 rm -f "$tmpdir/lib/modules/$version/build"
126 rm -f "$tmpdir/lib/modules/$version/source"126 rm -f "$tmpdir/lib/modules/$version/source"
@@ -245,11 +245,12 @@ fi · 118 unmodified lines
245# Build header package245# Build header package
246(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")246(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
247(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")247(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
248(cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")248(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
249destdir=$kernel_headers_dir/usr/src/linux-headers-$version249destdir=$kernel_headers_dir/usr/src/linux-headers-$version
250mkdir -p "$destdir"250mkdir -p "$destdir"
251(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)251(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
252(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)252(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
253(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
253ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"254ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
254rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"255rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
255arch=$(dpkg --print-architecture)256arch=$(dpkg --print-architecture)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t