diff options
| author | Peter Griffin <peter.griffin@linaro.org> | 2018-11-09 11:56:32 +0000 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2018-11-09 13:45:51 +0000 |
| commit | d32026206172132aaf98665b27f16cec4a859f36 (patch) | |
| tree | 88509fcef2c5fbc8151735113b20432f8a945217 /rpb-openembedded | |
| parent | 319b84d9a8cf246ef5ba8b888d07574780ecc8ed (diff) | |
builders-lhg.sh: remove meta-lhg-prop hack
meta-lhg-prop is now included in the mmwg manifest. So
move the ssh config to before repo sync, and remove
the hack to manually clone the layer.
Change-Id: Ic13e8ef8c8601f79223a3c86e83ca839b89343ce
Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
Diffstat (limited to 'rpb-openembedded')
| -rwxr-xr-x | rpb-openembedded/builders-lhg.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/rpb-openembedded/builders-lhg.sh b/rpb-openembedded/builders-lhg.sh index 324b1212..5de60bd4 100755 --- a/rpb-openembedded/builders-lhg.sh +++ b/rpb-openembedded/builders-lhg.sh @@ -48,12 +48,7 @@ if [ ! -e ".repo/manifest.xml" ]; then ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache fi -repo sync -cp .repo/manifest.xml source-manifest.xml -repo manifest -r -o pinned-manifest.xml -MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD) - -# FIXME LHG Specific: clone restricted repository, which isn't in the public manifest +# Some proprietary code is on lhg-review.org server cat << EOF > ${HOME}/lhg-review.sshconfig Host lhg-review.linaro.org User lhg-gerrit-bot @@ -61,8 +56,11 @@ Host lhg-review.linaro.org StrictHostKeyChecking no EOF chmod 0600 ${HOME}/lhg-review.sshconfig -rm -rf layers/meta-lhg-prop -git clone ssh://lhg-review.linaro.org:29418/lhg/meta-lhg-prop layers/meta-lhg-prop + +repo sync +cp .repo/manifest.xml source-manifest.xml +repo manifest -r -o pinned-manifest.xml +MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD) # record changes since last build, if available if wget -q ${BASE_URL}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then |