From 13423e64272b867df8dfc4088a73d577957e4f0f Mon Sep 17 00:00:00 2001
From: Raptor Engineering Development Team <support@raptorengineering.com>
Date: Wed, 3 Jan 2018 14:34:49 -0600
Subject: Redirect all relevant GitHub references to RCS GIT repositories

---
 openpower/package/Config.in                                |  5 -----
 openpower/package/common-p8-xml/common-p8-xml.mk           |  3 ++-
 openpower/package/hostboot/hostboot.mk                     |  4 ++--
 openpower/package/ima-catalog/ima-catalog.mk               |  3 ++-
 openpower/package/libflash/libflash.mk                     |  3 ++-
 openpower/package/machine-xml/machine-xml.mk               |  6 +-----
 openpower/package/occ/occ.mk                               | 10 ++++++----
 openpower/package/openpower-ffs/openpower-ffs.mk           |  3 ++-
 openpower/package/openpower-pnor/openpower-pnor.mk         | 14 ++++----------
 openpower/package/petitboot/petitboot.mk                   |  4 ++--
 openpower/package/ppe42-binutils/ppe42-binutils.mk         |  3 ++-
 openpower/package/ppe42-gcc/ppe42-gcc.mk                   |  3 ++-
 .../package/sb-signing-framework/sb-signing-framework.mk   |  3 ++-
 openpower/package/sb-signing-utils/sb-signing-utils.mk     |  3 ++-
 openpower/package/sbe/sbe.mk                               |  5 +++--
 openpower/package/skiboot/skiboot.mk                       |  7 +------
 16 files changed, 35 insertions(+), 44 deletions(-)

(limited to 'openpower')

diff --git a/openpower/package/Config.in b/openpower/package/Config.in
index 6e3fc973..6dcd2347 100755
--- a/openpower/package/Config.in
+++ b/openpower/package/Config.in
@@ -1,8 +1,5 @@
 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-p8/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"
@@ -10,8 +7,6 @@ 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/hcode/Config.in"
 source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ/Config.in"
-source "$BR2_EXTERNAL_OP_BUILD_PATH/package/occ-p8/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..58bf5f4f 100644
--- a/openpower/package/common-p8-xml/common-p8-xml.mk
+++ b/openpower/package/common-p8-xml/common-p8-xml.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 COMMON_P8_XML_VERSION ?= e02b6f6ddd5f225ddb70c286a10685df5b9267db
-COMMON_P8_XML_SITE ?= $(call github,open-power,common-p8-xml,$(COMMON_P8_XML_VERSION))
+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 d83f0733..66d41e7f 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,9 +3,9 @@
 # hostboot for POWER9
 #
 ################################################################################
-
 HOSTBOOT_VERSION = $(call qstrip,$(BR2_HOSTBOOT_VERSION))
-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 19d2d6e0..f87a5bda 100644
--- a/openpower/package/ima-catalog/ima-catalog.mk
+++ b/openpower/package/ima-catalog/ima-catalog.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 IMA_CATALOG_VERSION ?= 3d30c7aca6c8ef066f92384271827ad5b66392bf 
-IMA_CATALOG_SITE ?= $(call github,open-power,ima-catalog,$(IMA_CATALOG_VERSION))
+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 8b9d336f..f8e08ef7 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -5,7 +5,8 @@
 ################################################################################
 
 LIBFLASH_VERSION = v6.2
-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 cca8630a..99974b18 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 39ad15e8..35aa1807 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -7,6 +7,9 @@
 OCC_VERSION = $(call qstrip,$(BR2_OCC_VERSION))
 OCC_SITE = $(call github,open-power,occ,$(OCC_VERSION))
 
+OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
+OCC_SITE = https://scm.raptorcs.com/scm/git/talos-occ
+OCC_SITE_METHOD = git
 OCC_LICENSE = Apache-2.0
 
 OCC_LICENSE_FILES = LICENSE
@@ -18,10 +21,9 @@ OCC_STAGING_DIR = $(STAGING_DIR)/occ
 
 OCC_IMAGE_BIN_PATH = obj/image.bin
 
