diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index 51820d338e0f0ef87c23f5629d99d768308f4ac5..93b84711aee8765daa6a167eeda14f7914775a0f 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -1,37 +1,38 @@ DISTRO = "openeuler" -DISTRO_NAME = "Openeuler (Openeuler Project Reference Distro)" -DISTRO_VERSION = "1.0+snapshot-${METADATA_REVISION}" -DISTRO_CODENAME = "master" +DISTRO_NAME = "openEuler embedded(openEuler Embedded Reference Distro)" +DISTRO_VERSION = "21.09.30" +DISTRO_CODENAME = "openEuler21_09_30" SDK_VENDOR = "-openeulersdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" -MAINTAINER = "lisimin " +MAINTAINER = "openEuler " TARGET_VENDOR = "-openeuler" LOCALCONF_VERSION = "2" -# Override these in poky based distros -#OPENEULER_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" +# Override these in openeuler embedded based distros +#OPENEULER_DEFAULT_DISTRO_FEATURES = "" OPENEULER_DEFAULT_DISTRO_FEATURES = "pam" #OPENEULER_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" #OPENEULER_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${OPENEULER_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.13%" -PREFERRED_VERSION_linux-yocto-rt ?= "5.13%" +PREFERRED_VERSION_linux-openeuler ?= "5.10%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" -DISTRO_EXTRA_RDEPENDS += "${POKY_DEFAULT_EXTRA_RDEPENDS}" -DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" +DISTRO_EXTRA_RDEPENDS += "${OPENEULER_DEFAULT_EXTRA_RDEPENDS}" +DISTRO_EXTRA_RRECOMMENDS += "${OPENEULER_DEFAULT_EXTRA_RRECOMMENDS}" TCLIBCAPPEND = "" TCLIBC = "glibc" +# currently, we have no sources mirror for openEuler, so use +# yocto mirror instead PREMIRRORS ??= "\ bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ @@ -42,20 +43,12 @@ osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" -#SANITY_TESTED_DISTROS = "" -# add poky sanity bbclass -#INHERIT += "poky-sanity" - # QA check settings - a little stricter than the OE-Core defaults # (none currently necessary as we now match OE-Core) #WARN_TO_ERROR_QA = "X" #WARN_QA_remove = "${WARN_TO_ERROR_QA}" #ERROR_QA_append = " ${WARN_TO_ERROR_QA}" -#require conf/distro/include/poky-world-exclude.inc -#require conf/distro/include/no-static-libs.inc -#require conf/distro/include/yocto-uninative.inc -#require conf/distro/include/security_flags.inc INHERIT += "uninative" INHERIT += "reproducible_build" @@ -72,10 +65,12 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openeuler" LOCAL_SRC_DIR = "${BPN}" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -DEPENDS_remove += "cmake-native ninja-native" #DL_DIR = "${LOCAL_FILES}" DL_DIR = "downloads" + export RPMDEPS = "default" INHERIT += "get_dl_dir get_rpmdeps" + +#disable the file checksum of fetch do_fetch[file-checksums] = "" SDK_INCLUDE_BUILDTOOLS = "0" diff --git a/meta-openeuler/conf/local.conf.sample b/meta-openeuler/conf/local.conf.sample index d045f33414194eb5a918045dda3449aa9c35807c..0f80e1ff0c288daedc65d8fce3828f7594022373 100644 --- a/meta-openeuler/conf/local.conf.sample +++ b/meta-openeuler/conf/local.conf.sample @@ -271,27 +271,35 @@ BB_DISKMON_DIRS ??= "\ # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. CONF_VERSION = "2" -HOSTTOOLS += "python chrpath rpmbuild pkg-config flex bison bc automake autoreconf libtool ninja xz autopoint autoreconf aclocal libtoolize autoscan autom4te autoconf autoheader autoupdate libtool libtoolize pkg-config cmake fmt gperf m4 createrepo_c dnf ldconfig" +HOSTTOOLS += "python chrpath rpmbuild pkg-config flex bison bc automake autoreconf libtool \ + ninja xz autopoint autoreconf aclocal libtoolize autoscan autom4te autoconf autoheader \ + autoupdate libtool libtoolize pkg-config cmake fmt gperf m4 createrepo_c dnf ldconfig" HOSTTOOLS_remove += "diffstat lz4c pzstd rpcgen" SANITY_REQUIRED_UTILITIES_remove += "diffstat chrpath" CONNECTIVITY_CHECK_URIS = "" -#PREFERRED_VERSION_linux-yocto = "5.10%" -ASSUME_PROVIDED += "rpm-native dwarfsrcfiles-native depmodwrapper-cross kmod-native bc-native bison-native make-native gperf-native pigz-native pbzip2-native ldconfig-native xz-native makedevs-native alsa-lib-native perl-native qemu-native chrpath-native kern-tools-native gmp-native libsdl2-native mesa-native virglrenderer-native pixman-native texinfo-dummy-native python3-native python3-setuptools-native gettext-native m4-native flex-native unifdef-native rsync-native init-system-helpers automake-native autoconf-native libtool-native opkg-utils-native patch-native pkgconfig-native init-system-helpers update-rc.d-native initscripts run-postinsts" +ASSUME_PROVIDED += "rpm-native dwarfsrcfiles-native depmodwrapper-cross kmod-native bc-native \ + bison-native make-native gperf-native pigz-native pbzip2-native ldconfig-native \ + xz-native makedevs-native alsa-lib-native perl-native qemu-native chrpath-native \ + kern-tools-native gmp-native libsdl2-native mesa-native virglrenderer-native \ + pixman-native texinfo-dummy-native python3-native python3-setuptools-native gettext-native \ + m4-native flex-native unifdef-native rsync-native init-system-helpers automake-native \ + autoconf-native libtool-native opkg-utils-native patch-native pkgconfig-native \ + init-system-helpers update-rc.d-native initscripts run-postinsts cmake-native ninja-native" PATCHTOOL = "patch" TCMODE = "gcc-bin" INHERIT_remove += "uninative" PATCHDEPENDENCY_remove += "patch-replacement-native:do_populate_sysroot" PREMIRRORS = "\ -bzr://.*/.* file:////usr1/openeuler/src \n \ -cvs://.*/.* file:////usr1/openeuler/src \n \ -git://.*/.* file:////usr1/openeuler/src \n \ -hg://.*/.* file:////usr1/openeuler/src \n \ -osc://.*/.* file:////usr1/openeuler/src \n \ -p4://.*/.* file:////usr1/openeuler/src \n \ -svn://.*/.* file:////usr1/openeuler/src \n \ -ftp://.*/.* file:////usr1/openeuler/src \n \ -http://.*/.* file:////usr1/openeuler/src \n \ -https://.*/.* file:////usr1/openeuler/src \n" +bzr://.*/.* file:///${LOCAL_FILES} \n \ +cvs://.*/.* file:///${LOCAL_FILES} \n \ +git://.*/.* file:///${LOCAL_FILES} \n \ +hg://.*/.* file:///${LOCAL_FILES} \n \ +osc://.*/.* file:///${LOCAL_FILES} \n \ +p4://.*/.* file:///${LOCAL_FILES} \n \ +svn://.*/.* file:///${LOCAL_FILES} \n \ +ftp://.*/.* file:///${LOCAL_FILES} \n \ +http://.*/.* file:///${LOCAL_FILES} \n \ +https://.*/.* file:///${LOCAL_FILES} \n" #not add PR in workpath #PF = "${PN}-${EXTENDPE}${PV}" diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb index 3db25d123791990fcf1e32fd28af943058872553..9d01d839f24f37345102b72844c952ef7992ae78 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.bb @@ -1,7 +1,6 @@ -SUMMARY = "Dummy Linux kernel" -DESCRIPTION = "Dummy Linux kernel, to be selected as the preferred \ -provider for virtual/kernel to satisfy dependencies for situations \ -where you wish to build the kernel externally from the build system." +SUMMARY = "openEuler Linux kernel" +DESCRIPTION = "openEuler Embedded shares the same linux kernel with other \ + openEuler linux distribution" SECTION = "kernel" LICENSE = "GPLv2" @@ -59,6 +58,7 @@ inherit kernel-devicetree COMPATIBLE_HOST = ".*-linux" +PV = "5.10" PR = "r1" SRC_URI = "file://kernel-5.10 \