Merge pull request #313 from mythi/ci

mythi · web-flow · commit 8a32e3b65dd0 · 2017-09-18T21:18:04.000+03:00
refkit: use libmnl from @core layer
diff --git a/meta-refkit/conf/distro/include/refkit-supported-recipes.txt b/meta-refkit/conf/distro/include/refkit-supported-recipes.txt
@@ -239,7 +239,7 @@ libinput@core
 libjpeg-turbo@core
 libksba@core
 libmicrohttpd@soletta
-libmnl@networking-layer
+libmnl@core
 libmpc@core
 libnftnl@networking-layer
 libnl@core
diff --git a/meta-refkit/conf/distro/refkit.conf b/meta-refkit/conf/distro/refkit.conf
@@ -183,6 +183,7 @@ INHERIT += "supported-recipes"
 # want to take from the layer that normally would be chosen.
 BBMASK += " \
     meta-oe/recipes-graphics/xorg-driver/xf86-video-mga \
+    meta-networking/recipes-filter/libmnl \
     meta-intel/common/recipes-core/ovmf \
 "
 

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ INHERIT += "supported-recipes"`
`183`	`183`	`# want to take from the layer that normally would be chosen.`
`184`	`184`	`BBMASK += " \`
`185`	`185`	`meta-oe/recipes-graphics/xorg-driver/xf86-video-mga \`
	`186`	`+ meta-networking/recipes-filter/libmnl \`
`186`	`187`	`meta-intel/common/recipes-core/ovmf \`
`187`	`188`	`"`
`188`	`189`