Skip to content

Commit f9a4711

Browse files
committed
builddeb: remove redundant $objtree/
This script works only when it is invoked in the $objtree, that is, it is already relying on $objtree is '.' Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 1694e94 commit f9a4711

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

scripts/package/builddeb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ create_package() {
4747
}
4848

4949
version=$KERNELRELEASE
50-
tmpdir="$objtree/debian/linux-image"
51-
kernel_headers_dir="$objtree/debian/linux-headers"
52-
libc_headers_dir="$objtree/debian/linux-libc-dev"
53-
dbg_dir="$objtree/debian/linux-image-dbg"
50+
tmpdir=debian/linux-image
51+
kernel_headers_dir=debian/linux-headers
52+
libc_headers_dir=debian/linux-libc-dev
53+
dbg_dir=debian/linux-image-dbg
5454
packagename=linux-image-$version
5555
kernel_headers_packagename=linux-headers-$version
5656
libc_headers_packagename=linux-libc-dev
@@ -77,7 +77,7 @@ esac
7777
BUILD_DEBUG=$(if_enabled_echo CONFIG_DEBUG_INFO Yes)
7878

7979
# Setup the directory structure
80-
rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files
80+
rm -rf "$tmpdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" debian/files
8181
mkdir -m 755 -p "$tmpdir/DEBIAN"
8282
mkdir -p "$tmpdir/lib" "$tmpdir/boot"
8383
mkdir -p "$kernel_headers_dir/lib/modules/$version/"
@@ -165,24 +165,24 @@ EOF
165165
done
166166

167167
# Build kernel header package
168-
(cd $srctree; find . arch/$SRCARCH -maxdepth 1 -name Makefile\*) > "$objtree/debian/hdrsrcfiles"
169-
(cd $srctree; find include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
170-
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
171-
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
168+
(cd $srctree; find . arch/$SRCARCH -maxdepth 1 -name Makefile\*) > debian/hdrsrcfiles
169+
(cd $srctree; find include scripts -type f -o -type l) >> debian/hdrsrcfiles
170+
(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> debian/hdrsrcfiles
171+
(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> debian/hdrsrcfiles
172172
if is_enabled CONFIG_STACK_VALIDATION; then
173-
echo tools/objtool/objtool >> "$objtree/debian/hdrobjfiles"
173+
echo tools/objtool/objtool >> debian/hdrobjfiles
174174
fi
175-
(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
175+
find arch/$SRCARCH/include Module.symvers include scripts -type f >> debian/hdrobjfiles
176176
if is_enabled CONFIG_GCC_PLUGINS; then
177-
(cd $objtree; find scripts/gcc-plugins -name \*.so) >> "$objtree/debian/hdrobjfiles"
177+
find scripts/gcc-plugins -name \*.so >> debian/hdrobjfiles
178178
fi
179179
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
180180
mkdir -p "$destdir"
181-
(cd $srctree; tar -c -f - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -)
182-
(cd $objtree; tar -c -f - -T -) < "$objtree/debian/hdrobjfiles" | (cd $destdir; tar -xf -)
183-
(cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
181+
(cd $srctree; tar -c -f - -T -) < debian/hdrsrcfiles | (cd $destdir; tar -xf -)
182+
tar -c -f - -T - < debian/hdrobjfiles | (cd $destdir; tar -xf -)
183+
cp $KCONFIG_CONFIG $destdir/.config # copy .config manually to be where it's expected to be
184184
ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
185-
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
185+
rm -f debian/hdrsrcfiles debian/hdrobjfiles
186186

187187
if [ "$ARCH" != "um" ]; then
188188
create_package "$kernel_headers_packagename" "$kernel_headers_dir"

0 commit comments

Comments
 (0)