18 files changed, 39 insertions, 31 deletions
diff --git a/.gitmodules b/.gitmodules
index 81d08d00..026d9cdf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "buildroot"]
 	path = buildroot
 	branch = 2017.11-op-build
-	url = https://github.com/open-power/buildroot
+	url = https://scm.raptorcs.com/scm/git/buildroot
diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index aed88b68..46942831 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -1,14 +1,11 @@
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-ffs/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot/Config.in"
-source "$BR2_EXTERNAL_OP_BUILD_PATH/package/hostboot-binaries/Config.in"
-source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-mrw/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/common-p8-xml/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/machine-xml/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/openpower-pnor/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/petitboot/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/p8-pore-binutils/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ/Config.in"
-source "$BR2_EXTERNAL_OP_BUILD_PATH/package/capp-ucode/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/skiboot/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/libflash/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/loadkeys/Config.in"
diff --git a/openpower/package/common-p8-xml/common-p8-xml.mk b/openpower/package/common-p8-xml/common-p8-xml.mk
index cd0afe48..74e3ba7f 100644
--- a/openpower/package/common-p8-xml/common-p8-xml.mk
+++ b/openpower/package/common-p8-xml/common-p8-xml.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-COMMON_P8_XML_VERSION ?= e02b6f6ddd5f225ddb70c286a10685df5b9267db
-COMMON_P8_XML_SITE ?= $(call github,open-power,common-p8-xml,$(COMMON_P8_XML_VERSION))
+COMMON_P8_XML_VERSION ?= dc15d115bffca490e96a440195fca2c90920b3ca
+COMMON_P8_XML_SITE ?= https://scm.raptorcs.com/scm/git/common-op-xml
+COMMON_P8_XML_SITE_METHOD = git
 
 COMMON_P8_XML_LICENSE = Apache-2.0
 COMMON_P8_XML_LICENSE_FILES = LICENSE
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 1f2fbba9..6dd9d128 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= d3025f5d7ddd0723946bb54fcb471d2bf1fd2da4
-HOSTBOOT_VERSION_BRANCH_MASTER ?= 52ca8121f1ed4aa7cabd10ced3a912ee4af470c4
+HOSTBOOT_VERSION_BRANCH_MASTER ?= 6c769aede36330e33939870110b274fb78461d10
 
 HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
-HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
+HOSTBOOT_SITE = https://scm.raptorcs.com/scm/git/talos-hostboot
+HOSTBOOT_SITE_METHOD = git
 
 HOSTBOOT_LICENSE = Apache-2.0
 HOSTBOOT_LICENSE_FILES = LICENSE
diff --git a/openpower/package/ima-catalog/ima-catalog.mk b/openpower/package/ima-catalog/ima-catalog.mk
index 7e469bda..b732943b 100644
--- a/openpower/package/ima-catalog/ima-catalog.mk
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -3,8 +3,9 @@
 # ima-catalog.mk
 #
 ################################################################################
-IMA_CATALOG_VERSION ?= 01b26a136da16a87c0b6b3c4d9f27555dca104dc 
-IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
+IMA_CATALOG_VERSION ?= 01b26a136da16a87c0b6b3c4d9f27555dca104dc
+IMA_CATALOG_SITE ?= https://scm.raptorcs.com/scm/git/ima-catalog
+IMA_CATALOG_SITE_METHOD = git
 IMA_CATALOG_LICENSE = Apache-2.0
 IMA_CATALOG_DEPENDENCIES = host-dtc host-xz
 
diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index e5fadaca..c6687da9 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 LIBFLASH_VERSION = v5.9-166-g70f14f4dd86e
-LIBFLASH_SITE = $(call github,open-power,skiboot,$(LIBFLASH_VERSION))
+LIBFLASH_SITE = https://scm.raptorcs.com/scm/git/talos-skiboot
+LIBFLASH_SITE_METHOD = git
 
 LIBFLASH_INSTALL_STAGING = YES
 LIBFLASH_INSTALL_TARGET = YES
diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index 6c72654c..5b07140a 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -4,12 +4,8 @@
 ################################################################################
 
 MACHINE_XML_VERSION ?= $(call qstrip,$(BR2_OPENPOWER_MACHINE_XML_VERSION))
-ifeq ($(BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT),y)
-MACHINE_XML_SITE = $(call github,open-power,$(BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE),$(MACHINE_XML_VERSION))
-else ifeq ($(BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT),y)
+MACHINE_XML_SITE = https://scm.raptorcs.com/scm/git/talos-xml
 MACHINE_XML_SITE_METHOD = git
-MACHINE_XML_SITE = $(BR2_OPENPOWER_MACHINE_XML_CUSTOM_GIT_VALUE)
-endif
 
 MACHINE_XML_LICENSE = Apache-2.0
 MACHINE_XML_LICENSE_FILES = LICENSE
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 841849ac..1883ecc4 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -8,7 +8,8 @@ OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
 OCC_VERSION_BRANCH_MASTER ?= fce2d94a9bc94e9468bce173b11fd0b96ef36c1f
 
 OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
-OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
+OCC_SITE = https://scm.raptorcs.com/scm/git/talos-occ
+OCC_SITE_METHOD = git
 OCC_LICENSE = Apache-2.0
 
 OCC_LICENSE_FILES_P8 = src/LICENSE
@@ -23,7 +24,7 @@ OCC_STAGING_DIR = $(STAGING_DIR)/occ
 OCC_IMAGE_BIN_PATH = $(if $(BR2_OPENPOWER_POWER9),obj/image.bin,src/image.bin)
 
 OCC_DEPENDENCIES_P8 = host-binutils host-p8-pore-binutils
-OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc hostboot-binaries
+OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc
 OCC_DEPENDENCIES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_DEPENDENCIES_P9),$(OCC_DEPENDENCIES_P8))
 
 define OCC_APPLY_PATCHES
diff --git a/openpower/package/openpower-ffs/openpower-ffs.mk b/openpower/package/openpower-ffs/openpower-ffs.mk
index e5481088..d3b1f925 100644
--- a/openpower/package/openpower-ffs/openpower-ffs.mk
+++ b/openpower/package/openpower-ffs/openpower-ffs.mk
@@ -1,5 +1,6 @@
 OPENPOWER_FFS_VERSION ?= 3ec70fbc458e32eef0d0b1de79688b4dc48cbd57
-OPENPOWER_FFS_SITE ?= $(call github,open-power,ffs,$(OPENPOWER_FFS_VERSION))
+OPENPOWER_FFS_SITE ?= https://scm.raptorcs.com/scm/git/ffs
+OPENPOWER_FFS_SITE_METHOD = git
 OPENPOWER_FFS_LICENSE = Apache-2.0
 OPENPOWER_FFS_LICENSE_FILES = LICENSE
 
diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index 7ac51ca4..81dd6834 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-OPENPOWER_PNOR_VERSION ?= b7aad501e62c36f2e7341f4e1101969bad2e8f21
-OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
+OPENPOWER_PNOR_VERSION ?= b2a1e4dfd8abddad3e3e3527cc9dc3a12d57627f
+OPENPOWER_PNOR_SITE ?= https://scm.raptorcs.com/scm/git/pnor
+OPENPOWER_PNOR_SITE_METHOD = git
 
 OPENPOWER_PNOR_LICENSE = Apache-2.0
 OPENPOWER_PNOR_LICENSE_FILES = LICENSE
-OPENPOWER_PNOR_DEPENDENCIES = hostboot hostboot-binaries machine-xml skiboot host-openpower-ffs occ capp-ucode
+OPENPOWER_PNOR_DEPENDENCIES = hostboot machine-xml skiboot host-openpower-ffs occ
 
 ifeq ($(BR2_PACKAGE_IMA_CATALOG),y)
 OPENPOWER_PNOR_DEPENDENCIES += ima-catalog
@@ -75,7 +76,7 @@ FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
 
 
 # Subpackages we want to include in the version info (do not include openpower-pnor)
-OPENPOWER_VERSIONED_SUBPACKAGES = skiboot hostboot linux petitboot machine-xml occ hostboot-binaries capp-ucode
+OPENPOWER_VERSIONED_SUBPACKAGES = skiboot hostboot linux petitboot machine-xml occ
 OPENPOWER_PNOR = openpower-pnor
 
 ifeq ($(BR2_OPENPOWER_POWER9),y)
diff --git a/openpower/package/openpower-vpnor/openpower-vpnor.mk b/openpower/package/openpower-vpnor/openpower-vpnor.mk
index 257fb702..98031e81 100644
--- a/openpower/package/openpower-vpnor/openpower-vpnor.mk
+++ b/openpower/package/openpower-vpnor/openpower-vpnor.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 HOST_OPENPOWER_VPNOR_VERSION ?= 0e30f86cb44f3ab0aa4080faf32eb4bf2a9b12b2
-HOST_OPENPOWER_VPNOR_SITE ?= $(call github,openbmc,openpower-pnor-code-mgmt,$(HOST_OPENPOWER_VPNOR_VERSION))
+HOST_OPENPOWER_VPNOR_SITE ?= https://scm.raptorcs.com/scm/git/openpower-pnor-code-mgmt
+HOST_OPENPOWER_VPNOR_SITE_METHOD = git
 HOST_OPENPOWER_VPNOR_DEPENDENCIES = host-squashfs host-libflash
 
 define HOST_OPENPOWER_VPNOR_INSTALL_CMDS
diff --git a/openpower/package/petitboot/petitboot.mk b/openpower/package/petitboot/petitboot.mk
index 9023d418..b6d5ecf0 100644
--- a/openpower/package/petitboot/petitboot.mk
+++ b/openpower/package/petitboot/petitboot.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 PETITBOOT_VERSION = v1.6.6
-PETITBOOT_SITE ?= $(call github,open-power,petitboot,$(PETITBOOT_VERSION))
+PETITBOOT_SITE ?= https://scm.raptorcs.com/scm/git/talos-petitboot
+PETITBOOT_SITE_METHOD = git
 PETITBOOT_DEPENDENCIES = ncurses udev host-bison host-flex lvm2
 PETITBOOT_LICENSE = GPLv2
 PETITBOOT_LICENSE_FILES = COPYING
