[OE-core] [PATCH 1/1] util-linux: fix hwclock settimeofday error
The change of settimeofday() systemcall since Glibc 2.31
will cause "hwclock -s" doesn't work with error:
"hwclock: settimeofday() failed: Invalid argument"
Backport a upstream patch to fix this issue.
Signed-off-by: Liwei Song
---
...lock-fix-for-glibc-2.31-settimeofday.patch | 112 ++
.../util-linux/util-linux_2.34.bb | 1 +
2 files changed, 113 insertions(+)
create mode 100644
meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch
diff --git
a/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch
b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch
new file mode 100644
index ..0672c3546ae6
--- /dev/null
+++
b/meta/recipes-core/util-linux/util-linux/0001-hwclock-fix-for-glibc-2.31-settimeofday.patch
@@ -0,0 +1,112 @@
+From ee85d3967ea09b215fcea5efdd90bbbf5e74a681 Mon Sep 17 00:00:00 2001
+From: Karel Zak
+Date: Wed, 19 Feb 2020 15:50:47 +0100
+Subject: [PATCH] hwclock: fix for glibc 2.31 settimeofday()
+
+glibc announce:
+ ... settimeofday can no longer be used to set the time and the offset
+ simultaneously. If both of its two arguments are non-null, the call
+ will fail (setting errno to EINVAL).
+
+It means we need to call settimeofday(NULL, tz) and settimeofday(tv, NULL).
+
+Unfortunately, settimeofday(NULL, tz) has very special warp-clock
+semantic if used as the very first settimeofday() call. It means we
+have to be sure that we do not touch warp-clock if we need only need
+to modify system TZ. So, let's always call settimeofday(NULL, 0)
+before settimeofday(NULL, tz) for UTC rtc mode when modify system TZ.
+
+Upstream-Status: Backport
[https://github.com/karelzak/util-linux/commit/ee85d3967ea09b215fcea5efdd90bbbf5e74a681]
+
+CC: J William Piggott
+Signed-off-by: Karel Zak
+Addresses: https://github.com/karelzak/util-linux/issues/957
+Signed-off-by: Liwei Song
+---
+ sys-utils/hwclock.c | 49 ++---
+ 1 file changed, 28 insertions(+), 21 deletions(-)
+
+diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
+index e736da7179f8..16576bc186ff 100644
+--- a/sys-utils/hwclock.c
b/sys-utils/hwclock.c
+@@ -658,6 +658,9 @@ display_time(struct timeval hwctime)
+ * PCIL: persistent_clock_is_local, sets the "11 minute mode" timescale.
+ * firsttime: locks the warp_clock function (initialized to 1 at boot).
+ *
++ * Note that very first settimeofday(NULL, tz) modifies warp-clock as well as
++ * system TZ.
++ *
+ *
+---+
+ * | op | RTC scale | settimeofday calls
|
+ *
|-|---|-|
+@@ -675,41 +678,45 @@ set_system_clock(const struct hwclock_control *ctl,
+ struct tm broken;
+ int minuteswest;
+ int rc = 0;
+- const struct timezone tz_utc = { 0 };
+
+ localtime_r(_sec, );
+ minuteswest = -get_gmtoff() / 60;
+
+ if (ctl->verbose) {
+- if (ctl->hctosys && !ctl->universal)
+- printf(_("Calling settimeofday(NULL, %d) to set "
+- "persistent_clock_is_local.\n"), minuteswest);
+- if (ctl->systz && ctl->universal)
++ if (ctl->universal)
+ puts(_("Calling settimeofday(NULL, 0) "
+- "to lock the warp function."));
++ "to lock the warp function."));
++ else
++ printf(_("Calling settimeofday(NULL, %d) to set "
++ "persistent_clock_is_local and "
++ "the kernel timezone.\n"), minuteswest);
++
++ if (ctl->universal && minuteswest)
++ printf(_("Calling settimeofday(NULL, %d) to set "
++ "the kernel timezone.\n"), minuteswest);
++
+ if (ctl->hctosys)
+- printf(_("Calling settimeofday(%ld.%06ld, %d)\n"),
+- newtime.tv_sec, newtime.tv_usec, minuteswest);
+- else {
+- printf(_("Calling settimeofday(NULL, %d) "),
minuteswest);
+- if (ctl->universal)
+- puts(_("to set the kernel timezone."));
+- else
+- puts(_("to warp System time."));
+- }
++ printf(_("Calling settimeofday(%ld.%06ld, 0) to set "
++ "the kernel time.\n"), newtime.tv_sec,
newtime.tv_usec);
+ }
+
+
[OE-core] [PATCH 1/1] buildtools-tarball: export OPENSSL_CONF for openssl
export OPENSSL_CONF to aviod SDK openssl can not find openssl.cnf.
Signed-off-by: Liwei Song
---
meta/recipes-core/meta/buildtools-tarball.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb
b/meta/recipes-core/meta/buildtools-tarball.bb
index 91df6f1ae9f6..9c5c2cc8d6e7 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -72,6 +72,7 @@ create_sdk_files_append () {
toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
echo 'export
GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"'
>>$script
+ echo 'export
OPENSSL_CONF="${SDKPATHNATIVE}${sysconfdir}/ssl/openssl.cnf"' >>$script
if [ "${SDKMACHINE}" = "i686" ]; then
echo 'export NO32LIBS="0"' >>$script
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] util-linux: fix PKNAME name is NULL when use lsblk [LIN1019-2963]
PKNAME is NULL when run "lsblk -o+PKNAME /dev/sda1" backport an upstream patch to fix it. Signed-off-by: Liwei Song --- ...-force-to-print-PKNAME-for-partition.patch | 36 +++ .../util-linux/util-linux_2.34.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch diff --git a/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch new file mode 100644 index ..5d4c148fb3d1 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/0001-lsblk-force-to-print-PKNAME-for-partition.patch @@ -0,0 +1,36 @@ +From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Thu, 27 Jun 2019 09:22:18 +0200 +Subject: [PATCH] lsblk: force to print PKNAME for partition + +PKNAME (parent kernel device name) is based on printed tree according +to parent -> child relationship. The tree is optional and not printed +if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old +versions print the PKNAME also in this case. + +Upstream-Status: Backport [https://github.com/karelzak/util-linux/commit/e3bb9bfb76c17b1d05814436ced62c05c4011f48] + +Addresses: https://github.com/karelzak/util-linux/issues/813 +Signed-off-by: Karel Zak +Signed-off-by: Liwei Song +--- + misc-utils/lsblk.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c +index e95af7af0256..3ce6da730264 100644 +--- a/misc-utils/lsblk.c b/misc-utils/lsblk.c +@@ -1019,6 +1019,9 @@ static void device_to_scols( + DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name)); + ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name)); + ++ if (!parent && dev->wholedisk) ++ parent = dev->wholedisk; ++ + /* Do not print device more than one in --list mode */ + if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed) + return; +-- +2.17.1 + diff --git a/meta/recipes-core/util-linux/util-linux_2.34.bb b/meta/recipes-core/util-linux/util-linux_2.34.bb index 262f4bacb00b..e9c2d80e902b 100644 --- a/meta/recipes-core/util-linux/util-linux_2.34.bb +++ b/meta/recipes-core/util-linux/util-linux_2.34.bb @@ -7,6 +7,7 @@ SRC_URI += "file://configure-sbindir.patch \ file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ +file://0001-lsblk-force-to-print-PKNAME-for-partition.patch \ " SRC_URI[md5sum] = "a78cbeaed9c39094b96a48ba8f891d50" SRC_URI[sha256sum] = "743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] glib-networking:enable glib-networking build as native package
From: Jiang Lu
Enable glib-networking build as a native package, for it is depended
by libsoup.
Signed-off-by: Jiang Lu
Signed-off-by: Liwei Song
---
meta/recipes-core/glib-networking/glib-networking_2.60.3.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
b/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
index d893b7a3a102..0278ab2fb689 100644
--- a/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
+++ b/meta/recipes-core/glib-networking/glib-networking_2.60.3.bb
@@ -30,3 +30,5 @@ FILES_${PN} += "\
"
FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la"
FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a"
+
+BBCLASSEXTEND = "native"
--
2.22.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libsoup:enable libsoup build as native package
From: Jiang Lu
Enable libsoup build as a native package, for it may invoked by
other native package, such as ostree.
Signed-off-by: Jiang Lu
Signed-off-by: Liwei Song
---
meta/recipes-support/libsoup/libsoup-2.4_2.66.2.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.66.2.bb
b/meta/recipes-support/libsoup/libsoup-2.4_2.66.2.bb
index c4715a04125c..357f2fd3db9d 100644
--- a/meta/recipes-support/libsoup/libsoup-2.4_2.66.2.bb
+++ b/meta/recipes-support/libsoup/libsoup-2.4_2.66.2.bb
@@ -36,3 +36,5 @@ DEBIAN_NOAUTONAME_${PN} = "1"
# glib-networking is needed for SSL, proxies, etc.
RRECOMMENDS_${PN} = "glib-networking"
+
+BBCLASSEXTEND = "native"
--
2.22.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] mdadm: define MAILADDR for mdmonitor service
by default in mdmonitor.service it use mail address to report alerts
but this need to set MAILADDR in /etc/mdadm.conf, or the service
will be failed excuted.
This patch will set MAILADD to "root" in /etc/mdadm.conf
to aviod service run with error.
Signed-off-by: Liwei Song
---
meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 8ca42a89ddc5..8ec1c22a0c62 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -57,6 +57,7 @@ do_install() {
do_install_append() {
install -d ${D}/${sysconfdir}/
install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
+sed -i "s/#MAILADDR r...@mydomain.tld/MAILADDR root/"
${D}${sysconfdir}/mdadm.conf
install -d ${D}/${sysconfdir}/init.d
install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false',
d)}; then
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] mdadm: guarded with systemd when install mdadm service
install mdadm related service only when systemd was included
in DISTRO_FEATURES.
Signed-off-by: Liwei Song
---
meta/recipes-extended/mdadm/mdadm_4.1.bb | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 597faf787a67..8ca42a89ddc5 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -59,13 +59,11 @@ do_install_append() {
install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
install -d ${D}/${sysconfdir}/init.d
install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor
+if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false',
d)}; then
+ oe_runmake install-systemd DESTDIR=${D}
+fi
}
-do_install_append() {
-oe_runmake install-systemd DESTDIR=${D}
-}
-
-
do_compile_ptest() {
oe_runmake test
}
@@ -93,4 +91,4 @@ RRECOMMENDS_${PN}-ptest += " \
kernel-module-raid456 \
"
-FILES_${PN} += "/lib/systemd/*"
+FILES_${PN} +=
"${@bb.utils.contains('DISTRO_FEATURES','systemd','/lib/systemd/*', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] mdadm: install the systemd service through Makefile
Please ignore this one.
Because the v1 patch has been applied, so this one is not applicable now,
will send it together with another patch to cover the systemd related change.
Thanks,
Liwei.
On 05/21/2019 04:54 PM, Liwei Song wrote:
> The original mdadm service may include variable like BINDIR,
> It should use the real value of it, since the install method
> "install-systemd" in Makefile can easily do such work, so don't
> install it in bb file manually, use "make install-systemd" to
> install all the service of mdadm.
>
> Signed-off-by: Liwei Song
> ---
> meta/recipes-extended/mdadm/mdadm_4.1.bb | 8 +---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
> b/meta/recipes-extended/mdadm/mdadm_4.1.bb
> index ef5ddf55db39..8ca42a89ddc5 100644
> --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
> +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
> @@ -57,11 +57,11 @@ do_install() {
> do_install_append() {
> install -d ${D}/${sysconfdir}/
> install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
> -install -d ${D}/${systemd_unitdir}/system
> -install -m 644 ${WORKDIR}/mdmonitor.service
> ${D}/${systemd_unitdir}/system
> -install -m 644 ${S}/systemd/mdmon@.service
> ${D}/${systemd_unitdir}/system
> install -d ${D}/${sysconfdir}/init.d
> install -m 755 ${WORKDIR}/mdadm.init
> ${D}${sysconfdir}/init.d/mdmonitor
> +if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false',
> d)}; then
> + oe_runmake install-systemd DESTDIR=${D}
> +fi
> }
>
> do_compile_ptest() {
> @@ -90,3 +90,5 @@ RRECOMMENDS_${PN}-ptest += " \
> kernel-module-raid10 \
> kernel-module-raid456 \
> "
> +
> +FILES_${PN} +=
> "${@bb.utils.contains('DISTRO_FEATURES','systemd','/lib/systemd/*', '', d)}"
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] mdadm: install the systemd service through Makefile
The original mdadm service may include variable like BINDIR,
It should use the real value of it, since the install method
"install-systemd" in Makefile can easily do such work, so don't
install it in bb file manually, use "make install-systemd" to
install all the service of mdadm.
Signed-off-by: Liwei Song
---
meta/recipes-extended/mdadm/mdadm_4.1.bb | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index ef5ddf55db39..8ca42a89ddc5 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -57,11 +57,11 @@ do_install() {
do_install_append() {
install -d ${D}/${sysconfdir}/
install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
-install -d ${D}/${systemd_unitdir}/system
-install -m 644 ${WORKDIR}/mdmonitor.service
${D}/${systemd_unitdir}/system
-install -m 644 ${S}/systemd/mdmon@.service
${D}/${systemd_unitdir}/system
install -d ${D}/${sysconfdir}/init.d
install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor
+if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true', 'false',
d)}; then
+ oe_runmake install-systemd DESTDIR=${D}
+fi
}
do_compile_ptest() {
@@ -90,3 +90,5 @@ RRECOMMENDS_${PN}-ptest += " \
kernel-module-raid10 \
kernel-module-raid456 \
"
+
+FILES_${PN} +=
"${@bb.utils.contains('DISTRO_FEATURES','systemd','/lib/systemd/*', '', d)}"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mdadm: install the systemd service through Makefile
On 05/21/2019 02:43 PM, Khem Raj wrote:
> On Mon, May 20, 2019 at 7:21 PM Liwei Song wrote:
>>
>>
>>
>> On 05/21/2019 05:18 AM, Khem Raj wrote:
>>>
>>>
>>> On 5/15/19 7:41 PM, Liwei Song wrote:
>>>> The original mdadm service may include variable like BINDIR,
>>>> It should use the real value of it, since the install method
>>>> "install-systemd" in Makefile can easily do such work, so don't
>>>> install it in bb file manually, use "make install-systemd" to
>>>> install all the service of mdadm.
>>>>
>>>> Signed-off-by: Liwei Song
>>>> ---
>>>> meta/recipes-extended/mdadm/mdadm_4.1.bb | 10 +++---
>>>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
>>>> b/meta/recipes-extended/mdadm/mdadm_4.1.bb
>>>> index 4168ce4d0cb8..a4b9ef94799f 100644
>>>> --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
>>>> +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
>>>> @@ -55,13 +55,15 @@ do_install() {
>>>> do_install_append() {
>>>> install -d ${D}/${sysconfdir}/
>>>> install -m 644 ${S}/mdadm.conf-example
>>>> ${D}${sysconfdir}/mdadm.conf
>>>> -install -d ${D}/${systemd_unitdir}/system
>>>> -install -m 644 ${WORKDIR}/mdmonitor.service
>>>> ${D}/${systemd_unitdir}/system
>>>> -install -m 644 ${S}/systemd/mdmon@.service
>>>> ${D}/${systemd_unitdir}/system
>>>> install -d ${D}/${sysconfdir}/init.d
>>>> install -m 755 ${WORKDIR}/mdadm.init
>>>> ${D}${sysconfdir}/init.d/mdmonitor
>>>> }
>>>> +do_install_append() {
>>>> +oe_runmake install-systemd DESTDIR=${D}
>>>> +}
>>>
>>> perhaps this should be guarded with systemd being in DISTRO_FEATURES check.
>>
>> Hi Khem,
>>
>> Do you mean all the service file need to be added to SYSTEMD_SERVICE_${PN} ?
>>
>
> I mean to check for systemd in DISTRO_FEATURE like
> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
> ...
> else
> ...
> fi
Understand, thanks.
Liwei.
>
>> Thanks,
>> Liwei.
>>
>>
>>>
>>>> +
>>>> +
>>>> do_compile_ptest() {
>>>> oe_runmake test
>>>> }
>>>> @@ -88,3 +90,5 @@ RRECOMMENDS_${PN}-ptest += " \
>>>> kernel-module-raid10 \
>>>> kernel-module-raid456 \
>>>> "
>>>> +
>>>> +FILES_${PN} += "/lib/systemd/*"
>>>>
>>>
>>>
>
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mdadm: install the systemd service through Makefile
On 05/21/2019 05:18 AM, Khem Raj wrote:
>
>
> On 5/15/19 7:41 PM, Liwei Song wrote:
>> The original mdadm service may include variable like BINDIR,
>> It should use the real value of it, since the install method
>> "install-systemd" in Makefile can easily do such work, so don't
>> install it in bb file manually, use "make install-systemd" to
>> install all the service of mdadm.
>>
>> Signed-off-by: Liwei Song
>> ---
>> meta/recipes-extended/mdadm/mdadm_4.1.bb | 10 +++---
>> 1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
>> b/meta/recipes-extended/mdadm/mdadm_4.1.bb
>> index 4168ce4d0cb8..a4b9ef94799f 100644
>> --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
>> +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
>> @@ -55,13 +55,15 @@ do_install() {
>> do_install_append() {
>> install -d ${D}/${sysconfdir}/
>> install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
>> -install -d ${D}/${systemd_unitdir}/system
>> -install -m 644 ${WORKDIR}/mdmonitor.service
>> ${D}/${systemd_unitdir}/system
>> -install -m 644 ${S}/systemd/mdmon@.service
>> ${D}/${systemd_unitdir}/system
>> install -d ${D}/${sysconfdir}/init.d
>> install -m 755 ${WORKDIR}/mdadm.init
>> ${D}${sysconfdir}/init.d/mdmonitor
>> }
>> +do_install_append() {
>> +oe_runmake install-systemd DESTDIR=${D}
>> +}
>
> perhaps this should be guarded with systemd being in DISTRO_FEATURES check.
Hi Khem,
Do you mean all the service file need to be added to SYSTEMD_SERVICE_${PN} ?
Thanks,
Liwei.
>
>> +
>> +
>> do_compile_ptest() {
>> oe_runmake test
>> }
>> @@ -88,3 +90,5 @@ RRECOMMENDS_${PN}-ptest += " \
>> kernel-module-raid10 \
>> kernel-module-raid456 \
>> "
>> +
>> +FILES_${PN} += "/lib/systemd/*"
>>
>
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mdadm: install the systemd service through Makefile
The original mdadm service may include variable like BINDIR,
It should use the real value of it, since the install method
"install-systemd" in Makefile can easily do such work, so don't
install it in bb file manually, use "make install-systemd" to
install all the service of mdadm.
Signed-off-by: Liwei Song
---
meta/recipes-extended/mdadm/mdadm_4.1.bb | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 4168ce4d0cb8..a4b9ef94799f 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -55,13 +55,15 @@ do_install() {
do_install_append() {
install -d ${D}/${sysconfdir}/
install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
-install -d ${D}/${systemd_unitdir}/system
-install -m 644 ${WORKDIR}/mdmonitor.service
${D}/${systemd_unitdir}/system
-install -m 644 ${S}/systemd/mdmon@.service
${D}/${systemd_unitdir}/system
install -d ${D}/${sysconfdir}/init.d
install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor
}
+do_install_append() {
+oe_runmake install-systemd DESTDIR=${D}
+}
+
+
do_compile_ptest() {
oe_runmake test
}
@@ -88,3 +90,5 @@ RRECOMMENDS_${PN}-ptest += " \
kernel-module-raid10 \
kernel-module-raid456 \
"
+
+FILES_${PN} += "/lib/systemd/*"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/8] mdadm: add udev rules to create by-partuuid for MD devices
On 03/25/2019 07:55 PM, Richard Purdie wrote: > On Wed, 2019-03-20 at 23:19 -0400, Liwei Song wrote: >> installer use partuuid for boot and swap partition, >> But the udev rules for MD devices do not have rules to create >> by-partuuid under /dev/disk/, this will take 90s to wait until failed >> add the rules to create by-partuuid to support boot from raid >> disk with "root=PARTUUID=XXX" >> >> Signed-off-by: Liwei Song >> --- >> ...ev.rules-create-by-partuuid-for-md-device.patch | 29 >> ++ >> meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 + >> 2 files changed, 30 insertions(+) >> create mode 100644 meta/recipes-extended/mdadm/files/0001- >> udev.rules-create-by-partuuid-for-md-device.patch >> >> diff --git a/meta/recipes-extended/mdadm/files/0001-udev.rules- >> create-by-partuuid-for-md-device.patch b/meta/recipes- >> extended/mdadm/files/0001-udev.rules-create-by-partuuid-for-md- >> device.patch >> new file mode 100644 >> index ..c1f7b1cf8736 >> --- /dev/null >> +++ b/meta/recipes-extended/mdadm/files/0001-udev.rules-create-by- >> partuuid-for-md-device.patch >> @@ -0,0 +1,29 @@ >> +From 7d1fa6afba936edb3e211f0ccdb58b1472b4bbf4 Mon Sep 17 00:00:00 >> 2001 >> +From: Liwei Song >> +Date: Tue, 26 Feb 2019 07:05:42 + >> +Subject: [PATCH] udev.rules: create by-partuuid for md device >> + >> +Create by-partuuid for every md devices. >> + >> +Upstream-Status: sent to linux-r...@vger.kernel.org( >> https://www.spinics.net/lists/raid/msg62373.html) >> + >> +Signed-off-by: Liwei Song >> +--- >> + udev-md-raid-arrays.rules | 1 + >> + 1 file changed, 1 insertion(+) > > It looks like upstream had concerns about this so I'd like to hold off > on this until those are resolved. No problem, let's wait if other folks have more concern before it is applied. https://www.spinics.net/lists/raid/msg62379.html Thanks, Liwei. > > https://www.spinics.net/lists/raid/msg62376.html > > Cheers, > > Richard > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 8/8] oe-core: add ledmon to support Intel VROC
On 03/22/2019 07:32 AM, Richard Purdie wrote: > On Wed, 2019-03-20 at 23:19 -0400, Liwei Song wrote: >> This add ledmon demon to control Intel VROC's SSD disk led. >> >> Signed-off-by: Liwei Song >> --- >> meta/recipes-extended/ledmon/ledmon_git.bb | 32 >> ++ >> 1 file changed, 32 insertions(+) >> create mode 100644 meta/recipes-extended/ledmon/ledmon_git.bb >> >> diff --git a/meta/recipes-extended/ledmon/ledmon_git.bb >> b/meta/recipes-extended/ledmon/ledmon_git.bb >> new file mode 100644 >> index ..77a620860cab >> --- /dev/null >> +++ b/meta/recipes-extended/ledmon/ledmon_git.bb >> @@ -0,0 +1,32 @@ >> +SUMMARY = "Intel(R) Enclosure LED Utilities" >> + >> +DESCRIPTION = "The utilities are designed primarily to be used on storage >> servers \ >> + utilizing MD devices (aka Linux Software RAID) for RAID arrays.\ >> +" >> +HOMEPAGE = "https://github.com/intel/ledmon; >> > > I'm not sure many of our systems have this. Would this not be more > appropriate in meta-intel or in some other layer? it does seem a bit of > a specialist use case? OK, will try to send it to meta-intel, Thanks for your suggestion. Liwei. > > Cheers, > > Richard > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/8] initramfs-framework: mount efivarfs to make Intel VROC work well
efivafs contain some meta data about Intel VROC, which will be used by mdadm to create raid device. These are preparation work to support boot from Intel VROC RAID disk. Signed-off-by: Liwei Song --- meta/recipes-core/initrdscripts/initramfs-framework/init | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/init b/meta/recipes-core/initrdscripts/initramfs-framework/init index 3c7e09422de2..c71ce0ce8cce 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/init +++ b/meta/recipes-core/initrdscripts/initramfs-framework/init @@ -72,6 +72,7 @@ ROOTFS_DIR="/rootfs" # where to do the switch root MODULE_PRE_HOOKS="" # functions to call before running each module MODULE_POST_HOOKS="" # functions to call after running each module MODULES_DIR=/init.d # place to look for modules +EFI_DIR=/sys/firmware/efi # place to store device firmware information # make mount stop complaining about missing /etc/fstab touch /etc/fstab @@ -81,6 +82,10 @@ mkdir -p /proc /sys /run/lock /var/lock mount -t proc proc /proc mount -t sysfs sysfs /sys +if [ -d $EFI_DIR ];then + mount -t efivarfs none /sys/firmware/efi/efivars +fi + # populate bootparam environment for p in `cat /proc/cmdline`; do opt=`echo $p | cut -d'=' -f1` -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] init-install: fix a typo which will led delete section failed when use sed
use sed to delete the install section may failed due to an typo
in installer routine.
Signed-off-by: Liwei Song
---
meta/recipes-core/initrdscripts/files/init-install-efi.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index c23132ae632d..6e4f3aa03b58 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -259,7 +259,7 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG
# Update grub config for the installed image
# Delete the install entry
-sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
+sed -i "/menuentry 'install/,/^}/d" $GRUBCFG
# initrd is necessary to boot from MD device
if [ ! "${device#/dev/md}" = "${device}" ]; then
cp /run/media/$1/initrd /boot
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] oe-core: add ledmon to support Intel VROC
This add ledmon demon to control Intel VROC's SSD disk led.
Signed-off-by: Liwei Song
---
meta/recipes-extended/ledmon/ledmon_git.bb | 32 ++
1 file changed, 32 insertions(+)
create mode 100644 meta/recipes-extended/ledmon/ledmon_git.bb
diff --git a/meta/recipes-extended/ledmon/ledmon_git.bb
b/meta/recipes-extended/ledmon/ledmon_git.bb
new file mode 100644
index ..77a620860cab
--- /dev/null
+++ b/meta/recipes-extended/ledmon/ledmon_git.bb
@@ -0,0 +1,32 @@
+SUMMARY = "Intel(R) Enclosure LED Utilities"
+
+DESCRIPTION = "The utilities are designed primarily to be used on storage
servers \
+ utilizing MD devices (aka Linux Software RAID) for RAID arrays.\
+"
+HOMEPAGE = "https://github.com/intel/ledmon;
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+"
+
+DEPENDS = " udev sg3-utils"
+
+PARALLEL_MAKE = ""
+
+SRC_URI = "git://github.com/intel/ledmon;branch=master"
+SRCREV = "8a5d9526e5666e75625427b85a2586436651e89c"
+
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
+
+S = "${WORKDIR}/git"
+EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'"
+
+do_compile() {
+oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
+}
+
+do_install() {
+ oe_runmake install DESTDIR=${D}
+ cd ${S}/systemd
+ oe_runmake install DESTDIR=${D}
+}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] initramfs-framework: add lvm module
lvm module will initial lvm volume to support boot from
Logical Volume.
Signed-off-by: Liwei Song
---
meta/recipes-core/initrdscripts/initramfs-framework/lvm| 13 +
meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 9 +
2 files changed, 22 insertions(+)
create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/lvm
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/lvm
b/meta/recipes-core/initrdscripts/initramfs-framework/lvm
new file mode 100644
index ..7deeccb9a29e
--- /dev/null
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/lvm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+lvm_enabled() {
+ if ! lvscan |grep -i -w "inactive" &>/dev/null;then
+ return 1
+ fi
+ return 0
+}
+
+lvm_run() {
+ lvm pvscan --cache --activate ay
+ udevadm trigger --action=add
+}
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
index 660343eafa23..c53a0c03ae6c 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb
@@ -17,6 +17,7 @@ SRC_URI = "file://init \
file://udev \
file://e2fs \
file://debug \
+ file://lvm \
"
S = "${WORKDIR}"
@@ -45,6 +46,9 @@ do_install() {
# debug
install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug
+# lvm
+install -m 0755 ${WORKDIR}/lvm ${D}/init.d/09-lvm
+
# Create device nodes expected by some kernels in initramfs
# before even executing /init.
install -d ${D}/dev
@@ -59,6 +63,7 @@ PACKAGES = "${PN}-base \
initramfs-module-nfsrootfs \
initramfs-module-rootfs \
initramfs-module-debug \
+initramfs-module-lvm \
"
FILES_${PN}-base = "/init /init.d/99-finish /dev"
@@ -98,3 +103,7 @@ FILES_initramfs-module-rootfs = "/init.d/90-rootfs"
SUMMARY_initramfs-module-debug = "initramfs dynamic debug support"
RDEPENDS_initramfs-module-debug = "${PN}-base"
FILES_initramfs-module-debug = "/init.d/00-debug"
+
+SUMMARY_initramfs-module-lvm = "initramfs lvm rootfs support"
+RDEPENDS_initramfs-module-lvm = "${PN}-base"
+FILES_initramfs-module-lvm = "/init.d/09-lvm"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] init-install: add support for install image to Intel VROC raid disk
Intel VROC raid device named as /dev/mdXX, now it only can boot with
initramfs method because it need mdadm to do initial work in it, so do
not remove initrd for such kind device.
It also use "p" as partition prefix, adjust it to aviod use a wrong device name
durning install.
Signed-off-by: Liwei Song
---
.../initrdscripts/files/init-install-efi.sh| 23 ++
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index b6855b5aac0f..c23132ae632d 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -44,9 +44,10 @@ echo "Searching for hard drives ..."
# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
# we're currently only interested in the root device so pick them wisely
-devices=`ls /sys/block/ | grep -v mmcblk` || true
+devices=`ls /sys/block/ | grep -v "mmcblk\|md\|dm"` || true
mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true
-devices="$devices $mmc_devices"
+md_devices=`cat /proc/mdstat |grep -w active |awk -F":" '{print $1}'` || true
+devices="$devices $mmc_devices $md_devices"
for device in $devices; do
case $device in
@@ -165,6 +166,14 @@ if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
rootwait="rootwait"
fi
+# MD raid device use partition prefix charater 'p'
+# and it need a larger capacity to store initrd,
+# considering some debug purpose, enlarge it to 1G.
+if [ ! "${device#/dev/md}" = "${device}" ]; then
+part_prefix="p"
+boot_size=1024
+fi
+
# USB devices also require rootwait
if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
rootwait="rootwait"
@@ -251,8 +260,14 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
# Update grub config for the installed image
# Delete the install entry
sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
-# Delete the initrd lines
-sed -i "/initrd /d" $GRUBCFG
+# initrd is necessary to boot from MD device
+if [ ! "${device#/dev/md}" = "${device}" ]; then
+ cp /run/media/$1/initrd /boot
+ cp /run/media/$1/startup.nsh /boot
+else
+ # Delete the initrd lines
+ sed -i "/initrd /d" $GRUBCFG
+fi
# Delete any LABEL= strings
sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
# Replace root= and add additional standard boot options
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] udev-extraconf: move md* and dm* from mount blacklist
When use rootfs.img as rootfs, root=/dev/ram0 was set, init will search rootfs.img from all automount point, if deploy it to MD or DM device, rootfs.img will not be found, then boot failed. Do not black MD and DM device to allow boot from raid disk or raid LVM volume. Signed-off-by: Liwei Song --- meta/recipes-core/udev/udev-extraconf/mount.blacklist | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-core/udev/udev-extraconf/mount.blacklist b/meta/recipes-core/udev/udev-extraconf/mount.blacklist index e49349428bd3..d3ebb17176b1 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.blacklist +++ b/meta/recipes-core/udev/udev-extraconf/mount.blacklist @@ -1,5 +1,3 @@ /dev/loop /dev/ram /dev/mtdblock -/dev/md -/dev/dm-* -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] mdadm: add mdmon service to support Intel VROC
Install mdmon@.service to make Intel VROC work well.
mdmon@.service called from udev is used to update Intel VROC metadata,
with it the VROC raid is operational to read or write under user space.
Signed-off-by: Liwei Song
---
meta/recipes-extended/mdadm/mdadm_4.1.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index d79c533f213a..6b32f08abee1 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -26,7 +26,7 @@ SRC_URI[sha256sum] =
"ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1
inherit autotools-brokensep ptest systemd
-SYSTEMD_SERVICE_${PN} = "mdmonitor.service"
+SYSTEMD_SERVICE_${PN} = "mdmonitor.service mdmon@.service"
SYSTEMD_AUTO_ENABLE = "disable"
CFLAGS_append_toolchain-clang = " -Wno-error=address-of-packed-member"
@@ -57,6 +57,7 @@ do_install_append() {
install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf
install -d ${D}/${systemd_unitdir}/system
install -m 644 ${WORKDIR}/mdmonitor.service
${D}/${systemd_unitdir}/system
+install -m 644 ${S}/systemd/mdmon@.service
${D}/${systemd_unitdir}/system
install -d ${D}/${sysconfdir}/init.d
install -m 755 ${WORKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor
}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] changes to allow boot/install from/to virtual raid disk
These series patches used to add support to install image to Intel Virtual Raid disk and boot from it. To boot from raid disk, mdadm is the necessory tools to initial it, so it must run in initrd to make raid disk available, then rootfs on it can be mounted to use, rootfs can be stored directly in raid disk partition or LVM partition. Liwei Song (8): mdadm: add mdmon service to support Intel VROC mdadm: add udev rules to create by-partuuid for MD devices udev-extraconf: move md* and dm* from mount blacklist initramfs-framework: mount efivarfs to make Intel VROC work well initramfs-framework: add lvm module init-install: add support for install image to Intel VROC raid disk init-install: fix a typo which will led delete section failed when use sed oe-core: add ledmon to support Intel VROC .../initrdscripts/files/init-install-efi.sh| 25 + .../initrdscripts/initramfs-framework/init | 5 .../initrdscripts/initramfs-framework/lvm | 13 + .../initrdscripts/initramfs-framework_1.0.bb | 9 ++ .../udev/udev-extraconf/mount.blacklist| 2 -- meta/recipes-extended/ledmon/ledmon_git.bb | 32 ++ ...ev.rules-create-by-partuuid-for-md-device.patch | 29 meta/recipes-extended/mdadm/mdadm_4.1.bb | 4 ++- 8 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-core/initrdscripts/initramfs-framework/lvm create mode 100644 meta/recipes-extended/ledmon/ledmon_git.bb create mode 100644 meta/recipes-extended/mdadm/files/0001-udev.rules-create-by-partuuid-for-md-device.patch -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] mdadm: add udev rules to create by-partuuid for MD devices
installer use partuuid for boot and swap partition,
But the udev rules for MD devices do not have rules to create
by-partuuid under /dev/disk/, this will take 90s to wait until failed
add the rules to create by-partuuid to support boot from raid
disk with "root=PARTUUID=XXX"
Signed-off-by: Liwei Song
---
...ev.rules-create-by-partuuid-for-md-device.patch | 29 ++
meta/recipes-extended/mdadm/mdadm_4.1.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644
meta/recipes-extended/mdadm/files/0001-udev.rules-create-by-partuuid-for-md-device.patch
diff --git
a/meta/recipes-extended/mdadm/files/0001-udev.rules-create-by-partuuid-for-md-device.patch
b/meta/recipes-extended/mdadm/files/0001-udev.rules-create-by-partuuid-for-md-device.patch
new file mode 100644
index ..c1f7b1cf8736
--- /dev/null
+++
b/meta/recipes-extended/mdadm/files/0001-udev.rules-create-by-partuuid-for-md-device.patch
@@ -0,0 +1,29 @@
+From 7d1fa6afba936edb3e211f0ccdb58b1472b4bbf4 Mon Sep 17 00:00:00 2001
+From: Liwei Song
+Date: Tue, 26 Feb 2019 07:05:42 +
+Subject: [PATCH] udev.rules: create by-partuuid for md device
+
+Create by-partuuid for every md devices.
+
+Upstream-Status: sent to
linux-r...@vger.kernel.org(https://www.spinics.net/lists/raid/msg62373.html)
+
+Signed-off-by: Liwei Song
+---
+ udev-md-raid-arrays.rules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/udev-md-raid-arrays.rules b/udev-md-raid-arrays.rules
+index c95ec7b1e4a9..e326414efcbc 100644
+--- a/udev-md-raid-arrays.rules
b/udev-md-raid-arrays.rules
+@@ -30,6 +30,7 @@ IMPORT{builtin}="blkid"
+ OPTIONS+="link_priority=100"
+ OPTIONS+="watch"
+ ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*",
SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
++ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_PART_ENTRY_UUID}=="?*",
SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}"
+ ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*",
SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+ ENV{MD_LEVEL}=="raid[1-9]*", ENV{SYSTEMD_WANTS}+="mdmonitor.service"
+--
+2.11.0
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb
b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 6b32f08abee1..db2b0b3c7873 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -20,6 +20,7 @@ SRC_URI =
"${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
file://mdadm.init \
file://mdmonitor.service \
file://0001-mdadm-gcc8-maybe-uninitialized-format-overflow-warni.patch \
+ file://0001-udev.rules-create-by-partuuid-for-md-device.patch \
"
SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
SRC_URI[sha256sum] =
"ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-firmware: package rtl8168 firmware
Add package for rtl8168 firmware which is required by Realtek
Ethernet Controller.
Signed-off-by: Liwei Song
---
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 8d6f2f2dbded..7d34f421a132 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -232,6 +232,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-ti-connectivity-license ${PN}-wl12xx ${PN}-wl18xx \
${PN}-vt6656-license ${PN}-vt6656 \
${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce
${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \
+ ${PN}-rtl8168 \
${PN}-broadcom-license \
${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 \
${PN}-bcm43362 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \
@@ -440,6 +441,7 @@ LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware"
LICENSE_${PN}-rtl8723 = "Firmware-rtlwifi_firmware"
LICENSE_${PN}-rtl8821 = "Firmware-rtlwifi_firmware"
LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware"
+LICENSE_${PN}-rtl8168 = "WHENCE"
FILES_${PN}-rtl-license = " \
${nonarch_base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \
@@ -462,6 +464,9 @@ FILES_${PN}-rtl8723 = " \
FILES_${PN}-rtl8821 = " \
${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \
"
+FILES_${PN}-rtl8168 = " \
+ ${nonarch_base_libdir}/firmware/rtl_nic/rtl8168*.fw \
+"
RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license"
RDEPENDS_${PN}-rtl8192ce += "${PN}-rtl-license"
@@ -469,6 +474,7 @@ RDEPENDS_${PN}-rtl8192cu += "${PN}-rtl-license"
RDEPENDS_${PN}-rtl8192su = "${PN}-rtl-license"
RDEPENDS_${PN}-rtl8723 += "${PN}-rtl-license"
RDEPENDS_${PN}-rtl8821 += "${PN}-rtl-license"
+RDEPENDS_${PN}-rtl8168 += "${PN}-whence-license"
# For ti-connectivity
LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-firmware: package all ibt-17-x-x.sfi/ddc firmware
All ibt-17-x-x.sfi/ddc firmware are use to support Intel Bluetooth 9560
they are needed in different version of Bluetooth driver since
4.14 kernel version.
commit b77bb7afe513 ("linux-firmware: package ibt-17-16-1 firmware")
only package one of the ibt-17 series firmware.
As the Bluetooth driver's update, to avoid packaging the ibt-17 firmware
one by one, install them in one package ibt-17.
Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index e3ff8288c895..cc97c91fd339 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -256,7 +256,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-iwlwifi-misc \
${PN}-ibt-license ${PN}-ibt ${PN}-ibt-misc \
${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7
${PN}-ibt-hw-37-8 \
- ${PN}-ibt-17-16-1 \
+ ${PN}-ibt-17 \
${PN}-i915-license ${PN}-i915 \
${PN}-adsp-sst-license ${PN}-adsp-sst \
${PN}-bnx2-mips \
@@ -681,7 +681,7 @@ LICENSE_${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-11-5= "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-12-16 = "Firmware-ibt_firmware"
-LICENSE_${PN}-ibt-17-16-1 = "Firmware-ibt_firmware"
+LICENSE_${PN}-ibt-17 = "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-misc= "Firmware-ibt_firmware"
FILES_${PN}-ibt-license =
"${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware"
@@ -689,14 +689,14 @@ FILES_${PN}-ibt-hw-37-7 =
"${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bs
FILES_${PN}-ibt-hw-37-8 =
"${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq"
FILES_${PN}-ibt-11-5= "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi
/lib/firmware/intel/ibt-11-5.ddc"
FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi
/lib/firmware/intel/ibt-12-16.ddc"
-FILES_${PN}-ibt-17-16-1 =
"${nonarch_base_libdir}/firmware/intel/ibt-17-16-1.sfi
/lib/firmware/intel/ibt-17-16-1.ddc"
+FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi
/lib/firmware/intel/ibt-17-*.ddc"
FILES_${PN}-ibt-misc= "${nonarch_base_libdir}/firmware/ibt-*"
RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-11-5= "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-12-16 = "${PN}-ibt-license"
-RDEPENDS_${PN}-ibt-17-16-1 = "${PN}-ibt-license"
+RDEPENDS_${PN}-ibt-17 = "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-misc= "${PN}-ibt-license"
ALLOW_EMPTY_${PN}-ibt= "1"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] linux-firmware: package ibt-17-16-1 firmware
Package ibt-17-16-1 firmware for Bluetooth device 9460/9560
Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index b7da1aae988d..431110a509a8 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -253,6 +253,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-iwlwifi-misc \
${PN}-ibt-license ${PN}-ibt ${PN}-ibt-misc \
${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7
${PN}-ibt-hw-37-8 \
+ ${PN}-ibt-17-16-1 \
${PN}-i915-license ${PN}-i915 \
${PN}-adsp-sst-license ${PN}-adsp-sst \
${PN}-bnx2-mips \
@@ -674,6 +675,7 @@ LICENSE_${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-11-5= "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-12-16 = "Firmware-ibt_firmware"
+LICENSE_${PN}-ibt-17-16-1 = "Firmware-ibt_firmware"
LICENSE_${PN}-ibt-misc= "Firmware-ibt_firmware"
FILES_${PN}-ibt-license =
"${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware"
@@ -681,12 +683,14 @@ FILES_${PN}-ibt-hw-37-7 =
"${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bs
FILES_${PN}-ibt-hw-37-8 =
"${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq"
FILES_${PN}-ibt-11-5= "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi
/lib/firmware/intel/ibt-11-5.ddc"
FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi
/lib/firmware/intel/ibt-12-16.ddc"
+FILES_${PN}-ibt-17-16-1 =
"${nonarch_base_libdir}/firmware/intel/ibt-17-16-1.sfi
/lib/firmware/intel/ibt-17-16-1.ddc"
FILES_${PN}-ibt-misc= "${nonarch_base_libdir}/firmware/ibt-*"
RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-11-5= "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-12-16 = "${PN}-ibt-license"
+RDEPENDS_${PN}-ibt-17-16-1 = "${PN}-ibt-license"
RDEPENDS_${PN}-ibt-misc= "${PN}-ibt-license"
ALLOW_EMPTY_${PN}-ibt= "1"
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] linux-firmware: package iwlwifi-9000 series fimware
Add package for 9000 seires Intel wireless firmware.
Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 4
1 file changed, 4 insertions(+)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index b194a59ecb50..b7da1aae988d 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -249,6 +249,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-iwlwifi-7260 \
${PN}-iwlwifi-7265 \
${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \
+ ${PN}-iwlwifi-9000 \
${PN}-iwlwifi-misc \
${PN}-ibt-license ${PN}-ibt ${PN}-ibt-misc \
${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7
${PN}-ibt-hw-37-8 \
@@ -596,6 +597,7 @@ LICENSE_${PN}-iwlwifi-7265 =
"Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware"
+LICENSE_${PN}-iwlwifi-9000 = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware"
LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware"
@@ -622,6 +624,7 @@ FILES_${PN}-iwlwifi-7265 =
"${nonarch_base_libdir}/firmware/iwlwifi-7265-*.uco
FILES_${PN}-iwlwifi-7265d =
"${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode"
FILES_${PN}-iwlwifi-8000c =
"${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode"
FILES_${PN}-iwlwifi-8265 =
"${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode"
+FILES_${PN}-iwlwifi-9000 =
"${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode"
FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode"
RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
@@ -645,6 +648,7 @@ RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license"
+RDEPENDS_${PN}-iwlwifi-9000 = "${PN}-iwlwifi-license"
RDEPENDS_${PN}-iwlwifi-misc = "${PN}-iwlwifi-license"
# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi
--
2.13.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] xf86-video-intel: enable graphic and audio support for CFL-S Sku
Add PCI IDs for Coffeelake S Skus to enalbe Graphic and audio
support.
Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
.../0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch | 116 +
.../xorg-driver/xf86-video-intel_git.bb| 1 +
2 files changed, 117 insertions(+)
create mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
diff --git
a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
new file mode 100644
index ..b7ed8d40df80
--- /dev/null
+++
b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
@@ -0,0 +1,116 @@
+From 96d4e8e7b8a699f0ef77fa7b210d4de5f1c703d0 Mon Sep 17 00:00:00 2001
+From: Liwei Song <liwei.s...@windriver.com>
+Date: Wed, 22 Nov 2017 08:59:03 +
+Subject: [PATCH] Add Coffeelake PCI IDs for S Skus
+
+Add the Coffeelake PCI IDs based on the following kernel patches:
+
+commit b056f8f3d6b900e8afd19f312719160346d263b4
+Author: Anusha Srivatsa <anusha.sriva...@intel.com>
+Date: Thu Jun 8 16:41:05 2017 -0700
+
+drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.
+
+Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10139905]
+
+Signed-off-by: Liwei Song <liwei.s...@windriver.com>
+---
+ src/i915_pciids.h | 7 +++
+ src/intel_module.c| 13 +
+ src/sna/gen9_render.c | 12
+ 3 files changed, 32 insertions(+)
+
+diff --git a/src/i915_pciids.h b/src/i915_pciids.h
+index 0370f830c541..11ccfa9c047a 100644
+--- a/src/i915_pciids.h
b/src/i915_pciids.h
+@@ -340,4 +340,11 @@
+ INTEL_VGA_DEVICE(0x3184, info), \
+ INTEL_VGA_DEVICE(0x3185, info)
+
++#define INTEL_CFL_S_IDS(info) \
++ INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \
++ INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \
++ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \
++ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \
++ INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */
++
+ #endif /* _I915_PCIIDS_H */
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 6b04857e2853..4827a67255f0 100644
+--- a/src/intel_module.c
b/src/intel_module.c
+@@ -138,6 +138,10 @@ static const struct intel_device_info
intel_geminilake_info = {
+ .gen = 0113,
+ };
+
++static const struct intel_device_info intel_coffeelake_info = {
++ .gen = 0114,
++};
++
+ static const SymTabRec intel_chipsets[] = {
+ {PCI_CHIP_I810, "i810"},
+ {PCI_CHIP_I810_DC100, "i810-dc100"},
+@@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = {
+ {0x5916, "HD Graphics 620"},
+ {0x591E, "HD Graphics 615"},
+
++ /*Coffeelake*/
++ {0x3E90, "HD Graphics"},
++ {0x3E93, "HD Graphics"},
++ {0x3E91, "HD Graphics"},
++ {0x3E92, "HD Graphics"},
++ {0x3E96, "HD Graphics"},
++
+ /* When adding new identifiers, also update:
+* 1. intel_identify()
+* 2. man/intel.man
+@@ -368,6 +379,8 @@ static const struct pci_id_match intel_device_match[] = {
+
+ INTEL_GLK_IDS(_geminilake_info),
+
++ INTEL_CFL_S_IDS(_coffeelake_info),
++
+ INTEL_VGA_DEVICE(PCI_MATCH_ANY, _generic_info),
+ #endif
+
+diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c
+index e5f12c723956..7f49052c5ec1 100644
+--- a/src/sna/gen9_render.c
b/src/sna/gen9_render.c
+@@ -245,6 +245,11 @@ static const struct gt_info glk_gt_info = {
+ .urb = { .max_vs_entries = 320 },
+ };
+
++static const struct gt_info cfl_gt_info = {
++ .name = "Coffeelake (gen9)",
++ .urb = { .max_vs_entries = 960 },
++};
++
+ static bool is_skl(struct sna *sna)
+ {
+ return sna->kgem.gen == 0110;
+@@ -265,6 +270,11 @@ static bool is_glk(struct sna *sna)
+ return sna->kgem.gen == 0113;
+ }
+
++static bool is_cfl(struct sna *sna)
++{
++ return sna->kgem.gen == 0114;
++}
++
+
+ static inline bool too_large(int width, int height)
+ {
+@@ -4040,6 +4050,8 @@ static bool gen9_render_setup(struct sna *sna)
+ state->info = _gt_info;
+ if (is_glk(sna))
+ state->info = _gt_info;
++ if (is_cfl(sna))
++ state->info = _gt_info;
+
+ sna_static_stream_init();
+
+--
+2.13.3
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 138dfddcf34a..9aff9d8c2291 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -16,6 +16,7 @@ S = "${WORKDIR}/git"
SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-int
Re: [OE-core] [PATCH] xf86-video-intel: enable graphic and audio support for CFL-S Sku
On 01/10/2018 08:43 PM, Alexander Kanavin wrote: > On 01/10/2018 11:43 AM, Liwei Song wrote: > >> +Upstream-Status: Submitted [intel-...@lists.freedesktop.org] > > Please add a link to the actual submission post in the mailing list archive, > so we can track what happened to it. Got it. Thanks, Liwei. > > Alex > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xf86-video-intel: enable graphic and audio support for CFL-S Sku
Add PCI IDs for Coffeelake S Skus to enalbe Graphic and audio
support.
Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
.../0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch | 116 +
.../xorg-driver/xf86-video-intel_git.bb| 1 +
2 files changed, 117 insertions(+)
create mode 100644
meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
diff --git
a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
new file mode 100644
index ..b7ed8d40df80
--- /dev/null
+++
b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch
@@ -0,0 +1,116 @@
+From 96d4e8e7b8a699f0ef77fa7b210d4de5f1c703d0 Mon Sep 17 00:00:00 2001
+From: Liwei Song <liwei.s...@windriver.com>
+Date: Wed, 22 Nov 2017 08:59:03 +
+Subject: [PATCH] Add Coffeelake PCI IDs for S Skus
+
+Add the Coffeelake PCI IDs based on the following kernel patches:
+
+commit b056f8f3d6b900e8afd19f312719160346d263b4
+Author: Anusha Srivatsa <anusha.sriva...@intel.com>
+Date: Thu Jun 8 16:41:05 2017 -0700
+
+drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.
+
+Upstream-Status: Submitted [intel-...@lists.freedesktop.org]
+
+Signed-off-by: Liwei Song <liwei.s...@windriver.com>
+---
+ src/i915_pciids.h | 7 +++
+ src/intel_module.c| 13 +
+ src/sna/gen9_render.c | 12
+ 3 files changed, 32 insertions(+)
+
+diff --git a/src/i915_pciids.h b/src/i915_pciids.h
+index 0370f830c541..11ccfa9c047a 100644
+--- a/src/i915_pciids.h
b/src/i915_pciids.h
+@@ -340,4 +340,11 @@
+ INTEL_VGA_DEVICE(0x3184, info), \
+ INTEL_VGA_DEVICE(0x3185, info)
+
++#define INTEL_CFL_S_IDS(info) \
++ INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \
++ INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \
++ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \
++ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \
++ INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */
++
+ #endif /* _I915_PCIIDS_H */
+diff --git a/src/intel_module.c b/src/intel_module.c
+index 6b04857e2853..4827a67255f0 100644
+--- a/src/intel_module.c
b/src/intel_module.c
+@@ -138,6 +138,10 @@ static const struct intel_device_info
intel_geminilake_info = {
+ .gen = 0113,
+ };
+
++static const struct intel_device_info intel_coffeelake_info = {
++ .gen = 0114,
++};
++
+ static const SymTabRec intel_chipsets[] = {
+ {PCI_CHIP_I810, "i810"},
+ {PCI_CHIP_I810_DC100, "i810-dc100"},
+@@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = {
+ {0x5916, "HD Graphics 620"},
+ {0x591E, "HD Graphics 615"},
+
++ /*Coffeelake*/
++ {0x3E90, "HD Graphics"},
++ {0x3E93, "HD Graphics"},
++ {0x3E91, "HD Graphics"},
++ {0x3E92, "HD Graphics"},
++ {0x3E96, "HD Graphics"},
++
+ /* When adding new identifiers, also update:
+* 1. intel_identify()
+* 2. man/intel.man
+@@ -368,6 +379,8 @@ static const struct pci_id_match intel_device_match[] = {
+
+ INTEL_GLK_IDS(_geminilake_info),
+
++ INTEL_CFL_S_IDS(_coffeelake_info),
++
+ INTEL_VGA_DEVICE(PCI_MATCH_ANY, _generic_info),
+ #endif
+
+diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c
+index e5f12c723956..7f49052c5ec1 100644
+--- a/src/sna/gen9_render.c
b/src/sna/gen9_render.c
+@@ -245,6 +245,11 @@ static const struct gt_info glk_gt_info = {
+ .urb = { .max_vs_entries = 320 },
+ };
+
++static const struct gt_info cfl_gt_info = {
++ .name = "Coffeelake (gen9)",
++ .urb = { .max_vs_entries = 960 },
++};
++
+ static bool is_skl(struct sna *sna)
+ {
+ return sna->kgem.gen == 0110;
+@@ -265,6 +270,11 @@ static bool is_glk(struct sna *sna)
+ return sna->kgem.gen == 0113;
+ }
+
++static bool is_cfl(struct sna *sna)
++{
++ return sna->kgem.gen == 0114;
++}
++
+
+ static inline bool too_large(int width, int height)
+ {
+@@ -4040,6 +4050,8 @@ static bool gen9_render_setup(struct sna *sna)
+ state->info = _gt_info;
+ if (is_glk(sna))
+ state->info = _gt_info;
++ if (is_cfl(sna))
++ state->info = _gt_info;
+
+ sna_static_stream_init();
+
+--
+2.13.3
+
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 138dfddcf34a..9aff9d8c2291 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -16,6 +16,7 @@ S = "${WORKDIR}/git"
SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \
Re: [OE-core] [PATCH] linux-firmware: package qat-firmware
On 09/20/2017 12:50 AM, Burton, Ross wrote:
> On 5 September 2017 at 10:27, Liwei Song <liwei.s...@windriver.com> wrote:
>
>> + ${PN}-qat-license ${PN}-qat_895xcc ${PN}-qat_895xcc_mmp
>> ${PN}-qat_c3xxx ${PN}-qat_c3xxx_mmp ${PN}-qat_c62x ${PN}-qat_c62x_mmp
>> ${PN}-qat_mmp \
>>
>
> *** Error: Package name contains illegal characters, (other than
> [a-z0-9.+-])
>
> You can't use _ in packages, please just use -.
Got it, Thanks, I will resend a V2, please ignore this one.
Thanks,
Liwei.
>
> Ross
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-firmware: package qat-firmware
Add packages for QAT firmware
Signed-off-by: Liwei Song <liwei.s...@windriver.com>
---
.../linux-firmware/linux-firmware_git.bb | 27 ++
1 file changed, 27 insertions(+)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 3b363778f8bf..fc67f2811c08 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -253,6 +253,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-ibt-license ${PN}-ibt ${PN}-ibt-misc \
${PN}-ibt-11-5 ${PN}-ibt-12-16 ${PN}-ibt-hw-37-7
${PN}-ibt-hw-37-8 \
${PN}-i915-license ${PN}-i915 \
+ ${PN}-qat-license ${PN}-qat_895xcc ${PN}-qat_895xcc_mmp
${PN}-qat_c3xxx ${PN}-qat_c3xxx_mmp ${PN}-qat_c62x ${PN}-qat_c62x_mmp
${PN}-qat_mmp \
${PN}-adsp-sst-license ${PN}-adsp-sst \
${PN}-bnx2-mips \
${PN}-netronome-license ${PN}-netronome \
@@ -679,6 +680,32 @@ LICENSE_${PN}-adsp-sst-license= "Firmware-adsp_sst"
FILES_${PN}-adsp-sst =
"${nonarch_base_libdir}/firmware/intel/dsp_fw*"
RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license"
+# For qat
+LICENSE_${PN}-qat_895xcc = "Firmware-qat"
+LICENSE_${PN}-qat_895xcc_mmp = "Firmware-qat"
+LICENSE_${PN}-qat_c3xxx= "Firmware-qat"
+LICENSE_${PN}-qat_c3xxx_mmp= "Firmware-qat"
+LICENSE_${PN}-qat_c62x = "Firmware-qat"
+LICENSE_${PN}-qat_c62x_mmp = "Firmware-qat"
+LICENSE_${PN}-qat_mmp = "Firmware-qat"
+
+FILES_${PN}-qat-license=
"${nonarch_base_libdir}/firmware/LICENCE.qat_firmware"
+FILES_${PN}-qat_895xcc =
"${nonarch_base_libdir}/firmware/qat_895xcc.bin"
+FILES_${PN}-qat_895xcc_mmp =
"${nonarch_base_libdir}/firmware/qat_895xcc_mmp.bin"
+FILES_${PN}-qat_c3xxx =
"${nonarch_base_libdir}/firmware/qat_c3xxx.bin"
+FILES_${PN}-qat_c3xxx_mmp =
"${nonarch_base_libdir}/firmware/qat_c3xxx_mmp.bin"
+FILES_${PN}-qat_c62x = "${nonarch_base_libdir}/firmware/qat_c62x.bin"
+FILES_${PN}-qat_c62x_mmp =
"${nonarch_base_libdir}/firmware/qat_c62x_mmp.bin"
+FILES_${PN}-qat_mmp= "${nonarch_base_libdir}/firmware/qat_mmp.bin"
+
+RDEPENDS_${PN}-qat_895xcc = "${PN}-qat-license"
+RDEPENDS_${PN}-qat_895xcc_mmp = "${PN}-qat-license"
+RDEPENDS_${PN}-qat_c3xxx = "${PN}-qat-license"
+RDEPENDS_${PN}-qat_c3xxx_mmp = "${PN}-qat-license"
+RDEPENDS_${PN}-qat_c62x = "${PN}-qat-license"
+RDEPENDS_${PN}-qat_c62x_mmp = "${PN}-qat-license"
+RDEPENDS_${PN}-qat_mmp = "${PN}-qat-license"
+
# For other firmwares
# Maybe split out to separate packages when needed.
LICENSE_${PN} = "\
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
