Explorar el Código

Merge branch 'starfive-kirkstone-poky' into 'starfive-kirkstone'

dubhe: Poky integration

See merge request starfive-tech/meta-starfive!32
Rebecca Chang hace 1 año
padre
commit
52e44113c3

+ 0 - 0
recipes-images/dubhe-image-minimal/dubhe-image-essential.inc → recipes-core/images/dubhe-image-essential.inc


+ 0 - 0
recipes-images/images/dubhe-image-initramfs.bb → recipes-core/images/dubhe-image-initramfs.bb


+ 0 - 0
recipes-images/dubhe-image-minimal/dubhe-image-minimal_0.1.bb → recipes-core/images/dubhe-image-minimal_0.1.bb


+ 0 - 0
recipes-images/qspi-image/qspi-image_0.1.bb → recipes-core/images/qspi-image_0.1.bb


+ 0 - 0
recipes-images/qspi-nfs-image/qspi-nfs-essential.inc → recipes-core/images/qspi-nfs-essential.inc


+ 0 - 0
recipes-images/qspi-nfs-image/qspi-nfs-image_0.1.bb → recipes-core/images/qspi-nfs-image_0.1.bb


+ 0 - 0
recipes-images/qspi-ubifs-image/qspi-ubifs-image_0.1.bb → recipes-core/images/qspi-ubifs-image_0.1.bb


+ 2 - 6
setup.sh

@@ -34,8 +34,8 @@ if [[ ":$PATH:" != *":$PWD/meta-starfive:"* ]]; then
   export PATH=$PATH:$PWD/meta-starfive
 fi
 echo "Init OE"
-export BASH_SOURCE="openembedded-core/oe-init-build-env"
-. ./openembedded-core/oe-init-build-env $DIR
+export BASH_SOURCE="poky/oe-init-build-env"
+source poky/oe-init-build-env
 
 # Symlink the cache
 #echo "Setup symlink for sstate"
@@ -72,10 +72,6 @@ PACKAGECONFIG:append:pn-qemu-native = " sdl"
 PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
 USER_CLASSES ?= "buildstats buildhistory buildstats-summary"
 
-require conf/distro/include/no-static-libs.inc
-require conf/distro/include/yocto-uninative.inc
-require conf/distro/include/security_flags.inc
-
 INHERIT += "uninative"
 
 DISTRO_FEATURES:append = " largefile opengl ptest multiarch wayland pam  systemd "

+ 2 - 2
tools/manifests/starfive.xml

@@ -6,12 +6,12 @@
   <default remote="openembedded" revision="master" />
   <remote name="starfive" fetch="https://github.com/starfive-tech" />
   <remote name="kraj" fetch="https://github.com/kraj" />
+  <remote name="yoctoproject" fetch="https://github.com/yoctoproject" />
 
   <project name="meta-riscv" remote="riscv" path="meta-riscv" revision="kirkstone" />
-  <project name="openembedded-core" remote="openembedded" path="openembedded-core" revision="kirkstone" />
-  <project name="bitbake" remote="openembedded" path="openembedded-core/bitbake" revision="2.0" />
   <project name="meta-openembedded" remote="openembedded" path="meta-openembedded" revision="kirkstone" />
   <project name="meta-starfive" remote="starfive" path="meta-starfive" revision="starfive-kirkstone" />
   <project name="meta-clang" remote="kraj" path="meta-clang" revision="kirkstone" />
+  <project name="poky" remote="yoctoproject" path="poky" revision="kirkstone" />
 
 </manifest>