diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index 4c5d20fd2b5251dca8d3ccbd9574220a7dfa7c6e..fa43b690d460df9c0d9b00bee0ac838857ffc4fb 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -27,7 +27,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${OPENEULER_DEFAULT_DISTRO_FEATUR DISTRO_FEATURES += "${@['', 'sysvinit']['${INIT_MANAGER}' == 'mdev-busybox']}" # remove currently unsupported features -DISTRO_FEATURES_DEFAULT:remove = "bluetooth x11" +DISTRO_FEATURES_DEFAULT:remove = "x11" ## kernel related configurations # the oldest kernel supported by openeuler embedded is 5.10 diff --git a/meta-openeuler/recipes-multimedia/x264/x264_%.bbappend b/meta-openeuler/recipes-multimedia/x264/x264_%.bbappend index aa88f2e764dad01b09c62981b546e71a20d3cdda..44eaf76f8a07abdf0bb76e075dbda8bd10df6755 100644 --- a/meta-openeuler/recipes-multimedia/x264/x264_%.bbappend +++ b/meta-openeuler/recipes-multimedia/x264/x264_%.bbappend @@ -2,6 +2,14 @@ PV = "0.164" +# in openeuler, prebuilt external toolchain is used, so the chain x264->binutils-native- +# ->gnu-config-native will be broken. so we add gnu-config-native to the DEPENDS here. +# +# when ${OPENEULER_PREBUILT_TOOLS_ENABLE}" = "yes", the special handling in +# do_prepare_gnu_config is required, because DEPENDS += "gnu-config-native" does not work +# as in openeuler_hosttools.inc, ASSUME_PROVIDED += "gnu-config-native" is set +DEPENDS += "gnu-config-native" + # source change to openEuler SRC_URI = "file://x264-0.164-20231001git31e19f92.tar.bz2 \ file://x264-nover.patch \ diff --git a/meta-openeuler/recipes-support/nghttp2/nghttp2_%.bbappend b/meta-openeuler/recipes-support/nghttp2/nghttp2_%.bbappend index 005f0227158452baf6a931b08e8b6af7a00203ed..760df19736fc3ae65ab7d540464feffe48b3236b 100644 --- a/meta-openeuler/recipes-support/nghttp2/nghttp2_%.bbappend +++ b/meta-openeuler/recipes-support/nghttp2/nghttp2_%.bbappend @@ -7,3 +7,6 @@ SRC_URI += " \ file://backport-CVE-2024-28182-1.patch \ file://backport-CVE-2024-28182-2.patch \ " + +# accroding to nghttp2-1.57.0.bb, no nghttp2-client and nghttp2-server +RDEPENDS:${PN} = "${PN}-proxy (>= ${PV}) "