| 1 |
--- |
| 2 |
targets/grp/grp-chroot.sh | 3 +-- |
| 3 |
targets/netboot2/netboot2-controller.sh | 3 +-- |
| 4 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 5 |
|
| 6 |
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh |
| 7 |
index 6690c91..5b56fff 100755 |
| 8 |
--- a/targets/grp/grp-chroot.sh |
| 9 |
+++ b/targets/grp/grp-chroot.sh |
| 10 |
@@ -5,8 +5,7 @@ source /tmp/chroot-functions.sh |
| 11 |
## START BUILD |
| 12 |
setup_pkgmgr |
| 13 |
|
| 14 |
-export DISTDIR="/tmp/grp/${clst_grp_target}" |
| 15 |
-export PKGDIR="/tmp/grp/${clst_grp_target}" |
| 16 |
+export {DISTDIR,PKGDIR}="/tmp/grp/${clst_grp_target}" |
| 17 |
|
| 18 |
if [ "${clst_grp_type}" = "pkgset" ] |
| 19 |
then |
| 20 |
diff --git a/targets/netboot2/netboot2-controller.sh b/targets/netboot2/netboot2-controller.sh |
| 21 |
index 322d9a8..3bf4982 100755 |
| 22 |
--- a/targets/netboot2/netboot2-controller.sh |
| 23 |
+++ b/targets/netboot2/netboot2-controller.sh |
| 24 |
@@ -39,8 +39,7 @@ case ${1} in |
| 25 |
|
| 26 |
exec_in_chroot ${clst_shdir}/support/kmerge.sh |
| 27 |
|
| 28 |
- delete_from_chroot tmp/linuxrc |
| 29 |
- delete_from_chroot tmp/busy-config |
| 30 |
+ delete_from_chroot tmp/{linuxrc,busy-config} |
| 31 |
|
| 32 |
extract_modules ${clst_chroot_path} ${clst_kname} |
| 33 |
#16:12 <@solar> kernel_name=foo |
| 34 |
-- |
| 35 |
2.10.2 |
Archives