diff options
author | Senthil Kumaran <senthil.kumaran@linaro.org> | 2013-04-11 21:26:33 +0530 |
---|---|---|
committer | Senthil Kumaran <senthil.kumaran@linaro.org> | 2013-04-11 21:26:33 +0530 |
commit | 4f87efac885815d1ab42445d3cb61b0a2776f9cc (patch) | |
tree | 7875c9a58ca4fed07823f9491edfaceb14a52a0d | |
parent | d401f71299e4d232a09b11599bf7357092354071 (diff) | |
parent | 670b95c458e74117d1b4b0a318e931dc45a3a853 (diff) |
Merge branch 'master' of ssh://linarogit/srv/git.linaro.org/git/qa/test-definitions
-rw-r--r-- | openembedded/busybox.yaml (renamed from oe/busybox.yaml) | 0 | ||||
-rw-r--r-- | openembedded/device-tree.yaml (renamed from oe/device-tree.yaml) | 0 | ||||
-rw-r--r-- | openembedded/ethernet.yaml (renamed from oe/ethernet.yaml) | 0 | ||||
-rw-r--r-- | openembedded/kernel-version.yaml (renamed from oe/kernel-version.yaml) | 0 | ||||
-rw-r--r-- | openembedded/mysql.yaml (renamed from oe/mysql.yaml) | 0 | ||||
-rw-r--r-- | openembedded/perf.yaml (renamed from oe/perf.yaml) | 0 | ||||
-rw-r--r-- | openembedded/pwrmgmt.yaml (renamed from oe/pwrmgmt.yaml) | 0 | ||||
-rwxr-xr-x | openembedded/scripts/busybox.sh (renamed from oe/scripts/busybox.sh) | 0 | ||||
-rwxr-xr-x | openembedded/scripts/ethernet.sh (renamed from oe/scripts/ethernet.sh) | 0 | ||||
-rwxr-xr-x | openembedded/scripts/kernel-version.sh (renamed from oe/scripts/kernel-version.sh) | 0 | ||||
-rwxr-xr-x | openembedded/scripts/mysql.sh (renamed from oe/scripts/mysql.sh) | 0 | ||||
-rwxr-xr-x | openembedded/scripts/toolchain.sh (renamed from oe/scripts/toolchain.sh) | 0 | ||||
-rw-r--r-- | openembedded/toolchain.yaml (renamed from oe/toolchain.yaml) | 0 | ||||
-rw-r--r-- | ubuntu/acpica.yaml | 7 |
14 files changed, 6 insertions, 1 deletions
diff --git a/oe/busybox.yaml b/openembedded/busybox.yaml index b1e6a6e..b1e6a6e 100644 --- a/oe/busybox.yaml +++ b/openembedded/busybox.yaml diff --git a/oe/device-tree.yaml b/openembedded/device-tree.yaml index 9b03d96..9b03d96 100644 --- a/oe/device-tree.yaml +++ b/openembedded/device-tree.yaml diff --git a/oe/ethernet.yaml b/openembedded/ethernet.yaml index 48ed902..48ed902 100644 --- a/oe/ethernet.yaml +++ b/openembedded/ethernet.yaml diff --git a/oe/kernel-version.yaml b/openembedded/kernel-version.yaml index 50ec8a3..50ec8a3 100644 --- a/oe/kernel-version.yaml +++ b/openembedded/kernel-version.yaml diff --git a/oe/mysql.yaml b/openembedded/mysql.yaml index 89eaa0c..89eaa0c 100644 --- a/oe/mysql.yaml +++ b/openembedded/mysql.yaml diff --git a/oe/perf.yaml b/openembedded/perf.yaml index 0f819cf..0f819cf 100644 --- a/oe/perf.yaml +++ b/openembedded/perf.yaml diff --git a/oe/pwrmgmt.yaml b/openembedded/pwrmgmt.yaml index d40d964..d40d964 100644 --- a/oe/pwrmgmt.yaml +++ b/openembedded/pwrmgmt.yaml diff --git a/oe/scripts/busybox.sh b/openembedded/scripts/busybox.sh index c43a8bc..c43a8bc 100755 --- a/oe/scripts/busybox.sh +++ b/openembedded/scripts/busybox.sh diff --git a/oe/scripts/ethernet.sh b/openembedded/scripts/ethernet.sh index a9e4519..a9e4519 100755 --- a/oe/scripts/ethernet.sh +++ b/openembedded/scripts/ethernet.sh diff --git a/oe/scripts/kernel-version.sh b/openembedded/scripts/kernel-version.sh index 7909dbf..7909dbf 100755 --- a/oe/scripts/kernel-version.sh +++ b/openembedded/scripts/kernel-version.sh diff --git a/oe/scripts/mysql.sh b/openembedded/scripts/mysql.sh index 2a9a4f1..2a9a4f1 100755 --- a/oe/scripts/mysql.sh +++ b/openembedded/scripts/mysql.sh diff --git a/oe/scripts/toolchain.sh b/openembedded/scripts/toolchain.sh index 14baec3..14baec3 100755 --- a/oe/scripts/toolchain.sh +++ b/openembedded/scripts/toolchain.sh diff --git a/oe/toolchain.yaml b/openembedded/toolchain.yaml index 61b902d..61b902d 100644 --- a/oe/toolchain.yaml +++ b/openembedded/toolchain.yaml diff --git a/ubuntu/acpica.yaml b/ubuntu/acpica.yaml index 61193f7..469fac9 100644 --- a/ubuntu/acpica.yaml +++ b/ubuntu/acpica.yaml @@ -7,8 +7,13 @@ install: git-repos: - git://git.linaro.org/people/ahs3/acpica.git steps: - - 'cd acpica && make all' + - 'cd acpica' + - 'git branch linaro origin/linaro' + - 'git checkout linaro' + - 'make all' deps: + - git + - git-core - bzip2 - flex - bison |