diff options
Diffstat (limited to 'meta/files')
| -rw-r--r-- | meta/files/deploydir_readme.txt | 8 | ||||
| -rw-r--r-- | meta/files/ext-sdk-prepare.py | 2 | ||||
| -rw-r--r-- | meta/files/fs-perms.txt | 5 | ||||
| -rw-r--r-- | meta/files/toolchain-shar-extract.sh | 14 |
4 files changed, 16 insertions, 13 deletions
diff --git a/meta/files/deploydir_readme.txt b/meta/files/deploydir_readme.txt deleted file mode 100644 index 97ec1855f5..0000000000 --- a/meta/files/deploydir_readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -Files in the deploy directory will not be re-created automatically if you -delete them. If you do delete a file, you will need to run: - - bitbake -c clean TARGET - bitbake TARGET - -where TARGET is the name of the appropriate package or target e.g. -"virtual/kernel" for the kernel, an image, etc. diff --git a/meta/files/ext-sdk-prepare.py b/meta/files/ext-sdk-prepare.py index ef096394bb..96c5212a2e 100644 --- a/meta/files/ext-sdk-prepare.py +++ b/meta/files/ext-sdk-prepare.py @@ -54,7 +54,7 @@ def main(): ret = run_command_interruptible('BB_SETSCENE_ENFORCE=1 bitbake --quiet %s' % ' '.join(sdk_targets)) if not ret: - ret = run_command_interruptible('bitbake build-sysroots') + ret = run_command_interruptible('bitbake --quiet build-sysroots') lastlog = get_last_consolelog() if lastlog: with open(lastlog, 'r') as f: diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt index 3d00e862e3..c8c3ac5dbe 100644 --- a/meta/files/fs-perms.txt +++ b/meta/files/fs-perms.txt @@ -63,8 +63,5 @@ ${localstatedir}/volatile/tmp 01777 root root false - - - # Set 0700 ${ROOT_HOME} 0700 root root false - - - -# Set 755-lsb -/srv 0755 root root false - - - - # Set 2775-lsb -/var/mail 02775 root mail false - - - +${localstatedir}/mail 02775 root mail false - - - diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 3f54c96cc0..91804ec281 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -8,6 +8,20 @@ [ -f /etc/environment ] && . /etc/environment export PATH=`echo "$PATH" | sed -e 's/:\.//' -e 's/::/:/'` +tweakpath () { + case ":${PATH}:" in + *:"$1":*) + ;; + *) + PATH=$PATH:$1 + esac +} + +# Some systems don't have /usr/sbin or /sbin in the cleaned environment PATH but we make need it +# for the system's host tooling checks +tweakpath /usr/sbin +tweakpath /sbin + INST_ARCH=$(uname -m | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") SDK_ARCH=$(echo @SDK_ARCH@ | sed -e "s/i[3-6]86/ix86/" -e "s/x86[-_]64/x86_64/") |