Using SOC_FAMILY from now on

classes/allwinner-create-wks.bbclass

@@ -17,18 +17,18 @@ wks_build() {
 EOF
 
 #### Partitions specific to sunxi images
-    if [ "${ARMBIAN_DEFCONFIG}" = "sunxi" ]; then
+    if [ "${SOC_FAMILY}" = "sun8i" ]; then
         bbnote "Creating a wks file for sunxi..."
         cat >> "$wks" <<EOF
-part SPL --source rawcopy --sourceparams="file=${SUNXI_SPL_NAME}" --ondisk ${SUNXI_STORAGE_DEVICE} --no-table --align 8
+part SPL --source rawcopy --sourceparams="file=${SPL_NAME}" --ondisk ${SUNXI_STORAGE_DEVICE} --no-table --align 8
 EOF
 
 #### Partitions specific to sunxi64 images
-    elif [ "${ARMBIAN_DEFCONFIG}" = "sunxi64" ]; then
+    elif [ "${SOC_FAMILY}" = "sun50i" ]; then
         bbnote "Creating a wks file for sunxi64..."
         cat >> "$wks" <<EOF
-part SPL --source rawcopy --sourceparams="file=${SUNXI64_SPL_NAME}" --ondisk ${SUNXI_STORAGE_DEVICE} --no-table --align 8
-part u-boot --source rawcopy --sourceparams="file=${SUNXI64_UBOOT_IMAGE}" --ondisk ${SUNXI_STORAGE_DEVICE} --no-table --align 40
+part SPL --source rawcopy --sourceparams="file=${SPL_NAME}" --ondisk ${SUNXI_STORAGE_DEVICE} --no-table --align 8
+part u-boot --source rawcopy --sourceparams="file=${UBOOT_IMAGE}" --ondisk ${SUNXI_STORAGE_DEVICE} --no-table --align 40
 EOF
     fi
 

classes/allwinner-wks-defs.inc

@@ -2,12 +2,12 @@
 #
 # Author: Dimitris Tassopoulos <dimtass@gmail.com>
 
-# sunxi8 builds a composite image for SPL and u-boot
-SUNXI_SPL_NAME = "u-boot-sunxi-with-spl.bin"
+# sun8i builds a composite image for SPL and u-boot
+SPL_NAME_sun8i = "u-boot-sunxi-with-spl.bin"
 
-# sunxi64 builds an SPL and a u-boot image
-SUNXI64_SPL_NAME = "sunxi-spl.bin"
-SUNXI64_UBOOT_IMAGE = "u-boot.itb"
+# sun50i builds an SPL and a u-boot image
+SPL_NAME_sun50i = "sunxi-spl.bin"
+UBOOT_IMAGE_sun50i = "u-boot.itb"
 
 SUNXI_BOOT_IMAGE = "boot.img"
 

conf/machine/include/sun50i.inc

-require conf/machine/include/sunxi64.inc
 require conf/machine/include/arm/arch-armv8.inc
+require conf/machine/include/soc-family.inc
+require allwinner-overlays.inc
 
 SOC_FAMILY = "sun50i"
-ARMBIAN_DEFCONFIG = "sunxi64"
\ No newline at end of file
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-video-fbturbo \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-keyboard"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
+PREFERRED_VERSION_linux-stable ?= "4.14%"
+PREFERRED_PROVIDER_u-boot ?= "u-boot"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
+PREFERRED_VERSION_u-boot ?= "v2018.05%"
+
+KERNEL_IMAGETYPE ?= "Image"
+
+IMAGE_CLASSES += "sdcard_image-sunxi"
+IMAGE_FSTYPES += "ext4 tar.gz sunxi-sdimg wic.bz2 wic.bmap"
+do_image_wic[depends] += " gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+# Build wic image after sunxi_sdimg, because we need the 'boot/img' file
+do_image_wic[recrdeptask] += " do_image_sunxi_sdimg"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
+
+UBOOT_ENTRYPOINT ?= "0x40008000"
+UBOOT_LOADADDRESS ?= "0x400080OB00"
+
+UBOOT_BINARY ?= "u-boot.itb"
+SPL_BINARY ?= "spl/sunxi-spl.bin"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
+
+KERNEL_DEVICETREE ?= "${SUNXI64_OVERLAYS} ${SUNXI_KERNEL_DEVICETREE}"
\ No newline at end of file

conf/machine/include/sun8i.inc

-require conf/machine/include/sunxi.inc
-require conf/machine/include/sunxi-mali.inc
 require conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/soc-family.inc
+require allwinner-overlays.inc
 
 SOC_FAMILY = "sun8i"
-ARMBIAN_DEFCONFIG = "sunxi"
+
+# Sub-architecture support
+MACHINE_SOCARCH_SUFFIX ?= ""
+MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-video-fbturbo \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-keyboard"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
+PREFERRED_VERSION_linux-stable ?= "4.14%"
+PREFERRED_PROVIDER_u-boot ?= "u-boot"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
+PREFERRED_VERSION_u-boot ?= "v2018.05%"
+
+KERNEL_IMAGETYPE ?= "zImage"
+
+IMAGE_CLASSES += "sdcard_image-sunxi"
+IMAGE_FSTYPES += "ext4 tar.gz sunxi-sdimg wic.bz2 wic.bmap"
+do_image_wic[depends] += " gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+# Build wic image after sunxi_sdimg, because we need the 'boot/img' file
+do_image_wic[recrdeptask] += " do_image_sunxi_sdimg"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
+
+UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
+
+UBOOT_ENTRYPOINT ?= "0x40008000"
+UBOOT_LOADADDRESS ?= "0x400080OB00"
+
+SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
+
+KERNEL_DEVICETREE ?= "${SUNXI_OVERLAYS} ${SUNXI_KERNEL_DEVICETREE}"
\ No newline at end of file

conf/machine/include/sunxi-mali.inc

-PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "sunxi-mali"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "sunxi-mali"
-PREFERRED_PROVIDER_virtual/egl ?= "sunxi-mali"
-
-XSERVER += "sunxi-mali \
-            sunxi-mali-dev"
-
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "\
- kernel-module-mali \
- kernel-module-mali-drm \
-  "

conf/machine/include/sunxi.inc

-SOC_FAMILY ??= ""
-include conf/machine/include/soc-family.inc
-require allwinner-overlays.inc
-
-# Sub-architecture support
-MACHINE_SOCARCH_SUFFIX ?= ""
-MACHINE_SOCARCH_SUFFIX_sun4i = "-sun4i"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-video-fbturbo \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-input-keyboard"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
-PREFERRED_VERSION_linux-stable ?= "4.14%"
-PREFERRED_PROVIDER_u-boot ?= "u-boot"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-PREFERRED_VERSION_u-boot ?= "v2018.05%"
-
-KERNEL_IMAGETYPE ?= "zImage"
-
-IMAGE_CLASSES += "sdcard_image-sunxi"
-IMAGE_FSTYPES += "ext4 tar.gz sunxi-sdimg wic.bz2 wic.bmap"
-do_image_wic[depends] += " gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-# Build wic image after sunxi_sdimg, because we need the 'boot/img' file
-do_image_wic[recrdeptask] += " do_image_sunxi_sdimg"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
-
-UBOOT_ENTRYPOINT ?= "0x40008000"
-UBOOT_LOADADDRESS ?= "0x400080OB00"
-
-SPL_BINARY ?= "u-boot-sunxi-with-spl.bin"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
-
-KERNEL_DEVICETREE ?= "${SUNXI_OVERLAYS} ${SUNXI_KERNEL_DEVICETREE}"
\ No newline at end of file

conf/machine/include/sunxi64.inc

-SOC_FAMILY ??= ""
-include conf/machine/include/soc-family.inc
-require allwinner-overlays.inc
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
-           xf86-video-fbturbo \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-input-keyboard"
-
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-stable"
-PREFERRED_VERSION_linux-stable ?= "4.14%"
-PREFERRED_PROVIDER_u-boot ?= "u-boot"
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-PREFERRED_VERSION_u-boot ?= "v2018.05%"
-
-KERNEL_IMAGETYPE ?= "Image"
-
-IMAGE_CLASSES += "sdcard_image-sunxi"
-IMAGE_FSTYPES += "ext4 tar.gz sunxi-sdimg wic.bz2 wic.bmap"
-do_image_wic[depends] += " gptfdisk-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
-# Build wic image after sunxi_sdimg, because we need the 'boot/img' file
-do_image_wic[recrdeptask] += " do_image_sunxi_sdimg"
-
-MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
-
-UBOOT_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
-
-UBOOT_ENTRYPOINT ?= "0x40008000"
-UBOOT_LOADADDRESS ?= "0x400080OB00"
-
-UBOOT_BINARY ?= "u-boot.itb"
-SPL_BINARY ?= "spl/sunxi-spl.bin"
-
-SERIAL_CONSOLE ?= "115200 ttyS0"
-MACHINE_FEATURES ?= "alsa apm keyboard rtc serial screen usbgadget usbhost vfat"
-
-KERNEL_DEVICETREE ?= "${SUNXI64_OVERLAYS} ${SUNXI_KERNEL_DEVICETREE}"

recipes-bsp/u-boot/u-boot_2018.05.bb

@@ -15,8 +15,8 @@ DEFAULT_PREFERENCE_sun50i="1"
 
 SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
             file://u-boot-pylibfdt-native-build.patch \
-            file://${ARMBIAN_DEFCONFIG}-boot/boot.cmd \
-            file://${ARMBIAN_DEFCONFIG}-boot/fixup.cmd \
+            file://${SOC_FAMILY}-boot/boot.cmd \
+            file://${SOC_FAMILY}-boot/fixup.cmd \
             file://do_patch.sh \
             file://patches \
             file://allwinnerEnv.txt \
@@ -39,10 +39,10 @@ EXTRA_OEMAKE_append_sun50i = " BL31=${DEPLOY_DIR_IMAGE}/bl31.bin "
 do_compile_sun50i[depends] += "atf-sunxi:do_deploy"
 
 do_compile_append() {
-    cp ${WORKDIR}/${ARMBIAN_DEFCONFIG}-boot/boot.cmd ${WORKDIR}/boot.cmd
+    cp ${WORKDIR}/${SOC_FAMILY}-boot/boot.cmd ${WORKDIR}/boot.cmd
     ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/boot.cmd ${WORKDIR}/${UBOOT_ENV_BINARY}
 
-    cp ${WORKDIR}/${ARMBIAN_DEFCONFIG}-boot/fixup.cmd ${WORKDIR}/fixup.cmd
+    cp ${WORKDIR}/${SOC_FAMILY}-boot/fixup.cmd ${WORKDIR}/fixup.cmd
     ${B}/tools/mkimage -C none -A arm -T script -d ${WORKDIR}/fixup.cmd ${WORKDIR}/${UBOOT_FIXUP_BINARY}
 }
 

recipes-graphics/libgles/sunxi-mali/0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch

-From fcdde5440976bb2c204789e13313c4d77cb263b7 Mon Sep 17 00:00:00 2001
-From: Nicolas Aguirre <aguirre.nicolas@gmail.com>
-Date: Tue, 16 Jun 2015 23:06:29 +0200
-Subject: [PATCH] Add EGLSyncKHR EGLTimeKHR and GLChar definition
-
----
- include/EGL/eglext.h | 4 +++-
- include/GLES2/gl2.h  | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/include/EGL/eglext.h b/include/EGL/eglext.h
-index 25cfcb8..ec482d8 100644
---- a/include/EGL/eglext.h
-+++ b/include/EGL/eglext.h
-@@ -36,7 +36,6 @@ extern "C" {
- /* Current version at http://www.khronos.org/registry/egl/ */
- /* $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $ */
- #define EGL_EGLEXT_VERSION 3
--
- #ifndef EGL_KHR_config_attribs
- #define EGL_KHR_config_attribs 1
- #define EGL_CONFORMANT_KHR			0x3042	/* EGLConfig attribute */
-@@ -44,6 +43,9 @@ extern "C" {
- #define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR		0x0040	/* EGL_SURFACE_TYPE bitfield */
- #endif
- 
-+typedef void *EGLSyncKHR;
-+typedef uint64_t EGLTimeKHR;
-+
- #ifndef EGL_KHR_lock_surface
- #define EGL_KHR_lock_surface 1
- #define EGL_READ_SURFACE_BIT_KHR		0x0001	/* EGL_LOCK_USAGE_HINT_KHR bitfield */
-diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h
-index 59e376c..90d96bb 100644
---- a/include/GLES2/gl2.h
-+++ b/include/GLES2/gl2.h
-@@ -32,6 +32,7 @@ typedef unsigned int     GLuint;
- typedef khronos_float_t  GLfloat;
- typedef khronos_float_t  GLclampf;
- typedef khronos_int32_t  GLfixed;
-+typedef char             GLchar;
- 
- /* GL types for handling large vertex buffer objects */
- typedef khronos_intptr_t GLintptr;
--- 
-1.9.1
-

recipes-graphics/libgles/sunxi-mali/0001-fix-test-build.patch

-From 054886253f4f559b351a94e1e6ebfd5eb504461f Mon Sep 17 00:00:00 2001
-From: Trevor Woerner <twoerner@gmail.com>
-Date: Thu, 24 Sep 2015 23:38:11 -0400
-Subject: [PATCH] fix test build
-
-Allow the test application to build and link successfully.
-
-Signed-off-by: Trevor Woerner <twoerner@gmail.com>
----
- test/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/Makefile b/test/Makefile
-index 700416e..51481c9 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -5,7 +5,7 @@ CFLAGS ?= -Wall
- all: test
- 
- test: ../config.mk test.c
--	$(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2
-+	$(CC) $(CFLAGS) -I../include -L../../image/usr/lib -o $@ test.c -lEGL -lGLESv2 -lX11
- 
- clean:
- 	rm -f test
--- 
-2.6.0.rc3
-

recipes-graphics/libgles/sunxi-mali/0002-Add-missing-GLchar-definition.patch

-From 15d91ef25234ff402f4288273989693f2d402d9d Mon Sep 17 00:00:00 2001
-From: Raoul Hecky <raoul.hecky@gmail.com>
-Date: Fri, 10 Jan 2014 14:44:53 +0100
-Subject: [PATCH] Add missing GLchar definition, some gl/gles apps needs that
- to compile correctly
-
-Build pkg-config files for gles and egl and install them
-
-Fix .pc creation
-
-add correct driver version in .pc
----
- .gitignore          |  1 +
- Makefile            |  1 +
- Makefile.pc         | 21 +++++++++++++++++++++
- egl.pc.in           | 11 +++++++++++
- gles_cm.pc.in       | 11 +++++++++++
- glesv2.pc.in        | 11 +++++++++++
- include/GLES/gl.h   |  1 +
- include/GLES2/gl2.h |  1 +
- 8 files changed, 58 insertions(+)
- create mode 100644 Makefile.pc
- create mode 100644 egl.pc.in
- create mode 100644 gles_cm.pc.in
- create mode 100644 glesv2.pc.in
-
-diff --git a/.gitignore b/.gitignore
-index 6865abf..e8a3713 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -1,2 +1,3 @@
- config.mk
- *~
-+*.pc
-diff --git a/Makefile b/Makefile
-index 60d4a0f..94845ea 100644
---- a/Makefile
-+++ b/Makefile
-@@ -21,6 +21,7 @@ clean:
- install: config.mk
- 	$(MAKE) -C lib install
- 	$(MAKE) -C include install
-+	$(MAKE) -f Makefile.pc
- 
- test: config.mk
- 	$(MAKE) -C test test
-diff --git a/Makefile.pc b/Makefile.pc
-new file mode 100644
-index 0000000..01097fd
---- /dev/null
-+++ b/Makefile.pc
-@@ -0,0 +1,21 @@
-+include Makefile.setup
-+include config.mk
-+
-+all:
-+	echo "prefix=$(prefix)" > egl.pc
-+	cat egl.pc.in >> egl.pc
-+	sed -i "s/MVERSION/$MALI_VERSION/g" egl.pc
-+	echo "prefix=$(prefix)" > gles_cm.pc
-+	cat gles_cm.pc.in >> gles_cm.pc
-+	sed -i "s/MVERSION/$MALI_VERSION/g" gles_cm.pc
-+	echo "prefix=$(prefix)" > glesv2.pc
-+	cat glesv2.pc.in >> glesv2.pc
-+	sed -i "s/MVERSION/$MALI_VERSION/g" glesv2.pc
-+
-+install: egl.pc gles_cm.pc glesv2.pc
-+	$(MKDIR) $(libdir)/pkgconfig
-+	$(INSTALL_DATA) $^ $(libdir)/pkgconfig
-+
-+clean:
-+	$(RM) egl.pc gles_cm.pc glesv2.pc
-+
-diff --git a/egl.pc.in b/egl.pc.in
-new file mode 100644
-index 0000000..0697183
---- /dev/null
-+++ b/egl.pc.in
-@@ -0,0 +1,11 @@
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: egl
-+Description: Mali EGL library
-+Requires.private:
-+Version: MVERSION
-+Libs: -L${libdir} -lEGL
-+Libs.private: -lm -lpthread -ldl
-+Cflags: -I${includedir}
-diff --git a/gles_cm.pc.in b/gles_cm.pc.in
-new file mode 100644
-index 0000000..22bc348
---- /dev/null
-+++ b/gles_cm.pc.in
-@@ -0,0 +1,11 @@
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: gles_cm
-+Description: Mali OpenGL ES 1.1 CM library
-+Requires.private:
-+Version: MVERSION
-+Libs: -L${libdir} -lGLES_CM
-+Libs.private: -lm -lpthread -ldl
-+Cflags: -I${includedir}
-diff --git a/glesv2.pc.in b/glesv2.pc.in
-new file mode 100644
-index 0000000..efef2ed
---- /dev/null
-+++ b/glesv2.pc.in
-@@ -0,0 +1,11 @@
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: glesv2
-+Description: Mali OpenGL ES 2.0 library
-+Requires.private:
-+Version: MVERSION
-+Libs: -L${libdir} -lGLESv2
-+Libs.private: -lm -lpthread -ldl
-+Cflags: -I${includedir}
-diff --git a/include/GLES/gl.h b/include/GLES/gl.h
-index 858f394..a6bb591 100644
---- a/include/GLES/gl.h
-+++ b/include/GLES/gl.h
-@@ -29,6 +29,7 @@ typedef float  GLfloat;
- typedef float  GLclampf;
- typedef signed int  GLfixed;
- typedef signed int  GLclampx;
-+typedef char GLchar;
- 
- typedef int * GLintptr;
- typedef int *  GLsizeiptr;

recipes-graphics/libgles/sunxi-mali/0003-Fix-sed-to-replace-by-the-correct-var.patch

-From 95bbd40135f96b473d4c713317e485d0049580cd Mon Sep 17 00:00:00 2001
-From: Raoul Hecky <raoul.hecky@gmail.com>
-Date: Tue, 8 Apr 2014 08:10:12 +0200
-Subject: [PATCH] Fix sed to replace by the correct var
-
----
- Makefile.pc | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.pc b/Makefile.pc
-index 01097fd..c51d18c 100644
---- a/Makefile.pc
-+++ b/Makefile.pc
-@@ -4,13 +4,13 @@ include config.mk
- all:
- 	echo "prefix=$(prefix)" > egl.pc
- 	cat egl.pc.in >> egl.pc
--	sed -i "s/MVERSION/$MALI_VERSION/g" egl.pc
-+	sed -i "s/MVERSION/${MALI_VERSION}/g" egl.pc
- 	echo "prefix=$(prefix)" > gles_cm.pc
- 	cat gles_cm.pc.in >> gles_cm.pc
--	sed -i "s/MVERSION/$MALI_VERSION/g" gles_cm.pc
-+	sed -i "s/MVERSION/${MALI_VERSION}/g" gles_cm.pc
- 	echo "prefix=$(prefix)" > glesv2.pc
- 	cat glesv2.pc.in >> glesv2.pc
--	sed -i "s/MVERSION/$MALI_VERSION/g" glesv2.pc
-+	sed -i "s/MVERSION/${MALI_VERSION}/g" glesv2.pc
- 
- install: egl.pc gles_cm.pc glesv2.pc
- 	$(MKDIR) $(libdir)/pkgconfig

recipes-graphics/libgles/sunxi-mali_git.bb

-DESCRIPTION = "libGLES for the A10/A13 Allwinner processor with Mali 400 (X11)"
-
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://README;md5=1b81a178e80ee888ee4571772699ab2c"
-
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i)"
-
-# These libraries shouldn't get installed in world builds unless something
-# explicitly depends upon them.
-EXCLUDE_FROM_WORLD = "1"
-PROVIDES = "virtual/libgles1 virtual/libgles2 virtual/egl"
-
-# There's only hardfp version available
-python __anonymous() {
-    tunes = d.getVar("TUNE_FEATURES", True)
-    if not tunes:
-        return
-    if "callconvention-hard" not in tunes:
-        pkgn = d.getVar("PN", True)
-        pkgv = d.getVar("PV", True)
-        raise bb.parse.SkipPackage("%s-%s ONLY supports hardfp mode for now" % (pkgn, pkgv))
-}
-
-SRCREV_pn-${PN} = "d343311efc8db166d8371b28494f0f27b6a58724"
-SRC_URI = "gitsm://github.com/linux-sunxi/sunxi-mali.git \
-           file://0001-Add-EGLSyncKHR-EGLTimeKHR-and-GLChar-definition.patch \
-           file://0002-Add-missing-GLchar-definition.patch \
-           file://0003-Fix-sed-to-replace-by-the-correct-var.patch \
-           file://0001-fix-test-build.patch \
-           "
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "libdrm dri2proto libump"
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
-PACKAGECONFIG[wayland] = "EGL_TYPE=framebuffer,,,"
-PACKAGECONFIG[x11] = "EGL_TYPE=x11,,virtual/libx11 libxau libxdmcp libdri2,"
-
-# Inhibit warnings about files being stripped, we can't do anything about it.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_SYSROOT_STRIP = "1"
-
-do_configure() {
-         DESTDIR=${D}/ VERSION=r3p0 ABI=armhf make ${EXTRA_OEMAKE} config
-}
-
-do_install() {
-    make -f Makefile.pc
-
-    # install headers
-    install -d -m 0755 ${D}${includedir}/EGL
-    install -m 0755 ${S}/include/EGL/*.h ${D}${includedir}/EGL/
-    install -d -m 0755 ${D}${includedir}/GLES
-    install -m 0755 ${S}/include/GLES/*.h ${D}${includedir}/GLES/
-    install -d -m 0755 ${D}${includedir}/GLES2
-    install -m 0755 ${S}/include/GLES2/*.h ${D}${includedir}/GLES2/
-    install -d -m 0755 ${D}${includedir}/KHR
-    install -m 0755 ${S}/include/KHR/*.h ${D}${includedir}/KHR/
-
-    # Copy the .pc files
-    install -d -m 0755 ${D}${libdir}/pkgconfig
-    install -m 0644 ${S}/egl.pc ${D}${libdir}/pkgconfig/
-    install -m 0644 ${S}/gles_cm.pc ${D}${libdir}/pkgconfig/
-    install -m 0644 ${S}/glesv2.pc ${D}${libdir}/pkgconfig/
-
-    install -d ${D}${libdir}
-    install -d ${D}${includedir}
-
-    make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install
-    make libdir=${D}${libdir}/ includedir=${D}${includedir}/ install -C include
-
-    # Fix .so name and create symlinks, binary package provides .so wich can't be included directly in package without triggering the 'dev-so' QA check
-    # Packages like xf86-video-fbturbo dlopen() libUMP.so, so we do need to ship the .so files in ${PN}
-
-    mv ${D}${libdir}/libMali.so ${D}${libdir}/libMali.so.3
-    ln -sf libMali.so.3 ${D}${libdir}/libMali.so
-
-    for flib in libEGL.so.1.4 libGLESv1_CM.so.1.1 libGLESv2.so.2.0 ; do
-        rm ${D}${libdir}/$flib
-        ln -sf libMali.so.3 ${D}${libdir}/$flib
-    done
-
-    DESTDIR=${D}/ VERSION=r3p0 ABI=armhf make ${EXTRA_OEMAKE} test
-    install -d ${D}${bindir}
-    install -m 0755 ${S}/test/test ${D}${bindir}/sunximali-test
-}
-
-# Packages like xf86-video-fbturbo dlopen() libUMP.so, so we do need to ship the .so files in ${PN}
-PACKAGES =+ "${PN}-test"
-
-RPROVIDES_${PN} += "libGLESv2.so libEGL.so libGLESv2.so libGLESv1_CM.so libMali.so"
-RDEPENDS_${PN}-test = "${PN}"
-
-FILES_${PN} += "${libdir}/lib*.so"
-FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig/*"
-FILES_${PN}-test = "${bindir}/sunximali-test"
-
-# These are closed binaries generated elsewhere so don't check ldflags & text relocations
-INSANE_SKIP_${PN} = "dev-so ldflags textrel"
-INSANE_SKIP_${PN}-test = "dev-so ldflags textrel"

recipes-kernel/linux/linux-stable-rt_4.14.bb

@@ -27,20 +27,20 @@ SRC_URI = " \
         file://do_patch.sh \
         file://patches \
         file://patch-4.14.71-rt44 \
-        file://${ARMBIAN_DEFCONFIG}-rt-defconfig/defconfig \
+        file://${SOC_FAMILY}-rt-defconfig/defconfig \
 "
 
 do_patch_append() {
-    bbinfo "Will use ${ARMBIAN_DEFCONFIG}-rt-defconfig for the kernel"
-    cp ${WORKDIR}/${ARMBIAN_DEFCONFIG}-rt-defconfig/defconfig ${WORKDIR}/defconfig
+    bbinfo "Will use ${SOC_FAMILY}-rt-defconfig for the kernel"
+    cp ${WORKDIR}/${SOC_FAMILY}-rt-defconfig/defconfig ${WORKDIR}/defconfig
     cd ${WORKDIR}/git
     ${WORKDIR}/do_patch.sh ${WORKDIR}/patch-4.14.71-rt44
     ${WORKDIR}/do_patch.sh ${WORKDIR}/patches
 }
 
 python() {
-    if not d.getVar('ARMBIAN_DEFCONFIG'):
-        bb.fatal("You need to set 'ARMBIAN_DEFCONFIG' in your local.conf file to 'sunxi' or 'sunxi64' depending your board.")
+    if not d.getVar('SOC_FAMILY'):
+        bb.fatal("You need to set 'SOC_FAMILY' in your local.conf file to 'sunxi' or 'sunxi64' depending your board.")
     else:
-        bb.note("%s-defconfig/defconfig will be used for the kernel." % (d.getVar('ARMBIAN_DEFCONFIG')))
+        bb.note("%s-defconfig/defconfig will be used for the kernel." % (d.getVar('SOC_FAMILY')))
 }

recipes-kernel/linux/linux-stable_4.14.bb

@@ -26,18 +26,18 @@ SRC_URI = " \
         git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;branch=linux-${LINUX_VERSION}.y \
         file://do_patch.sh \
         file://patches \
-        file://${ARMBIAN_DEFCONFIG}-defconfig/defconfig \
+        file://${SOC_FAMILY}-defconfig/defconfig \
 "
 
 do_patch_append() {
-    cp ${WORKDIR}/${ARMBIAN_DEFCONFIG}-defconfig/defconfig ${WORKDIR}/defconfig
+    cp ${WORKDIR}/${SOC_FAMILY}-defconfig/defconfig ${WORKDIR}/defconfig
     cd ${WORKDIR}/git
     ${WORKDIR}/do_patch.sh ${WORKDIR}/patches
 }
 
 python() {
-    if not d.getVar('ARMBIAN_DEFCONFIG'):
-        bb.fatal("You need to set 'ARMBIAN_DEFCONFIG' in your local.conf file to 'sunxi' or 'sunxi64' depending your board.")
+    if not d.getVar('SOC_FAMILY'):
+        bb.fatal("You need to set 'SOC_FAMILY' in your local.conf file to 'sunxi' or 'sunxi64' depending your board.")
     else:
-        bb.note("%s-defconfig/defconfig will be used for the kernel." % (d.getVar('ARMBIAN_DEFCONFIG')))
+        bb.note("%s-defconfig/defconfig will be used for the kernel." % (d.getVar('SOC_FAMILY')))
 }
\ No newline at end of file