diff options
Diffstat (limited to 'meta/recipes-bsp/v86d')
-rw-r--r-- | meta/recipes-bsp/v86d/v86d/Support-for-cross-compilation.patch | 34 | ||||
-rw-r--r-- | meta/recipes-bsp/v86d/v86d/aarch64-host.patch | 18 | ||||
-rwxr-xr-x | meta/recipes-bsp/v86d/v86d/fbsetup | 3 | ||||
-rw-r--r-- | meta/recipes-bsp/v86d/v86d/uvesafb.conf | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/v86d/v86d_0.1.10.bb | 46 |
5 files changed, 39 insertions, 64 deletions
diff --git a/meta/recipes-bsp/v86d/v86d/Support-for-cross-compilation.patch b/meta/recipes-bsp/v86d/v86d/Support-for-cross-compilation.patch new file mode 100644 index 0000000000..15f70a59aa --- /dev/null +++ b/meta/recipes-bsp/v86d/v86d/Support-for-cross-compilation.patch @@ -0,0 +1,34 @@ +From 8eda59654fd31416164c78f6068715b01767ed4e Mon Sep 17 00:00:00 2001 +From: Serhey Popovych <serhe.popovych@gmail.com> +Date: Wed, 31 Oct 2018 07:31:47 -0400 +Subject: v86d: Support for cross compilation + +It is common to build on one system for another (e.g. on IBM Power +machine for Intel x86) where HOST_ARCH (uname -m) != TARGET_ARCH. + +Take TARGET_ARCH from environment if it is given, otherwise fall back +to `uname -m`. + +Upstream-Status: Pending +Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> +--- + configure | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index cbbd6b3..046aa99 100755 +--- a/configure ++++ b/configure +@@ -23,7 +23,8 @@ copt_x86emu_type="bool" + copt_x86emu_def=auto + copt_x86emu_test() + { +- local m=`uname -m` ++ local m="${TARGET_ARCH:-$(uname -m)}" ++ + if [ "$m" = "i686" -o "$m" = "i586" -o "$m" = "i486" -o "$m" = "i386" ]; then + echo "n"; + elif [ "$m" = "x86_64" ]; then +-- +1.8.3.1 + diff --git a/meta/recipes-bsp/v86d/v86d/aarch64-host.patch b/meta/recipes-bsp/v86d/v86d/aarch64-host.patch deleted file mode 100644 index 701fed7b5d..0000000000 --- a/meta/recipes-bsp/v86d/v86d/aarch64-host.patch +++ /dev/null @@ -1,18 +0,0 @@ -Accept aarch64 as valid build host - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: v86d-0.1.10/configure -=================================================================== ---- v86d-0.1.10.orig/configure -+++ v86d-0.1.10/configure -@@ -26,7 +26,7 @@ copt_x86emu_test() - local m=`uname -m` - if [ "$m" = "i686" -o "$m" = "i586" -o "$m" = "i486" -o "$m" = "i386" ]; then - echo "n"; -- elif [ "$m" = "x86_64" ]; then -+ elif [ "$m" = "x86_64" -o "$m" = "aarch64" ]; then - echo "y"; - else - echo "It looks like your architecture '$m' isn't supported by this version of v86d." >&2 diff --git a/meta/recipes-bsp/v86d/v86d/fbsetup b/meta/recipes-bsp/v86d/v86d/fbsetup deleted file mode 100755 index 2a409cc529..0000000000 --- a/meta/recipes-bsp/v86d/v86d/fbsetup +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/sbin/modprobe uvesafb diff --git a/meta/recipes-bsp/v86d/v86d/uvesafb.conf b/meta/recipes-bsp/v86d/v86d/uvesafb.conf deleted file mode 100644 index 43789755d3..0000000000 --- a/meta/recipes-bsp/v86d/v86d/uvesafb.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Load uvesafb.ko at boot -uvesafb diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/meta/recipes-bsp/v86d/v86d_0.1.10.bb index 1046d63410..84e27d2007 100644 --- a/meta/recipes-bsp/v86d/v86d_0.1.10.bb +++ b/meta/recipes-bsp/v86d/v86d_0.1.10.bb @@ -9,25 +9,20 @@ DEPENDS = "virtual/kernel" RRECOMMENDS_${PN} = "kernel-module-uvesafb" PR = "r2" -SRC_URI = "http://distfiles.gentoo.org/distfiles/${BP}.tar.bz2 \ +SRC_URI = "http://snapshot.debian.org/archive/debian/20110427T035506Z/pool/main/v/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://Update-x86emu-from-X.org.patch \ - file://fbsetup \ - file://uvesafb.conf \ file://ar-from-env.patch \ - file://aarch64-host.patch \ + file://Support-for-cross-compilation.patch \ " -SRC_URI[md5sum] = "51c792ba7b874ad8c43f0d3da4cfabe0" -SRC_URI[sha256sum] = "634964ae18ef68c8493add2ce150e3b4502badeb0d9194b4bd81241d25e6735c" +SRC_URI[md5sum] = "889686ec8424468fe0d205742e77a4c2" +SRC_URI[sha256sum] = "93575c82e4307d8c4c370ec6b767f5cf87e527b2378146d652a6d8e25d5bdbc5" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -INITSCRIPT_NAME = "fbsetup" -INITSCRIPT_PARAMS = "start 0 S ." - do_configure () { - ./configure --with-x86emu + TARGET_ARCH="${TARGET_ARCH}" ./configure --with-x86emu } do_compile () { @@ -37,35 +32,4 @@ do_compile () { do_install () { install -d ${D}${base_sbindir} install v86d ${D}${base_sbindir}/ - - # Only install fbsetup script if 'sysvinit' is in DISTRO_FEATURES - if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/fbsetup ${D}${sysconfdir}/init.d/fbsetup - fi - - # Install systemd related configuration file - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/modules-load.d - install -m 0644 ${WORKDIR}/uvesafb.conf ${D}${sysconfdir}/modules-load.d - fi -} - -# As the recipe doesn't inherit systemd.bbclass, we need to set this variable -# manually to avoid unnecessary postinst/preinst generated. -python __anonymous() { - if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): - d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") -} - -inherit update-rc.d - -DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" -pkg_postinst_${PN} () { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then - if [ -n "$D" ]; then - OPTS="--root=$D" - fi - systemctl $OPTS mask fbsetup.service - fi } |