summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-poky/conf/distro/include/gcsections.inc44
-rw-r--r--meta-poky/conf/distro/include/poky-distro-alt-test-config.inc4
-rw-r--r--meta-poky/conf/distro/include/poky-floating-revisions.inc60
-rw-r--r--meta-poky/conf/distro/poky-altcfg.conf2
-rw-r--r--meta-poky/conf/distro/poky-tiny.conf14
-rw-r--r--meta-poky/conf/local.conf.sample2
-rw-r--r--meta-poky/conf/local.conf.sample.extended4
-rw-r--r--meta-poky/recipes-core/busybox/busybox_%.bbappend2
-rw-r--r--meta-poky/recipes-core/psplash/psplash_git.bbappend2
-rw-r--r--meta-poky/recipes-core/tiny-init/tiny-init.bb6
-rw-r--r--meta-yocto-bsp/conf/machine/beaglebone-yocto.conf4
-rw-r--r--meta-yocto-bsp/conf/machine/include/genericx86-common.inc2
-rw-r--r--meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend2
-rw-r--r--meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb2
-rw-r--r--meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend2
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend22
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend38
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend38
18 files changed, 125 insertions, 125 deletions
diff --git a/meta-poky/conf/distro/include/gcsections.inc b/meta-poky/conf/distro/include/gcsections.inc
index 7157373aa8..886a005b34 100644
--- a/meta-poky/conf/distro/include/gcsections.inc
+++ b/meta-poky/conf/distro/include/gcsections.inc
@@ -2,31 +2,31 @@ CFLAGS_SECTION_REMOVAL = "-ffunction-sections -fdata-sections"
2LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections" 2LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections"
3 3
4# packages with build problems using sections 4# packages with build problems using sections
5CFLAGS_SECTION_REMOVAL_pn-glibc = "" 5CFLAGS_SECTION_REMOVAL:pn-glibc = ""
6LDFLAGS_SECTION_REMOVAL_pn-glibc = "" 6LDFLAGS_SECTION_REMOVAL:pn-glibc = ""
7CFLAGS_SECTION_REMOVAL_pn-cairo = "" 7CFLAGS_SECTION_REMOVAL:pn-cairo = ""
8LDFLAGS_SECTION_REMOVAL_pn-cairo = "" 8LDFLAGS_SECTION_REMOVAL:pn-cairo = ""
9CFLAGS_SECTION_REMOVAL_pn-perl = "" 9CFLAGS_SECTION_REMOVAL:pn-perl = ""
10LDFLAGS_SECTION_REMOVAL_pn-perl = "" 10LDFLAGS_SECTION_REMOVAL:pn-perl = ""
11CFLAGS_SECTION_REMOVAL_pn-grub-efi = "" 11CFLAGS_SECTION_REMOVAL:pn-grub-efi = ""
12LDFLAGS_SECTION_REMOVAL_pn-grub-efi = "" 12LDFLAGS_SECTION_REMOVAL:pn-grub-efi = ""
13CFLAGS_SECTION_REMOVAL_pn-grub = "" 13CFLAGS_SECTION_REMOVAL:pn-grub = ""
14LDFLAGS_SECTION_REMOVAL_pn-grub = "" 14LDFLAGS_SECTION_REMOVAL:pn-grub = ""
15 15
16# SDK packages with build problems using sections 16# SDK packages with build problems using sections
17CFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" 17CFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = ""
18LDFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" 18LDFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = ""
19CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" 19CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = ""
20LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" 20LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = ""
21CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" 21CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = ""
22LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" 22LDFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = ""
23CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" 23CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = ""
24LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" 24LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = ""
25 25
26# set default for target 26# set default for target
27CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" 27CFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}"
28LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" 28LDFLAGS:append:class-target = " ${LDFLAGS_SECTION_REMOVAL}"
29 29
30# set default for nativesdk 30# set default for nativesdk
31CFLAGS_append_class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" 31CFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}"
32LDFLAGS_append_class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" 32LDFLAGS:append:class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}"
diff --git a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
index 273ebfdfef..9c2d7753a1 100644
--- a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
+++ b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc
@@ -1,8 +1,8 @@
1# Add an extra DISTRO_FEATURE 1# Add an extra DISTRO_FEATURE
2DISTRO_FEATURES_append = " pam" 2DISTRO_FEATURES:append = " pam"
3 3
4# Use the LTSI Kernel 4# Use the LTSI Kernel
5PREFERRED_VERSION_linux-yocto = "5.4%" 5PREFERRED_VERSION_linux-yocto = "5.4%"
6 6
7# Ensure the kernel nfs server is enabled 7# Ensure the kernel nfs server is enabled
8KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" 8KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"
diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc
index 4812959fb7..78c9e365ec 100644
--- a/meta-poky/conf/distro/include/poky-floating-revisions.inc
+++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc
@@ -7,45 +7,45 @@
7#SRCREV_pn-opkg ?= "${AUTOREV}" 7#SRCREV_pn-opkg ?= "${AUTOREV}"
8#SRCREV_pn-opkg-utils-native ?= "${AUTOREV}" 8#SRCREV_pn-opkg-utils-native ?= "${AUTOREV}"
9#SRCREV_pn-opkg-utils ?= "${AUTOREV}" 9#SRCREV_pn-opkg-utils ?= "${AUTOREV}"
10SRCREV_pn-gconf-dbus ?= "${AUTOREV}" 10SRCREV:pn-gconf-dbus ?= "${AUTOREV}"
11SRCREV_pn-matchbox-common ?= "${AUTOREV}" 11SRCREV:pn-matchbox-common ?= "${AUTOREV}"
12SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}" 12SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}"
13SRCREV_pn-matchbox-desktop ?= "${AUTOREV}" 13SRCREV:pn-matchbox-desktop ?= "${AUTOREV}"
14SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}" 14SRCREV:pn-matchbox-keyboard ?= "${AUTOREV}"
15SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}" 15SRCREV:pn-matchbox-panel-2 ?= "${AUTOREV}"
16SRCREV_pn-matchbox-themes-extra ?= "${AUTOREV}" 16SRCREV:pn-matchbox-themes-extra ?= "${AUTOREV}"
17SRCREV_pn-matchbox-terminal ?= "${AUTOREV}" 17SRCREV:pn-matchbox-terminal ?= "${AUTOREV}"
18SRCREV_pn-matchbox-wm ?= "${AUTOREV}" 18SRCREV:pn-matchbox-wm ?= "${AUTOREV}"
19SRCREV_pn-settings-daemon ?= "${AUTOREV}" 19SRCREV:pn-settings-daemon ?= "${AUTOREV}"
20SRCREV_pn-screenshot ?= "${AUTOREV}" 20SRCREV:pn-screenshot ?= "${AUTOREV}"
21SRCREV_pn-libfakekey ?= "${AUTOREV}" 21SRCREV:pn-libfakekey ?= "${AUTOREV}"
22SRCREV_pn-psplash ?= "${AUTOREV}" 22SRCREV:pn-psplash ?= "${AUTOREV}"
23SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}" 23SRCREV:pn-gtk-sato-engine ?= "${AUTOREV}"
24SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}" 24SRCREV:pn-matchbox-theme-sato ?= "${AUTOREV}"
25SRCREV_pn-sato-icon-theme ?= "${AUTOREV}" 25SRCREV:pn-sato-icon-theme ?= "${AUTOREV}"
26SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}" 26SRCREV:pn-matchbox-desktop-sato ?= "${AUTOREV}"
27SRCREV_pn-oh-puzzles ?= "${AUTOREV}" 27SRCREV:pn-oh-puzzles ?= "${AUTOREV}"
28SRCREV_pn-libowl ?= "${AUTOREV}" 28SRCREV:pn-libowl ?= "${AUTOREV}"
29SRCREV_pn-libmatchbox ?= "${AUTOREV}" 29SRCREV:pn-libmatchbox ?= "${AUTOREV}"
30SRCREV_pn-ofono ?= "${AUTOREV}" 30SRCREV:pn-ofono ?= "${AUTOREV}"
31 31
32SRCREV_pn-dri2proto = "${AUTOREV}" 32SRCREV:pn-dri2proto = "${AUTOREV}"
33#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" 33#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%"
34SRCREV_pn-libdrm = "${AUTOREV}" 34SRCREV:pn-libdrm = "${AUTOREV}"
35#PREFERRED_VERSION_libdrm ?= "2.4.0+git%" 35#PREFERRED_VERSION_libdrm ?= "2.4.0+git%"
36SRCREV_pn-libxcb = "${AUTOREV}" 36SRCREV:pn-libxcb = "${AUTOREV}"
37#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" 37#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%"
38SRCREV_pn-lib-proto = "${AUTOREV}" 38SRCREV:pn-lib-proto = "${AUTOREV}"
39#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" 39#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%"
40SRCREV_pn-libxcb-sdk = "${AUTOREV}" 40SRCREV:pn-libxcb-sdk = "${AUTOREV}"
41#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" 41#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%"
42SRCREV_pn-xf86-input-evdev = "${AUTOREV}" 42SRCREV:pn-xf86-input-evdev = "${AUTOREV}"
43#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" 43#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
44SRCREV_pn-xf86-input-mouse = "${AUTOREV}" 44SRCREV:pn-xf86-input-mouse = "${AUTOREV}"
45#PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" 45#PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%"
46SRCREV_pn-xf86-input-keyboard = "${AUTOREV}" 46SRCREV:pn-xf86-input-keyboard = "${AUTOREV}"
47#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" 47#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%"
48SRCREV_pn-xf86-input-synaptics = "${AUTOREV}" 48SRCREV:pn-xf86-input-synaptics = "${AUTOREV}"
49#PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" 49#PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%"
50 50
51#SRCDATE_oprofile ?= "${DATE}" 51#SRCDATE_oprofile ?= "${DATE}"
diff --git a/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf
index 177bf8d184..fbfabecd9d 100644
--- a/meta-poky/conf/distro/poky-altcfg.conf
+++ b/meta-poky/conf/distro/poky-altcfg.conf
@@ -10,6 +10,6 @@ DISTROOVERRIDES = "poky:poky-altcfg"
10 10
11INIT_MANAGER ?= "systemd" 11INIT_MANAGER ?= "systemd"
12# systemd isn't suitable with musl 12# systemd isn't suitable with musl
13INIT_MANAGER_libc-musl ?= "sysvinit" 13INIT_MANAGER:libc-musl ?= "sysvinit"
14 14
15require conf/distro/include/poky-distro-alt-test-config.inc 15require conf/distro/include/poky-distro-alt-test-config.inc
diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf
index 8545341d84..80fb368142 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -57,7 +57,7 @@ TCLIBCAPPEND = ""
57# in the LIBC features below. 57# in the LIBC features below.
58# Leave native enable to avoid build failures 58# Leave native enable to avoid build failures
59ENABLE_WIDEC = "false" 59ENABLE_WIDEC = "false"
60ENABLE_WIDEC_class-native = "true" 60ENABLE_WIDEC:class-native = "true"
61 61
62# Drop native language support. This removes the 62# Drop native language support. This removes the
63# eglibc->bash->gettext->libc-posix-clang-wchar dependency. 63# eglibc->bash->gettext->libc-posix-clang-wchar dependency.
@@ -80,11 +80,11 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \
80 " 80 "
81 81
82# Enable LFS - see bug YOCTO #5865 82# Enable LFS - see bug YOCTO #5865
83DISTRO_FEATURES_append_libc-uclibc = " largefile" 83DISTRO_FEATURES:append_libc-uclibc = " largefile"
84DISTRO_FEATURES_append_libc-musl = " largefile" 84DISTRO_FEATURES:append:libc-musl = " largefile"
85 85
86DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" 86DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
87DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" 87DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
88 88
89# enable mdev/busybox for init 89# enable mdev/busybox for init
90INIT_MANAGER ?= "mdev-busybox" 90INIT_MANAGER ?= "mdev-busybox"
@@ -111,7 +111,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = ""
111# The mtrace script included by eglibc is a perl script. This means the system 111# The mtrace script included by eglibc is a perl script. This means the system
112# will build perl in case this package is installed. Since we don't care about 112# will build perl in case this package is installed. Since we don't care about
113# this script for the purposes of tiny, remove the dependency from here. 113# this script for the purposes of tiny, remove the dependency from here.
114RDEPENDS_${PN}-mtrace_pn-eglibc = "" 114RDEPENDS:${PN}-mtrace:pn-eglibc = ""
115 115
116PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" 116PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny"
117PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" 117PNBLACKLIST[core-image-base] = "not buildable with poky-tiny"
@@ -125,4 +125,4 @@ PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny"
125PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" 125PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny"
126 126
127# Disable python usage in opkg-utils since it won't build with tiny config 127# Disable python usage in opkg-utils since it won't build with tiny config
128PACKAGECONFIG_remove_pn-opkg-utils = "python" 128PACKAGECONFIG:remove:pn-opkg-utils = "python"
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample
index fb14379d28..53766d1a9b 100644
--- a/meta-poky/conf/local.conf.sample
+++ b/meta-poky/conf/local.conf.sample
@@ -235,7 +235,7 @@ BB_DISKMON_DIRS ??= "\
235# 235#
236# By default native qemu will build with a builtin VNC server where graphical output can be 236# By default native qemu will build with a builtin VNC server where graphical output can be
237# seen. The line below enables the SDL UI frontend too. 237# seen. The line below enables the SDL UI frontend too.
238PACKAGECONFIG_append_pn-qemu-system-native = " sdl" 238PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
239# By default libsdl2-native will be built, if you want to use your host's libSDL instead of 239# By default libsdl2-native will be built, if you want to use your host's libSDL instead of
240# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. 240# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
241#ASSUME_PROVIDED += "libsdl2-native" 241#ASSUME_PROVIDED += "libsdl2-native"
diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/local.conf.sample.extended
index a670c74001..d3a0f762bc 100644
--- a/meta-poky/conf/local.conf.sample.extended
+++ b/meta-poky/conf/local.conf.sample.extended
@@ -33,8 +33,8 @@
33 33
34# If you want to get an image based on directfb without x11 alter 34# If you want to get an image based on directfb without x11 alter
35# DISTRO_FEATURES: 35# DISTRO_FEATURES:
36DISTRO_FEATURES_append = " directfb" 36DISTRO_FEATURES:append = " directfb"
37DISTRO_FEATURES_remove = "x11" 37DISTRO_FEATURES:remove = "x11"
38 38
39# ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale 39# ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
40# packages at build time using qemu-native. Disabling it (by setting it to 0) 40# packages at build time using qemu-native. Disabling it (by setting it to 0)
diff --git a/meta-poky/recipes-core/busybox/busybox_%.bbappend b/meta-poky/recipes-core/busybox/busybox_%.bbappend
index 000578744a..46dfc12456 100644
--- a/meta-poky/recipes-core/busybox/busybox_%.bbappend
+++ b/meta-poky/recipes-core/busybox/busybox_%.bbappend
@@ -1,2 +1,2 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" 1FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
2 2
diff --git a/meta-poky/recipes-core/psplash/psplash_git.bbappend b/meta-poky/recipes-core/psplash/psplash_git.bbappend
index 433ef66977..1533b13c3e 100644
--- a/meta-poky/recipes-core/psplash/psplash_git.bbappend
+++ b/meta-poky/recipes-core/psplash/psplash_git.bbappend
@@ -1,2 +1,2 @@
1FILESEXTRAPATHS_prepend_poky := "${THISDIR}/files:" 1FILESEXTRAPATHS:prepend:poky := "${THISDIR}/files:"
2 2
diff --git a/meta-poky/recipes-core/tiny-init/tiny-init.bb b/meta-poky/recipes-core/tiny-init/tiny-init.bb
index 44c8e1bf5e..1de4f5e715 100644
--- a/meta-poky/recipes-core/tiny-init/tiny-init.bb
+++ b/meta-poky/recipes-core/tiny-init/tiny-init.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
5 5
6PR = "r2" 6PR = "r2"
7 7
8RDEPENDS_${PN} = "busybox" 8RDEPENDS:${PN} = "busybox"
9 9
10SRC_URI = "file://init \ 10SRC_URI = "file://init \
11 file://rc.local.sample \ 11 file://rc.local.sample \
@@ -27,5 +27,5 @@ do_install() {
27 install -m 0755 ${WORKDIR}/rc.local.sample ${D}${sysconfdir} 27 install -m 0755 ${WORKDIR}/rc.local.sample ${D}${sysconfdir}
28} 28}
29 29
30FILES_${PN} = "/init ${sysconfdir}/rc.local.sample" 30FILES:${PN} = "/init ${sysconfdir}/rc.local.sample"
31RCONFLICTS_${PN} = "systemd" 31RCONFLICTS:${PN} = "systemd"
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index 04cbd3b5b7..65c79fd34d 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -15,9 +15,9 @@ DEFAULTTUNE ?= "cortexa8hf-neon"
15include conf/machine/include/tune-cortexa8.inc 15include conf/machine/include/tune-cortexa8.inc
16 16
17IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap" 17IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
18EXTRA_IMAGECMD_jffs2 = "-lnp " 18EXTRA_IMAGECMD:jffs2 = "-lnp "
19WKS_FILE ?= "beaglebone-yocto.wks" 19WKS_FILE ?= "beaglebone-yocto.wks"
20IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage" 20IMAGE_INSTALL:append = " kernel-devicetree kernel-image-zimage"
21do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy" 21do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy"
22 22
23SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0" 23SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index 1de069011d..59d96d1417 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -18,7 +18,7 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules linux-firmware"
18 18
19GLIBC_ADDONS = "nptl" 19GLIBC_ADDONS = "nptl"
20 20
21EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" 21EXTRA_OECONF:append:pn-matchbox-panel-2 = " --with-battery=acpi"
22 22
23IMAGE_FSTYPES += "wic wic.bmap" 23IMAGE_FSTYPES += "wic wic.bmap"
24WKS_FILE ?= "genericx86.wks.in" 24WKS_FILE ?= "genericx86.wks.in"
diff --git a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
index 72d991c7e5..4fc41d0580 100644
--- a/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ b/meta-yocto-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
index 8f10bd239c..1fe1212419 100644
--- a/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
+++ b/meta-yocto-bsp/recipes-bsp/gma500-gfx-check/gma500-gfx-check_1.0.bb
@@ -12,7 +12,7 @@ do_install(){
12 install -m 644 ${WORKDIR}/gma500-gfx-check.conf ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.conf 12 install -m 644 ${WORKDIR}/gma500-gfx-check.conf ${D}${sysconfdir}/modprobe.d/gma500-gfx-check.conf
13} 13}
14 14
15FILES_${PN}="${sysconfdir}/modprobe.d/gma500-gfx-check.conf \ 15FILES:${PN}="${sysconfdir}/modprobe.d/gma500-gfx-check.conf \
16 ${sysconfdir}/modprobe.d/gma500-gfx-check.sh" 16 ${sysconfdir}/modprobe.d/gma500-gfx-check.sh"
17 17
18COMPATIBLE_MACHINE = "genericx86" 18COMPATIBLE_MACHINE = "genericx86"
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
index 72d991c7e5..4fc41d0580 100644
--- a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ b/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
@@ -1 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend
index 6e5a129dd4..a90958f546 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,13 +1,13 @@
1KBRANCH_genericx86 = "standard/base" 1KBRANCH:genericx86 = "standard/base"
2KBRANCH_genericx86-64 = "standard/base" 2KBRANCH:genericx86-64 = "standard/base"
3KBRANCH_edgerouter = "standard/edgerouter" 3KBRANCH:edgerouter = "standard/edgerouter"
4KBRANCH_beaglebone-yocto = "standard/beaglebone" 4KBRANCH:beaglebone-yocto = "standard/beaglebone"
5 5
6KMACHINE_genericx86 ?= "common-pc" 6KMACHINE:genericx86 ?= "common-pc"
7KMACHINE_genericx86-64 ?= "common-pc-64" 7KMACHINE:genericx86-64 ?= "common-pc-64"
8KMACHINE_beaglebone-yocto ?= "beaglebone" 8KMACHINE:beaglebone-yocto ?= "beaglebone"
9 9
10COMPATIBLE_MACHINE_genericx86 = "genericx86" 10COMPATIBLE_MACHINE:genericx86 = "genericx86"
11COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 11COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
12COMPATIBLE_MACHINE_edgerouter = "edgerouter" 12COMPATIBLE_MACHINE:edgerouter = "edgerouter"
13COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" 13COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend
index f8362b6635..0b017fc79d 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.10.bbappend
@@ -1,23 +1,23 @@
1KBRANCH_genericx86 = "v5.10/standard/base" 1KBRANCH:genericx86 = "v5.10/standard/base"
2KBRANCH_genericx86-64 = "v5.10/standard/base" 2KBRANCH:genericx86-64 = "v5.10/standard/base"
3KBRANCH_edgerouter = "v5.10/standard/edgerouter" 3KBRANCH:edgerouter = "v5.10/standard/edgerouter"
4KBRANCH_beaglebone-yocto = "v5.10/standard/beaglebone" 4KBRANCH:beaglebone-yocto = "v5.10/standard/beaglebone"
5 5
6KMACHINE_genericx86 ?= "common-pc" 6KMACHINE:genericx86 ?= "common-pc"
7KMACHINE_genericx86-64 ?= "common-pc-64" 7KMACHINE:genericx86-64 ?= "common-pc-64"
8KMACHINE_beaglebone-yocto ?= "beaglebone" 8KMACHINE:beaglebone-yocto ?= "beaglebone"
9 9
10SRCREV_machine_genericx86 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" 10SRCREV_machine:genericx86 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41"
11SRCREV_machine_genericx86-64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" 11SRCREV_machine:genericx86-64 ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41"
12SRCREV_machine_edgerouter ?= "274d63799465eebfd201b3e8251f16d29e93a978" 12SRCREV_machine:edgerouter ?= "274d63799465eebfd201b3e8251f16d29e93a978"
13SRCREV_machine_beaglebone-yocto ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41" 13SRCREV_machine:beaglebone-yocto ?= "ab49d2db98bdee2c8c6e17fb59ded9e5292b0f41"
14 14
15COMPATIBLE_MACHINE_genericx86 = "genericx86" 15COMPATIBLE_MACHINE:genericx86 = "genericx86"
16COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 16COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
17COMPATIBLE_MACHINE_edgerouter = "edgerouter" 17COMPATIBLE_MACHINE:edgerouter = "edgerouter"
18COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" 18COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
19 19
20LINUX_VERSION_genericx86 = "5.10.43" 20LINUX_VERSION:genericx86 = "5.10.43"
21LINUX_VERSION_genericx86-64 = "5.10.43" 21LINUX_VERSION:genericx86-64 = "5.10.43"
22LINUX_VERSION_edgerouter = "5.10.43" 22LINUX_VERSION:edgerouter = "5.10.43"
23LINUX_VERSION_beaglebone-yocto = "5.10.43" 23LINUX_VERSION:beaglebone-yocto = "5.10.43"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
index 35147d2da8..290aa323eb 100644
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.4.bbappend
@@ -1,23 +1,23 @@
1KBRANCH_genericx86 = "v5.4/standard/base" 1KBRANCH:genericx86 = "v5.4/standard/base"
2KBRANCH_genericx86-64 = "v5.4/standard/base" 2KBRANCH:genericx86-64 = "v5.4/standard/base"
3KBRANCH_edgerouter = "v5.4/standard/edgerouter" 3KBRANCH:edgerouter = "v5.4/standard/edgerouter"
4KBRANCH_beaglebone-yocto = "v5.4/standard/beaglebone" 4KBRANCH:beaglebone-yocto = "v5.4/standard/beaglebone"
5 5
6KMACHINE_genericx86 ?= "common-pc" 6KMACHINE:genericx86 ?= "common-pc"
7KMACHINE_genericx86-64 ?= "common-pc-64" 7KMACHINE:genericx86-64 ?= "common-pc-64"
8KMACHINE_beaglebone-yocto ?= "beaglebone" 8KMACHINE:beaglebone-yocto ?= "beaglebone"
9 9
10SRCREV_machine_genericx86 ?= "31db2b47ac7d8508080fbb7344399b501216de66" 10SRCREV_machine:genericx86 ?= "31db2b47ac7d8508080fbb7344399b501216de66"
11SRCREV_machine_genericx86-64 ?= "31db2b47ac7d8508080fbb7344399b501216de66" 11SRCREV_machine:genericx86-64 ?= "31db2b47ac7d8508080fbb7344399b501216de66"
12SRCREV_machine_edgerouter ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" 12SRCREV_machine:edgerouter ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
13SRCREV_machine_beaglebone-yocto ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd" 13SRCREV_machine:beaglebone-yocto ?= "706efec4c1e270ec5dda92275898cd465dfdc7dd"
14 14
15COMPATIBLE_MACHINE_genericx86 = "genericx86" 15COMPATIBLE_MACHINE:genericx86 = "genericx86"
16COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" 16COMPATIBLE_MACHINE:genericx86-64 = "genericx86-64"
17COMPATIBLE_MACHINE_edgerouter = "edgerouter" 17COMPATIBLE_MACHINE:edgerouter = "edgerouter"
18COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto" 18COMPATIBLE_MACHINE:beaglebone-yocto = "beaglebone-yocto"
19 19
20LINUX_VERSION_genericx86 = "5.4.94" 20LINUX_VERSION:genericx86 = "5.4.94"
21LINUX_VERSION_genericx86-64 = "5.4.94" 21LINUX_VERSION:genericx86-64 = "5.4.94"
22LINUX_VERSION_edgerouter = "5.4.58" 22LINUX_VERSION:edgerouter = "5.4.58"
23LINUX_VERSION_beaglebone-yocto = "5.4.58" 23LINUX_VERSION:beaglebone-yocto = "5.4.58"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 22:26:33 +0000