diff --git a/openpower/package/ppe42-binutils/ppe42-binutils.mk b/openpower/package/ppe42-binutils/ppe42-binutils.mk
index b63e2a1c..b45718a5 100644
--- a/openpower/package/ppe42-binutils/ppe42-binutils.mk
+++ b/openpower/package/ppe42-binutils/ppe42-binutils.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 PPE42_BINUTILS_VERSION ?= ded0eff199fa1d9bd8be5a78935e8f023a2c5fad
-PPE42_BINUTILS_SITE ?= $(call github,open-power,ppe42-binutils,$(PPE42_BINUTILS_VERSION))
+PPE42_BINUTILS_SITE ?= https://scm.raptorcs.com/scm/git/ppe42-binutils
+PPE42_BINUTILS_SITE_METHOD = git
 PPE42_BINUTILS_LICENSE = GPLv3+
 
 PPE42_BINUTILS_DEPENDENCIES = host-binutils
diff --git a/openpower/package/ppe42-gcc/ppe42-gcc.mk b/openpower/package/ppe42-gcc/ppe42-gcc.mk
index 3ab8a555..d14aef05 100644
--- a/openpower/package/ppe42-gcc/ppe42-gcc.mk
+++ b/openpower/package/ppe42-gcc/ppe42-gcc.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 PPE42_GCC_VERSION ?= c13849780c80d1ed466efbeaabcc663fe48cd87d
-PPE42_GCC_SITE ?= $(call github,open-power,ppe42-gcc,$(PPE42_GCC_VERSION))
+PPE42_GCC_SITE ?= https://scm.raptorcs.com/scm/git/ppe42-gcc
+PPE42_GCC_SITE_METHOD = git
 PPE42_GCC_LICENSE = GPLv3+
 
 PPE42_GCC_DEPENDENCIES = ppe42-binutils gmp mpfr mpc
diff --git a/openpower/package/sb-signing-framework/sb-signing-framework.mk b/openpower/package/sb-signing-framework/sb-signing-framework.mk
index 6338ae01..b0aa7793 100644
--- a/openpower/package/sb-signing-framework/sb-signing-framework.mk
+++ b/openpower/package/sb-signing-framework/sb-signing-framework.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-SB_SIGNING_FRAMEWORK_SITE ?= $(call github,open-power,sb-signing-framework,$(SB_SIGNING_FRAMEWORK_VERSION))
+SB_SIGNING_FRAMEWORK_SITE ?= https://scm.raptorcs.com/scm/git/sb-signing-framework
+SB_SIGNING_FRAMEWORK_SITE_METHOD = git
 
 SB_SIGNING_FRAMEWORK_LICENSE = Apache-2.0
 SB_SIGNING_FRAMEWORK_LICENSE_FILES = LICENSE
diff --git a/openpower/package/sb-signing-utils/sb-signing-utils.mk b/openpower/package/sb-signing-utils/sb-signing-utils.mk
index 9676ebf5..1d23a4f1 100644
--- a/openpower/package/sb-signing-utils/sb-signing-utils.mk
+++ b/openpower/package/sb-signing-utils/sb-signing-utils.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-SB_SIGNING_UTILS_SITE ?= $(call github,open-power,sb-signing-utils,$(SB_SIGNING_UTILS_VERSION))
+SB_SIGNING_UTILS_SITE ?= https://scm.raptorcs.com/scm/git/sb-signing-utils
+SB_SIGNING_UTILS_SITE_METHOD = git
 
 SB_SIGNING_UTILS_LICENSE = Apache-2.0
 SB_SIGNING_UTILS_LICENSE_FILES = LICENSE
diff --git a/openpower/package/sbe/sbe.mk b/openpower/package/sbe/sbe.mk
index ae95e6f7..98becb26 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 SBE_VERSION ?= 86ae83c5d6a45b3eb616af87adf081f0216fae08
-SBE_SITE ?= $(call github,open-power,sbe,$(SBE_VERSION))
+SBE_SITE ?= https://scm.raptorcs.com/scm/git/talos-sbe
+SBE_SITE_METHOD = git
 
 SBE_LICENSE = Apache-2.0
 SBE_DEPENDENCIES = host-ppe42-gcc
diff --git a/openpower/package/skiboot/skiboot.mk b/openpower/package/skiboot/skiboot.mk
index b14855f3..321b5234 100644
--- a/openpower/package/skiboot/skiboot.mk
+++ b/openpower/package/skiboot/skiboot.mk
@@ -6,7 +6,8 @@
 
 SKIBOOT_VERSION = $(call qstrip,$(BR2_SKIBOOT_VERSION))
 
-SKIBOOT_SITE = $(call github,open-power,skiboot,$(SKIBOOT_VERSION))
+SKIBOOT_SITE = https://scm.raptorcs.com/scm/git/talos-skiboot
+SKIBOOT_SITE_METHOD = git
 SKIBOOT_LICENSE = Apache-2.0
 SKIBOOT_LICENSE_FILES = LICENCE
 SKIBOOT_INSTALL_IMAGES = YES