diff options
| author | Michal Marek <mmarek@suse.cz> | 2014-06-16 14:18:59 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-06-19 20:08:41 +0400 |
| commit | b0aefa0e6d050cdeb59f508236e91fdc4885c566 (patch) | |
| tree | 0df1e7af5aa7ec846b67d5500b314cf19eec57ba | |
| parent | c400ba1959580d50e1b6a8e63238e0fe1dc9ed74 (diff) | |
deb-pkg: Fix for relative pathstracking-linaro-builddeb-tweaks-llct-20140619.0
When $srctree or $objtree are relative paths, we cannot change directory
and refer to them in the same subshell. Do the redirection outside of
the subshell to fix this.
Reported-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/package/builddeb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 30bf5043e5e5..5cd6b392bceb 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -293,17 +293,17 @@ 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 . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles" +(cd $srctree; find arch/$SRCARCH/include include scripts -type f) >> "$objtree/debian/hdrsrcfiles" if [ "$ARCH" = "arm" ]; then - (cd $srctree; find arch/arm/mach-*/include -type f >> "$objtree/debian/hdrsrcfiles") + (cd $srctree; find arch/arm/mach-*/include -type f) >> "$objtree/debian/hdrsrcfiles" fi -(cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles") +(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" excludes="--exclude-vcs --exclude=*.cmd --exclude=*.o --exclude=Documentation" -(cd $srctree; tar $excludes -cf - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -) -(cd $objtree; tar $excludes -cf - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) +(cd $srctree; tar $excludes -cf - -T -) < "$objtree/debian/hdrsrcfiles" | (cd $destdir; tar -xf -) +(cd $objtree; tar $excludes -cf - -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" |