Merge pull request #195 from YoeDistro/kraj/master

Use buster and update site.conf to match oe-core master

conf/site.conf

@@ -8,8 +8,8 @@ CONF_VERSION = "1"
 # Modify the following if you need to change the types of images generated
 # most of the time, this is set by the machine conf or in a custom image
 # recipe.
-IMAGE_FSTYPES += "tar.xz wic.xz"
-IMAGE_FSTYPES_remove_qemuall = "wic.xz"
+IMAGE_FSTYPES += "tar.xz wic wic.bmap"
+IMAGE_FSTYPES_remove_qemuall = "wic wic.bmap"
 
 DISTRO ?= "yoe-glibc-sysvinit-wayland"
 
@@ -21,15 +21,15 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
 # Define a feedserver template to be part of rootfs
 PACKAGE_FEED_URIS ??= "http://<FEEDSERVER>"
 
-
+#
 # Qemu configuration
 #
-# By default qemu will build with a builtin VNC server where graphical output can be
-# seen. The two lines below enable the SDL backend too. By default libsdl2-native will
+# By default native qemu will build with a builtin VNC server where graphical output can be
+# seen. The line below enable the SDL backend too. By default libsdl2-native will
 # be built, if you want to use your host's libSDL instead of the minimal libsdl built
 # by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
-#PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
-#PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
+#ASSUME_PROVIDED += "libsdl2-native"
 
 # Enable llvm-pipe
 PACKAGECONFIG_append_pn-mesa_qemux86 = " gallium-llvm"

conf/site.conf.sample

@@ -27,7 +27,7 @@ DISTRO = "yoe-musl-sysvinit-eglfs"
 DISTRO = "yoe-musl-sysvinit-wayland"
 DISTRO = "yoe-musl-sysvinit-x11"
 # configure docker container to run bitbake in
-export DOCKER_REPO=yoedistro/yoe-build:stretch
+export DOCKER_REPO=yoedistro/yoe-build:buster
 
 # Keep the load in control and do not issue more parallel jobs
 # when load hits 1.5 * number of cpus

envsetup.sh

@@ -387,13 +387,13 @@ yoe_clean_sstate() {
 }
 
 # Docker integration
-# set DOCKER_REPO to something like yoedistro/yoe-build:stretch
+# set DOCKER_REPO to something like yoedistro/yoe-build:buster
 # DOCKER_REPO can be set in scripts that wrap envsetup.sh
 # set DOCKER_REPO to 'none' to disable docker
 
 if [ -z "$DOCKER_REPO" ]; then
-  echo "Setting DOCKER_REPO to yoedistro/yoe-build:stretch"
-  export DOCKER_REPO=yoedistro/yoe-build:stretch
+  echo "Setting DOCKER_REPO to yoedistro/yoe-build:buster"
+  export DOCKER_REPO=yoedistro/yoe-build:buster
 fi
 
 # if we are building using docker, we don't really care what /bin/sh is since the Yoe docker images defaults
@@ -493,8 +493,12 @@ yoe_get_image_version() {
 ###############################################################################
 
 yoe_check_install_dependencies() {
-  if ! pv -V 1>/dev/null; then
-    echo "ERROR: Please install the pv utility (http://www.ivarch.com/programs/pv.shtml)"
+  if ! command -v bmaptool >& /dev/null; then
+    echo "bmaptool not installed"
+    echo "Install bmap-tools package on build host"
+    echo "debian-like - sudo apt install bmap-tools"
+    echo "Fedora like rpm-based - sudo dnf install bmap-tools"
+    echo "archlinux - yay bmap-tools"
     return 1
   fi
 }
@@ -503,7 +507,6 @@ yoe_check_install_dependencies() {
 yoe_install_image() {
   DRIVE=$1
   IMAGE_NAME=$2
-
   yoe_check_install_dependencies || return 1
 
   if [ ! $DRIVE ] || [ ! $IMAGE_NAME ]; then
@@ -514,14 +517,20 @@ yoe_install_image() {
   fi
   WICIMG="$IMAGE"
   if [ -z $WICIMG ]; then
-    WICIMG=${OE_BASE}/build/tmp/deploy/images/${MACHINE}/${IMAGE_NAME}-${MACHINE}.wic.xz
+    WICIMG=${OE_BASE}/build/tmp/deploy/images/${MACHINE}/${IMAGE_NAME}-${MACHINE}.wic
   fi
   if [ ! -e $WICIMG ]; then
     echo "$WICIMG does not exist, please build the image first"
     echo
     unset WICIMG
     return 1
   fi
-  pv -tpreb $WICIMG | xzcat | sudo dd of=$DRIVE bs=4M iflag=fullblock oflag=direct conv=fsync
+  bmaptool copy ${WICIMG} ${DRIVE}
+  if [ $? != 0 ]; then
+    echo "Please make sure\n"
+    echo "1. disk is inserted and discovered as ${DRIVE}"
+    echo "2. run 'sudo chmod 666 ${DRIVE}'"
+    echo "3. re-run yoe_install_image command"
+  fi
   unset WICIMG
 }

local.sh.example

@@ -17,4 +17,4 @@
 # export HOST_IP=10.10.10.10
 
 # configure docker container to run bitbake in
-#export DOCKER_REPO=yoedistro/yoe-build:stretch
+#export DOCKER_REPO=yoedistro/yoe-build:buster