zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed an issue when ./is added to the umpacked filenames, like in kbd-1.12.tar.bz2

Browse source
This commit is contained in:
Manuel Canales Esparcia 2005-10-08 15:34:32 +00:00
parent 1f025ca967
commit eaa021a187
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
jhalfs
View file

@ -393,7 +393,7 @@ EOF
( (
cat << EOF cat << EOF
@\$(call unpack,$FILE) @\$(call unpack,$FILE)
@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\ @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
chown -R lfs \$(LFS)\$(SRC)/\$\$ROOT && \\ chown -R lfs \$(LFS)\$(SRC)/\$\$ROOT && \\
echo "PKGDIR=\$(LFS)\$(SRC)/\$\$ROOT" > envars && \\ echo "PKGDIR=\$(LFS)\$(SRC)/\$\$ROOT" > envars && \\
echo "export PKGDIR" >> envars && \\ echo "export PKGDIR" >> envars && \\
@ -454,7 +454,7 @@ EOF
if [ "$i" != "027-binutils-pass1" ] && [ "$i" != "032-tcl" ] && [ "$i" != "036-binutils-pass2" ] ; then if [ "$i" != "027-binutils-pass1" ] && [ "$i" != "032-tcl" ] && [ "$i" != "036-binutils-pass2" ] ; then
( (
cat << EOF cat << EOF
@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\ @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\ rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\
if [ -e \$(LFS)\$(SRC)/$name-build ]; then \\ if [ -e \$(LFS)\$(SRC)/$name-build ]; then \\
rm -r \$(LFS)\$(SRC)/$name-build; \\ rm -r \$(LFS)\$(SRC)/$name-build; \\
@ -499,7 +499,7 @@ EOF
( (
cat << EOF cat << EOF
@if [ ! -e \$@ ] ; then \\ @if [ ! -e \$@ ] ; then \\
ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\ ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\ rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\
rm -r \$(LFS)\$(SRC)/binutils-build; \\ rm -r \$(LFS)\$(SRC)/binutils-build; \\
fi; fi;
@ -511,7 +511,7 @@ EOF
( (
cat << EOF cat << EOF
@if [ ! -e \$@ ] ; then \\ @if [ ! -e \$@ ] ; then \\
ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\ ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
rm -r \$(LFS)\$(SRC)/\$\$ROOT; \\ rm -r \$(LFS)\$(SRC)/\$\$ROOT; \\
fi; fi;
EOF EOF
@ -563,7 +563,7 @@ EOF
( (
cat << EOF cat << EOF
@\$(call unpack,$FILE) @\$(call unpack,$FILE)
@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\ @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\ echo "PKGDIR=\$(SRC)/\$\$ROOT" > envars && \\
echo "export PKGDIR" >> envars echo "export PKGDIR" >> envars
EOF EOF
@ -617,7 +617,7 @@ EOF
if [ "$vrs" != "" ] ; then if [ "$vrs" != "" ] ; then
( (
cat << EOF cat << EOF
@ROOT=\`head -n1 /tmp/unpacked | sed 's@/.*@@'\` && \\ @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\ rm -r \$(LFS)\$(SRC)/\$\$ROOT && \\
if [ -e \$(LFS)\$(SRC)/$name-build ]; then \\ if [ -e \$(LFS)\$(SRC)/$name-build ]; then \\
rm -r \$(LFS)\$(SRC)/$name-build; \\ rm -r \$(LFS)\$(SRC)/$name-build; \\