mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
118 lines
4.6 KiB
Diff
118 lines
4.6 KiB
Diff
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
|
|
index 2f080987..0d7dbd42 100644
|
|
--- a/scripts/package/builddeb
|
|
+++ b/scripts/package/builddeb
|
|
@@ -35,9 +35,9 @@ create_package() {
|
|
sparc*)
|
|
debarch=sparc ;;
|
|
s390*)
|
|
- debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
|
|
+ debarch=s390 ;;
|
|
ppc*)
|
|
- debarch=$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo ppc64el || echo powerpc) ;;
|
|
+ debarch=powerpc ;;
|
|
parisc*)
|
|
debarch=hppa ;;
|
|
mips*)
|
|
@@ -45,16 +45,7 @@ create_package() {
|
|
arm64)
|
|
debarch=arm64 ;;
|
|
arm*)
|
|
- if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
|
|
- if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
|
|
- debarch=armhf
|
|
- else
|
|
- debarch=armel
|
|
- fi
|
|
- else
|
|
- debarch=arm
|
|
- fi
|
|
- ;;
|
|
+ debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
|
|
*)
|
|
echo "" >&2
|
|
echo "** ** ** WARNING ** ** **" >&2
|
|
@@ -148,12 +139,8 @@ fi
|
|
# Not all arches include the boot path in KBUILD_IMAGE
|
|
if [ -e $KBUILD_IMAGE ]; then
|
|
cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
|
|
- cp `dirname $KBUILD_IMAGE`/dts/*.dtb `dirname "$tmpdir/$installed_image_path"`/
|
|
else
|
|
cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
|
|
- for f in arch/$ARCH/boot/dts/*.dtb; do
|
|
- cp -p $f `dirname "$tmpdir/$installed_image_path"`/`basename $f`-${KERNELRELEASE}
|
|
- done
|
|
fi
|
|
|
|
if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
|
|
@@ -165,16 +152,18 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
|
|
rmdir "$tmpdir/lib/modules/$version"
|
|
fi
|
|
if [ -n "$BUILD_DEBUG" ] ; then
|
|
- for module in $(find $tmpdir/lib/modules/ -name *.ko -printf '%P\n'); do
|
|
- module=lib/modules/$module
|
|
- mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
|
|
- # only keep debug symbols in the debug file
|
|
- $OBJCOPY --only-keep-debug $tmpdir/$module $dbg_dir/usr/lib/debug/$module
|
|
- # strip original module from debug symbols
|
|
- $OBJCOPY --strip-debug $tmpdir/$module
|
|
- # then add a link to those
|
|
- $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $tmpdir/$module
|
|
- done
|
|
+ (
|
|
+ cd $tmpdir
|
|
+ for module in $(find lib/modules/ -name *.ko); do
|
|
+ mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
|
|
+ # only keep debug symbols in the debug file
|
|
+ $OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
|
|
+ # strip original module from debug symbols
|
|
+ $OBJCOPY --strip-debug $module
|
|
+ # then add a link to those
|
|
+ $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
|
|
+ done
|
|
+ )
|
|
fi
|
|
fi
|
|
|
|
@@ -300,16 +289,14 @@ EOF
|
|
|
|
fi
|
|
|
|
-# Build kernel header package
|
|
-(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
|
|
-(cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles"
|
|
-(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
|
|
-(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
|
|
-(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
|
|
+# Build header package
|
|
+(cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
|
|
+(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
|
|
+(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
|
|
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
|
|
mkdir -p "$destdir"
|
|
-(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
|
|
-(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
|
|
+(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
|
|
+(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
|
|
(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
|
|
ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
|
|
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
|
|
@@ -328,10 +315,8 @@ EOF
|
|
# Do we have firmware? Move it out of the way and build it into a package.
|
|
if [ -e "$tmpdir/lib/firmware" ]; then
|
|
mv "$tmpdir/lib/firmware"/* "$fwdir/lib/firmware/$version/"
|
|
- mv "$fwdir/lib/firmware/$version" "$tmpdir/lib/firmware"/
|
|
-fi
|
|
+ rmdir "$tmpdir/lib/firmware"
|
|
|
|
-if false; then
|
|
cat <<EOF >> debian/control
|
|
|
|
Package: $fwpackagename
|
|
@@ -387,4 +372,4 @@ EOF
|
|
create_package "$dbg_packagename" "$dbg_dir"
|
|
fi
|
|
|
|
-exit 0
|
|
+exit 0
|
|
\ No newline at end of file
|