Mercurial > hg > aboriginal
comparison simple-root-filesystem.sh @ 1243:0666458bca16
Fix overlay support: copy to original STAGE_DIR (not into usr/) and use tar | tar instead of cp -a (which barfs copying dir/file to a destination where dir symlink).
author | Rob Landley <rob@landley.net> |
---|---|
date | Fri, 10 Sep 2010 12:21:46 -0500 |
parents | e93f17722cdf |
children | a801fe68e08c |
comparison
equal
deleted
inserted
replaced
1242:83b8e7888ccf | 1243:0666458bca16 |
---|---|
15 | 15 |
16 echo "=== Building $STAGE_NAME" | 16 echo "=== Building $STAGE_NAME" |
17 | 17 |
18 # Determine which directory layout we're using | 18 # Determine which directory layout we're using |
19 | 19 |
20 OLD_STAGE_DIR="$STAGE_DIR" | |
20 if [ -z "$ROOT_NODIRS" ] | 21 if [ -z "$ROOT_NODIRS" ] |
21 then | 22 then |
22 mkdir -p "$STAGE_DIR"/{tmp,proc,sys,dev,home,mnt} && | 23 mkdir -p "$STAGE_DIR"/{tmp,proc,sys,dev,home,mnt} && |
23 chmod a+rwxt "$STAGE_DIR/tmp" || dienow | 24 chmod a+rwxt "$STAGE_DIR/tmp" || dienow |
24 | 25 |
49 # (This overwrites existing files.) | 50 # (This overwrites existing files.) |
50 | 51 |
51 if [ ! -z "$SIMPLE_ROOT_OVERLAY" ] | 52 if [ ! -z "$SIMPLE_ROOT_OVERLAY" ] |
52 then | 53 then |
53 cd "$TOP" | 54 cd "$TOP" |
54 cp -r "$SIMPLE_ROOT_OVERLAY/." "$STAGE_DIR/" || dienow | 55 tar -cz -C "$SIMPLE_ROOT_OVERLAY" | tar -xz -C "$OLD_STAGE_DIR" || dienow |
55 fi | 56 fi |
56 | 57 |
57 # Build busybox | 58 # Build busybox |
58 | 59 |
59 build_section busybox | 60 build_section busybox |