-OCC_DEPENDENCIES = host-binutils host-ppe42-gcc
-ifeq ($(BR2_OCC_GPU_BIN_BUILD),y)
-	OCC_DEPENDENCIES += hostboot-binaries
-endif
+OCC_DEPENDENCIES_P8 = host-binutils host-p8-pore-binutils
+OCC_DEPENDENCIES_P9 = host-binutils host-ppe42-gcc
+OCC_DEPENDENCIES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_DEPENDENCIES_P9),$(OCC_DEPENDENCIES_P8))
 
 define OCC_BUILD_CMDS
 	if [ "$(BR2_OCC_GPU_BIN_BUILD)" == "y"  ]; then \
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 80787cbb..f036e8a6 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -5,11 +5,12 @@
 ################################################################################
 
 OPENPOWER_PNOR_VERSION ?= 2ea669b4aa574a9e0d121ca60e782b2354064eb0
-OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION))
+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-binaries machine-xml skiboot host-openpower-ffs capp-ucode host-openpower-pnor-util
+OPENPOWER_PNOR_DEPENDENCIES = machine-xml skiboot host-openpower-ffs host-openpower-pnor-util
 
 ifeq ($(BR2_OPENPOWER_POWER9),y)
 OPENPOWER_PNOR_DEPENDENCIES += hcode
@@ -78,14 +79,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
-ifeq ($(BR2_PACKAGE_HOSTBOOT_P8),y)
-OPENPOWER_VERSIONED_SUBPACKAGES += hostboot-p8 occ-p8
-endif
-ifeq ($(BR2_PACKAGE_HOSTBOOT),y)
-OPENPOWER_VERSIONED_SUBPACKAGES += hostboot occ
-endif
-OPENPOWER_VERSIONED_SUBPACKAGES += linux petitboot machine-xml 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/petitboot/petitboot.mk b/openpower/package/petitboot/petitboot.mk
index 1d97a3ee..d3ab66a5 100644
--- a/openpower/package/petitboot/petitboot.mk
+++ b/openpower/package/petitboot/petitboot.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 PETITBOOT_VERSION = v1.10.3
-PETITBOOT_SOURCE = petitboot-$(PETITBOOT_VERSION).tar.gz
-PETITBOOT_SITE ?= https://github.com/open-power/petitboot/releases/download/$(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 cba03e38..8161fc4e 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 987a9c05..f58bbdbe 100644
--- a/openpower/package/sbe/sbe.mk
+++ b/openpower/package/sbe/sbe.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-SBE_VERSION = $(call qstrip,$(BR2_SBE_VERSION))
-SBE_SITE = $(call github,open-power,sbe,$(SBE_VERSION))
+SBE_VERSION ?= 86ae83c5d6a45b3eb616af87adf081f0216fae08
+SBE_SITE ?= https://scm.raptorcs.com/scm/git/talos-sbe
+SBE_SITE_METHOD = git
 
 SBE_LICENSE = Apache-2.0
 SBE_DEPENDENCIES = host-ppe42-gcc hcode
diff --git a/openpower/package/skiboot/skiboot.mk b/openpower/package/skiboot/skiboot.mk
index 5f3e258d..9a398f81 100644
--- a/openpower/package/skiboot/skiboot.mk
+++ b/openpower/package/skiboot/skiboot.mk
@@ -6,13 +6,8 @@
 
 SKIBOOT_VERSION = $(call qstrip,$(BR2_SKIBOOT_VERSION))
 
-ifeq ($(BR2_SKIBOOT_CUSTOM_GIT),y)
-SKIBOOT_SITE = $(call qstrip,$(BR2_SKIBOOT_CUSTOM_REPO_URL))
+SKIBOOT_SITE = https://scm.raptorcs.com/scm/git/talos-skiboot
 SKIBOOT_SITE_METHOD = git
-else
-SKIBOOT_SITE = $(call github,open-power,skiboot,$(SKIBOOT_VERSION))
-endif
-
 SKIBOOT_LICENSE = Apache-2.0
 SKIBOOT_LICENSE_FILES = LICENCE
 SKIBOOT_INSTALL_IMAGES = YES
-- 
cgit v1.2.1