diff options
| author | P. J. McDermott <pjm@nac.net> | 2013-07-02 18:02:58 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2013-07-02 18:02:58 (EDT) |
| commit | 90c2512a3c0a8ee7d0503c86b7902145b03b9e46 (patch) | |
| tree | 8c8bca76fae1ad3eb33f2b7504ee472128d6bc81 | |
| parent | e9534658c36b32bea9c0c26951039dc270ba04e7 (diff) | |
Change name of stage1 file system root.
| -rwxr-xr-x | bootstrap-stage1-install.sh | 14 | ||||
| -rwxr-xr-x | bootstrap-stage1-test.sh | 2 | ||||
| -rw-r--r-- | bootstrap-stage2-build.sh | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/bootstrap-stage1-install.sh b/bootstrap-stage1-install.sh index a870495..0772fc7 100755 --- a/bootstrap-stage1-install.sh +++ b/bootstrap-stage1-install.sh @@ -60,9 +60,9 @@ install_packages() { local opk pkg - [ -d root ] && rm -Rf root - mkdir root - cd root + rm -Rf root1 + mkdir root1 + cd root1 for opk in ../pkg/*_${ARCH}_${PLAT}.opk ../pkg/*_${ARCH}_all.opk \ ../pkg/*_all_${PLAT}.opk ../pkg/*_all_all.opk; do @@ -79,7 +79,7 @@ install_elf_interp_link() { local elf_interp - cd root + cd root1 elf_interp="$(readelf -l bin/busybox | sed -n \ 's|^.*\[Requesting program interpreter: /\(.*\)\].*$|\1|p')" @@ -94,7 +94,7 @@ install_archplat_sysconf() # TODO: The config-opkg package should provide these, but it isn't built # and installed here yet. - cd root + cd root1 mkdir -p etc printf '%s\n' "${ARCH}" >etc/proteanos_arch @@ -110,7 +110,7 @@ configure_packages() { local opk pkg entry file - cd root + cd root1 info='var/lib/opkg/info' mkdir -p "${info}" @@ -144,7 +144,7 @@ configure_packages() setup_root() { - cd root + cd root1 case "${ARCH}" in *-linux-*) diff --git a/bootstrap-stage1-test.sh b/bootstrap-stage1-test.sh index fd70591..2f26e21 100755 --- a/bootstrap-stage1-test.sh +++ b/bootstrap-stage1-test.sh @@ -54,7 +54,7 @@ test_packages() { local zlib_upstream_ver opk - cd root + cd root1 log 'Testing BusyBox...' sudo chroot . true diff --git a/bootstrap-stage2-build.sh b/bootstrap-stage2-build.sh index f2b6673..f9313e3 100644 --- a/bootstrap-stage2-build.sh +++ b/bootstrap-stage2-build.sh @@ -48,9 +48,9 @@ log() build_packages() { - cp -p pkg/src-*_src_all.opk root - sudo chroot root sh -c 'opkg install /src-*_src_all.opk' - sudo chroot root sh -c 'for dir in /usr/src/*/; do + cp -p pkg/src-*_src_all.opk root1 + sudo chroot root1 sh -c 'opkg install /src-*_src_all.opk' + sudo chroot root1 sh -c 'for dir in /usr/src/*/; do cd "${dir}" opkbuild -C done' |