diff options
| author | Luotao Fu <l.fu@pengutronix.de> | 2010-03-18 10:55:53 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-03-26 12:09:15 +0100 |
| commit | 962848ae5709ccdb94fcf2ecf88914de86056ece (patch) | |
| tree | 599083985d7dc74c7e3e6fdca920ab8185d91189 | |
| parent | 20550158698b56c3ba3ef5244d68f3031373bac4 (diff) | |
| download | ptxdist-962848ae5709ccdb94fcf2ecf88914de86056ece.tar.gz ptxdist-962848ae5709ccdb94fcf2ecf88914de86056ece.tar.xz | |
[ptxdist] fix exclude pattern while building environment
The exclude pattern in the scripts for barebox/uboot-v2 environment creation is
broken. It will include the config.in template file and all backup files in
Emacs or vim style. Fix this so that we won't find things like
/env/bin/config.in or /env/config.in~ on the target after running "test setenv"
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
(cherry picked from commit 759dd85a407e0c080d1d262ea8deee47615acf7e)
| -rwxr-xr-x | tests/make_barebox_env | 3 | ||||
| -rwxr-xr-x | tests/make_uboot_v2_env | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/make_barebox_env b/tests/make_barebox_env index f49445519..84b069497 100755 --- a/tests/make_barebox_env +++ b/tests/make_barebox_env @@ -8,7 +8,8 @@ tar -C "${PTXDIST_PLATFORMCONFIGDIR}/barebox-env/" -c . \ --exclude .svn \ --exclude .pc \ --exclude .git \ - --exclude "${PTXDIST_PLATFORMCONFIGDIR}/barebox-env/config.in" \ + --exclude "config.in" \ + --exclude "*/*~" \ | tar -C "${ENVTMPDIR}" -x ${PTXDIST_SYSROOT_HOST}/bin/bareboxenv -s "${ENVTMPDIR}" "${IMAGEDIR}/barebox-environment" diff --git a/tests/make_uboot_v2_env b/tests/make_uboot_v2_env index f436ae3b4..8dad3d898 100755 --- a/tests/make_uboot_v2_env +++ b/tests/make_uboot_v2_env @@ -8,7 +8,8 @@ tar -C "${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/" -c . \ --exclude .svn \ --exclude .pc \ --exclude .git \ - --exclude "${PTXDIST_PLATFORMCONFIGDIR}/u-boot-env/config.in" \ + --exclude "config.in" \ + --exclude "*/*~" \ | tar -C "${ENVTMPDIR}" -x ${PTXDIST_SYSROOT_HOST}/bin/ubootenv -s "${ENVTMPDIR}" "${IMAGEDIR}/u-boot-v2-environment" |