[yocto] [meta-qt4][PATCH] Mark as compatible with warrior and zeus
---
conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/conf/layer.conf b/conf/layer.conf
index 8218dcd..c8d31bb 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "qt4-layer"
BBFILE_PATTERN_qt4-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_qt4-layer = "6"
-LAYERSERIES_COMPAT_qt4-layer = "thud"
+LAYERSERIES_COMPAT_qt4-layer = "thud warrior zeus"
--
2.17.1
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH v2] meta-yocto-bsp: Bump to the v5.2 kernel
From: Kevin Hao
Boot test for all the supported boards. Also drop the v5.0 bbappend
since we no plan to support it anymore. There are some
kernel_configcheck warning when building some boards, the patches [1]
for them have been sent to kernel-meta for merging.
[1] https://lists.yoctoproject.org/pipermail/linux-yocto/2019-August/007908.html
Signed-off-by: Kevin Hao
Signed-off-by: Bruce Ashfield
---
v2:
This is a minor tweak to the SRCREVs from Kevin's original version,
everything else is unchanged.
The meta changes are also in the latest linux-yocto 5.2 recipes.
Bruce
.../conf/machine/beaglebone-yocto.conf| 2 +-
meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +-
meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 2 +-
.../linux/linux-yocto_5.0.bbappend| 27 ---
.../linux/linux-yocto_5.2.bbappend| 27 +++
5 files changed, 30 insertions(+), 30 deletions(-)
delete mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend
create mode 100644 meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend
diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index 57b799294d..08dd3a5074 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -24,7 +24,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "5.0%"
+PREFERRED_VERSION_linux-yocto ?= "5.2%"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf
b/meta-yocto-bsp/conf/machine/edgerouter.conf
index 88592dbc85..6331368f87 100644
--- a/meta-yocto-bsp/conf/machine/edgerouter.conf
+++ b/meta-yocto-bsp/conf/machine/edgerouter.conf
@@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "5.0%"
+PREFERRED_VERSION_linux-yocto ?= "5.2%"
SERIAL_CONSOLES = "115200;ttyS0"
USE_VT ?= "0"
diff --git a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
index e2dce56738..5382796284 100644
--- a/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLES = "115200;ttyS0"
MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-PREFERRED_VERSION_linux-yocto ?= "5.0%"
+PREFERRED_VERSION_linux-yocto ?= "5.2%"
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend
b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend
deleted file mode 100644
index d7cf1216f4..00
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.0.bbappend
+++ /dev/null
@@ -1,27 +0,0 @@
-KBRANCH_genericx86 = "v5.0/standard/base"
-KBRANCH_genericx86-64 = "v5.0/standard/base"
-KBRANCH_edgerouter = "v5.0/standard/edgerouter"
-KBRANCH_beaglebone-yocto = "v5.0/standard/beaglebone"
-KBRANCH_mpc8315e-rdb = "v5.0/standard/fsl-mpc8315e-rdb"
-
-KMACHINE_genericx86 ?= "common-pc"
-KMACHINE_genericx86-64 ?= "common-pc-64"
-KMACHINE_beaglebone-yocto ?= "beaglebone"
-
-SRCREV_machine_genericx86?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4"
-SRCREV_machine_genericx86-64 ?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4"
-SRCREV_machine_edgerouter ?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4"
-SRCREV_machine_beaglebone-yocto ?= "f990fd0ce123aa6035042efad09b2ddc3e7d48f4"
-SRCREV_machine_mpc8315e-rdb ?= "670ce7e9db627d0c2067cfdb571ddc1f117818d8"
-
-COMPATIBLE_MACHINE_genericx86 = "genericx86"
-COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
-COMPATIBLE_MACHINE_edgerouter = "edgerouter"
-COMPATIBLE_MACHINE_beaglebone-yocto = "beaglebone-yocto"
-COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-
-LINUX_VERSION_genericx86 = "5.0.13"
-LINUX_VERSION_genericx86-64 = "5.0.13"
-LINUX_VERSION_edgerouter = "5.0.13"
-LINUX_VERSION_beaglebone-yocto = "5.0.13"
-LINUX_VERSION_mpc8315e-rdb = "5.0.13"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend
b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend
new file mode 100644
index 00..b7cefd25ca
--- /dev/null
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_5.2.bbappend
@@ -0,0 +1,27 @@
+KBRANCH_genericx86 = "v5.2/standard/base"
+KBRANCH_genericx86-64 = "v5.2/standard/base"
+KBRANCH_edgerouter = "v5.2/standard/edgerouter"
+KBRANCH_beaglebone-yocto = "v5.2/standard/beaglebone"
+KBRANCH_mpc8315e-rdb = "v5.2/standard/fsl-mpc8315e-rdb"
+
+KMACHINE_genericx86 ?= "common-pc"
+KMACHINE_genericx86-64 ?= "common-pc-64"
+KMACHINE_beaglebone-yocto ?= "beaglebone"
+
[linux-yocto] [PATCH] renesas-rcar: add configure file for renesas BSP in kernel-cache
From: Limeng Signed-off-by: Meng Li --- bsp/renesas-rcar/renesas-rcar-h3-standard.scc | 7 + bsp/renesas-rcar/renesas-rcar-m3-standard.scc | 7 + bsp/renesas-rcar/renesas-rcar.cfg | 252 ++ bsp/renesas-rcar/renesas-rcar.scc | 8 + 4 files changed, 274 insertions(+) create mode 100644 bsp/renesas-rcar/renesas-rcar-h3-standard.scc create mode 100644 bsp/renesas-rcar/renesas-rcar-m3-standard.scc create mode 100644 bsp/renesas-rcar/renesas-rcar.cfg create mode 100644 bsp/renesas-rcar/renesas-rcar.scc diff --git a/bsp/renesas-rcar/renesas-rcar-h3-standard.scc b/bsp/renesas-rcar/renesas-rcar-h3-standard.scc new file mode 100644 index ..b01b4305 --- /dev/null +++ b/bsp/renesas-rcar/renesas-rcar-h3-standard.scc @@ -0,0 +1,7 @@ +define KMACHINE renesas-rcar-h3 +define KTYPE standard +define KARCH arm64 + +include ktypes/standard + +include renesas-rcar.scc diff --git a/bsp/renesas-rcar/renesas-rcar-m3-standard.scc b/bsp/renesas-rcar/renesas-rcar-m3-standard.scc new file mode 100644 index ..033c8ba6 --- /dev/null +++ b/bsp/renesas-rcar/renesas-rcar-m3-standard.scc @@ -0,0 +1,7 @@ +define KMACHINE renesas-rcar-m3 +define KTYPE standard +define KARCH arm64 + +include ktypes/standard + +include renesas-rcar.scc diff --git a/bsp/renesas-rcar/renesas-rcar.cfg b/bsp/renesas-rcar/renesas-rcar.cfg new file mode 100644 index ..cc896276 --- /dev/null +++ b/bsp/renesas-rcar/renesas-rcar.cfg @@ -0,0 +1,252 @@ +#. +#WARNING +# +# This file is a kernel configuration fragment, and not a full kernel +# configuration file. The final kernel configuration is made up of +# an assembly of processed fragments, each of which is designed to +# capture a specific part of the final configuration (e.g. platform +# configuration, feature configuration, and board specific hardware +# configuration). For more information on kernel configuration, please +# consult the product documentation. +# +#. + +CONFIG_ARM64=y +CONFIG_64BIT=y +CONFIG_SMP=y + +# Platform selection +CONFIG_ARCH_RENESAS=y +CONFIG_ARCH_R8A7795=y +CONFIG_ARCH_R8A7796=y +CONFIG_ARM64_4K_PAGES=y +CONFIG_ARM64_VA_BITS_48=y +CONFIG_ARM64_VA_BITS=48 +CONFIG_NR_CPUS=8 + +# CPU Idle +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_DT_IDLE_STATES=y +CONFIG_ARM_CPUIDLE=y +CONFIG_CPU_FREQ=y +CONFIG_CPUFREQ_DT=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y + +# Networking options +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_RAVB=y + +# Serial Congifuration +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_SH_SCI=y +CONFIG_SERIAL_SH_SCI_NR_UARTS=18 +CONFIG_SERIAL_SH_SCI_CONSOLE=y +CONFIG_SERIAL_SH_SCI_EARLYCON=y +CONFIG_SERIAL_SH_SCI_DMA=y + +# Spi configuration +CONFIG_SPI=y +CONFIG_SPI_SH_MSIOF=y +CONFIG_SPI_GPIO=y + +# Pinctrl configuration +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +CONFIG_PINCTRL_SH_PFC=y +CONFIG_PINCTRL_PFC_R8A7795=y +CONFIG_PINCTRL_PFC_R8A7796=y + +# Watchdog configuration +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +CONFIG_RENESAS_WDT=y + +# Drm configuration +CONFIG_DRM=y +CONFIG_DRM_RCAR_DU=y +CONFIG_DRM_RCAR_DW_HDMI=y +CONFIG_DRM_RCAR_LVDS=y +CONFIG_DRM_RCAR_VSP=y +CONFIG_DRM_I2C_ADV7533=y +CONFIG_DRM_I2C_ADV7511=y +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_DW_HDMI=y +CONFIG_DRM_DUMB_VGA_DAC=y +CONFIG_DRM_THINE_THC63LVD1024=y +CONFIG_DRM_PANEL_LVDS=y +CONFIG_DRM_DW_HDMI_I2S_AUDIO=y + +# LCD Backlight configuration +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y + +# Sound configuration +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_RCAR=y +CONFIG_SND_SOC_AK4613=y +CONFIG_SND_SOC_HDMI_CODEC=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_SND_AUDIO_GRAPH_CARD=y +CONFIG_SND_SOC_PCM3168A_I2C=y + +# Clock configuration +CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_CS2000_CP=y +CONFIG_COMMON_CLK_VC5=y + +# USB configuration +CONFIG_USB=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_RCAR=m +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_PLATFORM=y +CONFIG_USB_OTG=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +CONFIG_USB_RENESAS_USBHS=y +CONFIG_USB_RENESAS_USBHS_UDC=y +CONFIG_USB_RENESAS_USB3=m +CONFIG_USB_DWC3=y +CONFIG_GENERIC_PHY=y +CONFIG_PHY_RCAR_GEN3_USB2=y +CONFIG_PHY_RCAR_GEN3_USB3=y + +# PWM configuration +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +CONFIG_PWM_RCAR=y + +# PCIe configuration +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y +CONFIG_PCIE_RCAR=y +CONFIG_PCI_MSI=y +CONFIG_PCIEPORTBUS=y + +# Sata configuration +CONFIG_ATA=y +CONFIG_SATA_AHCI=y +CONFIG_SATA_AHCI_PLATFORM=y +CONFIG_SATA_RCAR=y + +# I2C configuration +CONFIG_I2C=y +CONFIG_I2C_RCAR=y
[linux-yocto] : [kernel-cache yocto-5.2]: renesas-rcar: add configure file for renesas BSP in kernel-cache
From: Limeng Hi Bruce, I am working on BSP renesas-rcar platform, and intend to merge this BSP supporting into yocto community. Below patch includes scc and cfg files for renesas-rcar platform. Could you please merge this patch into yocto-kernel-cache, branch is yocto-5.2? This patch was merged into master some days ago. It also need to be merged into yocto-5.2 branch 0001-renesas-rcar-add-configure-file-for-renesas-BSP-in-k.patch renesas-rcar-h3-standard.scc |7 + renesas-rcar-m3-standard.scc |7 + renesas-rcar.cfg | 252 +++ renesas-rcar.scc |8 + 4 files changed, 274 insertions(+) thanks, Limeng -- ___ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
[yocto] [meta-dpdk][PATCH V2] dpdk: support usrmerge
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-extended/dpdk/dpdk.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 9dcec76..9b04881 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -40,7 +40,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
inherit module
-export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
+export
MODULE_DIR="${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
export RTE_SDK = "${S}"
export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-dpdk][PATCH] dpdk: support usrmerge
On 8/30/19 2:43 PM, Mittal, Anuj wrote:
On Fri, 2019-08-30 at 13:58 +0800, changqing...@windriver.com wrote:
-export
MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
+export MODULE_DIR="${@bb.utils.contains('DISTRO_FEATURES','usrmerge'
,'/usr','',d)}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
export RTE_SDK = "${S}"
Should this be:
MODULE_DIR =
"${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
It should then be handled automatically. Can you please check?
you are right, it can write like this. I will send a V2
Thanks,
Anuj
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-dpdk][PATCH] dpdk: support usrmerge
On Fri, 2019-08-30 at 13:58 +0800, changqing...@windriver.com wrote:
> -export
> MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
> +export MODULE_DIR="${@bb.utils.contains('DISTRO_FEATURES','usrmerge'
> ,'/usr','',d)}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
> export RTE_SDK = "${S}"
>
Should this be:
MODULE_DIR =
"${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net"
It should then be handled automatically. Can you please check?
Thanks,
Anuj
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] QA Issue: Files/directories were installed but not shipped
Maybe this web pointer to similar problem can help you (as a reference
examlpe)?!
https://yocto.yoctoproject.narkive.com/20hVZuCp/files-directories-were-installed-but-not-shipped
Zoran
___
On Fri, Aug 30, 2019 at 7:21 AM SIMON BABY wrote:
>
> Hello,
>
> I am getting "ERROR: QA Issue: Files/directories were installed but not
> shipped". Can you please help to resolve. My logs and bb files are below.
>
>
> ERROR: QA Issue: zipcpp: Files/directories were installed but not shipped in
> any package:
> /usr
> /usr/include
> /usr/src
> /usr/lib
> /usr/include/zipc.h
> /usr/include/logger.h
> /usr/include/fmt
> /usr/include/fmt/format.h
> /usr/include/fmt/ranges.h
> /usr/include/fmt/printf.h
>
>
> bb file:
>
>
> #
> # This file is the zipcpp recipe.
> #
>
> DEPENDS = "zeromq cppzmq"
> SUMMARY = "ZeroMQ based IPC C++ library"
> SECTION = "base"
> LICENSE = "CLOSED"
>
> SRC_URI = "git://git@elsvsapp02/TDY/ZIPCpp.git;protocol=ssh;branch=develop"
> SRCREV = "${AUTOREV}"
>
> S = "${WORKDIR}/git"
>
> LIB_ARTIFACT = "libzipcpp.so"
> LIB_VERSION = "1"
>
> do_install() {
> install -d ${D}${libdir}
> install -m 0755 ${S}/bin/${LIB_ARTIFACT}.${LIB_VERSION}
> ${D}${libdir}/${LIB_ARTIFACT}.${LIB_VERSION}
> ln -rs ${D}${libdir}/${LIB_ARTIFACT}.${LIB_VERSION}
> ${D}${libdir}/${LIB_ARTIFACT}
> install -d ${D}${includedir}
> install -m 0644 ${S}/include/zipc.h ${D}${includedir}
> install -m 0644 ${S}/include/logger.h ${D}${includedir}
> install -d ${D}${includedir}/fmt
> install -m 0644 ${S}/include/fmt/* ${D}${includedir}/fmt
> }
>
> #do_install_append() {
> #rm -r ${D}/usr/share
> #}
>
> FILES_${PN} += "${libdir}/${LIB_ARTIFACT}.${LIB_VERSION}"
> FILES_${PN} += "${libdir}/${LIB_ARTIFACT}"
> PACKAGES = "${PN}"
>
>
> Rgds
>
> Simon
>
> --
> ___
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-cloud-services][PATCH 1/14] glusterfs: support usrmerge [LINUXEXEC-1807]
Please ignore this mail
On 8/30/19 2:09 PM, changqing...@windriver.com wrote:
From: Changqing Li
Issue: LINUXEXEC-1807
(LOCAL REV: NOT UPSTREAM) -- send upstream 20190830
Signed-off-by: Changqing Li
---
recipes-extended/glusterfs/glusterfs.inc | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/glusterfs/glusterfs.inc
b/recipes-extended/glusterfs/glusterfs.inc
index 40a3922..66e2bf1 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -64,9 +64,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/glusterd.init \
${D}${sysconfdir}/init.d/glusterd
-# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
-mkdir -p ${D}${base_sbindir}
-(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
+# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
+mkdir -p ${D}${base_sbindir}
+(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+fi
# These are plug-ins, so they don't need libtool configs.
find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';'
--
BRs
Sandy(Li Changqing)
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cloud-services][PATCH] glusterfs: support usrmerge
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-extended/glusterfs/glusterfs.inc | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/glusterfs/glusterfs.inc
b/recipes-extended/glusterfs/glusterfs.inc
index 40a3922..66e2bf1 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -64,9 +64,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/glusterd.init \
${D}${sysconfdir}/init.d/glusterd
-# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
-mkdir -p ${D}${base_sbindir}
-(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
+# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
+mkdir -p ${D}${base_sbindir}
+(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+fi
# These are plug-ins, so they don't need libtool configs.
find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';'
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-cloud-services][PATCH 1/14] glusterfs: support usrmerge [LINUXEXEC-1807]
From: Changqing Li
Issue: LINUXEXEC-1807
(LOCAL REV: NOT UPSTREAM) -- send upstream 20190830
Signed-off-by: Changqing Li
---
recipes-extended/glusterfs/glusterfs.inc | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/recipes-extended/glusterfs/glusterfs.inc
b/recipes-extended/glusterfs/glusterfs.inc
index 40a3922..66e2bf1 100644
--- a/recipes-extended/glusterfs/glusterfs.inc
+++ b/recipes-extended/glusterfs/glusterfs.inc
@@ -64,9 +64,11 @@ do_install_append() {
install -m 0755 ${WORKDIR}/glusterd.init \
${D}${sysconfdir}/init.d/glusterd
-# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
-mkdir -p ${D}${base_sbindir}
-(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+if ! ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)};
then
+# Mount looks for mount.* plug-ins in /sbin; fix it with a symlink.
+mkdir -p ${D}${base_sbindir}
+(cd ${D}${base_sbindir}; ln -s ..${sbindir}/mount.glusterfs .)
+fi
# These are plug-ins, so they don't need libtool configs.
find ${D}${libdir}/glusterfs/${PV} -name '*.la' -exec rm -f '{}' ';'
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-dpdk][PATCH] dpdk: support usrmerge
From: Changqing Li
Signed-off-by: Changqing Li
---
recipes-extended/dpdk/dpdk.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc
index 9dcec76..08db741 100644
--- a/recipes-extended/dpdk/dpdk.inc
+++ b/recipes-extended/dpdk/dpdk.inc
@@ -40,7 +40,7 @@ do_configure[depends] += "virtual/kernel:do_shared_workdir"
inherit module
-export MODULE_DIR="/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
+export
MODULE_DIR="${@bb.utils.contains('DISTRO_FEATURES','usrmerge','/usr','',d)}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net"
export RTE_SDK = "${S}"
export ICP_ROOT = "${PKG_CONFIG_SYSROOT_DIR}/usr/include"
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
