| commit | e04e55fb3e6eb933de57efe725f0e11aa8e18a95 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Sat Mar 24 01:57:26 2018 -0400 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Jun 15 13:03:37 2018 +0000 |
| tree | c5a0806cdfeb9a2bf3ed55cfb72d654840352f4f | |
| parent | fa03241afaf3392b9ede4c85a74a083ba5f9e2b6 [diff] |
aspeed: remove common directory Move recipes from the common dir to the layer base dir to match typical layer layouts. Change-Id: Idcd48dd346ab51b0a16fffe31319f13fad76111e Tested: Built and verified witherspoon and palmetto images Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf index 3a530db..79933c2 100644 --- a/meta-openbmc-bsp/meta-aspeed/conf/layer.conf +++ b/meta-openbmc-bsp/meta-aspeed/conf/layer.conf
@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ - ${LAYERDIR}/common/recipes-*/*/*.bbappend" +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "aspeed-layer" BBFILE_PATTERN_aspeed-layer = ""
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/alt_fw_env.config rename to meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/alt_fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/default-gcc.patch b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/default-gcc.patch rename to meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/default-gcc.patch
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/files/fw_env.config rename to meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/files/fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb rename to meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc rename to meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb b/meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb rename to meta-openbmc-bsp/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions.bb b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions.bb rename to meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules rename to meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-mtd-partitions/76-aspeed-mtd-partitions.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart.bb b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart.bb rename to meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart.bb
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules b/meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules rename to meta-openbmc-bsp/meta-aspeed/recipes-core/udev/udev-aspeed-vuart/61-aspeed-vuart.rules
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed.inc b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed.inc rename to meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2400/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2400/defconfig rename to meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2400/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2500/defconfig b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed/ast2500/defconfig rename to meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed/ast2500/defconfig
diff --git a/meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed_4.13.bb b/meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb similarity index 100% rename from meta-openbmc-bsp/meta-aspeed/common/recipes-kernel/linux/linux-aspeed_4.13.bb rename to meta-openbmc-bsp/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb