|
Lines 1-5
Link Here
|
| 1 |
--- ./debootstrap.orig 2014-02-07 10:25:58.000000000 -0500 |
1 |
--- ./debootstrap.orig 2014-02-07 10:25:58.000000000 -0500 |
| 2 |
+++ ./debootstrap 2014-08-06 19:34:46.435155899 -0400 |
2 |
+++ ./debootstrap 2014-08-07 20:46:10.626600981 -0400 |
| 3 |
@@ -13,7 +13,7 @@ |
3 |
@@ -13,7 +13,7 @@ |
| 4 |
if [ -x /debootstrap/debootstrap ]; then |
4 |
if [ -x /debootstrap/debootstrap ]; then |
| 5 |
DEBOOTSTRAP_DIR=/debootstrap |
5 |
DEBOOTSTRAP_DIR=/debootstrap |
|
Lines 9-14
Link Here
|
| 9 |
fi |
9 |
fi |
| 10 |
fi |
10 |
fi |
| 11 |
|
11 |
|
|
|
12 |
@@ -399,10 +399,10 @@ |
| 13 |
|
| 14 |
if in_path dpkg && \ |
| 15 |
dpkg --print-architecture >/dev/null 2>&1; then |
| 16 |
- HOST_ARCH=`/usr/bin/dpkg --print-architecture` |
| 17 |
+ HOST_ARCH=`%%PREFIX%%/bin/dpkg --print-architecture` |
| 18 |
elif in_path udpkg && \ |
| 19 |
udpkg --print-architecture >/dev/null 2>&1; then |
| 20 |
- HOST_ARCH=`/usr/bin/udpkg --print-architecture` |
| 21 |
+ HOST_ARCH=`%%PREFIX%%/bin/udpkg --print-architecture` |
| 22 |
elif [ -e $DEBOOTSTRAP_DIR/arch ]; then |
| 23 |
HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch` |
| 24 |
fi |
| 12 |
@@ -425,6 +425,10 @@ |
25 |
@@ -425,6 +425,10 @@ |
| 13 |
esac |
26 |
esac |
| 14 |
fi |
27 |
fi |
|
Lines 20-22
Link Here
|
| 20 |
if [ -z "$ARCH" ]; then |
33 |
if [ -z "$ARCH" ]; then |
| 21 |
ARCH=$HOST_ARCH |
34 |
ARCH=$HOST_ARCH |
| 22 |
fi |
35 |
fi |
|
|
36 |
@@ -621,7 +625,6 @@ |
| 37 |
if ! am_doing_phase second_stage; then |
| 38 |
cp "$0" "$TARGET/debootstrap/debootstrap" |
| 39 |
cp $DEBOOTSTRAP_DIR/functions "$TARGET/debootstrap/functions" |
| 40 |
- cp $DEBOOTSTRAP_DIR/devices.tar.gz "$TARGET/debootstrap/devices.tar.gz" |
| 41 |
cp $SCRIPT "$TARGET/debootstrap/suite-script" |
| 42 |
echo "$ARCH" >"$TARGET/debootstrap/arch" |
| 43 |
echo "$SUITE" >"$TARGET/debootstrap/suite" |