From 653fe0a81e82db63d34c5426a350a5ae076773db Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 23 Aug 2017 13:50:53 +0000 Subject: [PATCH 1/4] Add the build-artifacts repository. --- .gitmodules | 3 +++ sm/build-artifacts | 1 + 2 files changed, 4 insertions(+) create mode 160000 sm/build-artifacts diff --git a/.gitmodules b/.gitmodules index 1d345d4f..20df3fba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "packages/platforms-closed"] path = packages/platforms-closed url = git@github.com:opennetworklinux/platforms-closed +[submodule "sm/build-artifacts"] + path = sm/build-artifacts + url = git@github.com:opennetworklinux/build-artifacts diff --git a/sm/build-artifacts b/sm/build-artifacts new file mode 160000 index 00000000..01c9f5f7 --- /dev/null +++ b/sm/build-artifacts @@ -0,0 +1 @@ +Subproject commit 01c9f5f7ceab3c942f72b708e643f7b14a8d805c From 9dffd0be827fc8c515c6c2ebe3efc7605fbc74a5 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 23 Aug 2017 14:22:04 +0000 Subject: [PATCH 2/4] The local REPO is now prepopulated from build-artifacts at setup time. --- setup.env | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.env b/setup.env index 7e6f7f33..667ba08f 100755 --- a/setup.env +++ b/setup.env @@ -36,6 +36,10 @@ export BUILDROOTMIRROR=${BUILDROOTMIRROR:-"http://buildroot.opennetlinux.org/dl" # These submodules are required for almost everything. $ONL/tools/submodules.py $ONL sm/infra $ONL/tools/submodules.py $ONL sm/bigcode +$ONL/tools/submodules.py $ONL sm/build-artifacts + +# Prepopulate local REPO with build-artifacts. +cp -R $ONL/sm/build-artifacts/REPO/* $ONL/REPO # Export the current debian suite export ONL_DEBIAN_SUITE=$(lsb_release -c -s) @@ -46,4 +50,4 @@ if [ ! -f $ONL/.git/hooks/post-merge ] && [ -d $ONL/.git ]; then fi # submodule post update scripts. -export ONL_SUBMODULE_UPDATED_SCRIPTS="$ONL/tools/scripts/submodule-updated.sh" \ No newline at end of file +export ONL_SUBMODULE_UPDATED_SCRIPTS="$ONL/tools/scripts/submodule-updated.sh" From 62b1fe997eecd5e80cd7a8a8ea50cd687291d562 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 23 Aug 2017 14:22:43 +0000 Subject: [PATCH 3/4] Updated with buildroot artifacts. --- sm/build-artifacts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sm/build-artifacts b/sm/build-artifacts index 01c9f5f7..54005ad5 160000 --- a/sm/build-artifacts +++ b/sm/build-artifacts @@ -1 +1 @@ -Subproject commit 01c9f5f7ceab3c942f72b708e643f7b14a8d805c +Subproject commit 54005ad5e9e03fe9235cf17378d53a30544dd155 From 81ea33da92190344d989252ef152dfc65444e3b8 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 23 Aug 2017 14:55:00 +0000 Subject: [PATCH 4/4] Update ignore. --- packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore | 3 +-- packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore b/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore index 76483140..269535f7 100644 --- a/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore +++ b/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore @@ -1,3 +1,2 @@ -*x86*64*delta_agc7648a*.mk +*x86*64*delta*ag5648*.mk onlpdump.mk - diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore b/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore index 64d7ff10..651bf060 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore @@ -1,2 +1,2 @@ -*x86*64*quanta*ly4r*rangeley.mk +*x86*64*quanta*ly4r*.mk onlpdump.mk