diff options
| -rw-r--r-- | meta-yocto/conf/distro/include/maintainers.inc | 15 | ||||
| -rw-r--r-- | meta-yocto/conf/distro/poky-tiny.conf | 1 | ||||
| -rw-r--r-- | meta-yocto/conf/local.conf.sample.extended | 3 |
3 files changed, 1 insertions, 18 deletions
diff --git a/meta-yocto/conf/distro/include/maintainers.inc b/meta-yocto/conf/distro/include/maintainers.inc index 6fd83e7691..2148801b6e 100644 --- a/meta-yocto/conf/distro/include/maintainers.inc +++ b/meta-yocto/conf/distro/include/maintainers.inc | |||
| @@ -172,7 +172,6 @@ RECIPE_MAINTAINER_pn-fontconfig = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | |||
| 172 | RECIPE_MAINTAINER_pn-fontsproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | 172 | RECIPE_MAINTAINER_pn-fontsproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>" |
| 173 | RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <Qi.Chen@windriver.com>" | 173 | RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi <Qi.Chen@windriver.com>" |
| 174 | RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John <maxin.john@intel.com>" | 174 | RECIPE_MAINTAINER_pn-formfactor = "Maxin B. John <maxin.john@intel.com>" |
| 175 | RECIPE_MAINTAINER_pn-fotowall = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 176 | RECIPE_MAINTAINER_pn-freetype = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | 175 | RECIPE_MAINTAINER_pn-freetype = "Jussi Kukkonen <jussi.kukkonen@intel.com>" |
| 177 | RECIPE_MAINTAINER_pn-fstests = "Alexander Kanavin <alexander.kanavin@intel.com>" | 176 | RECIPE_MAINTAINER_pn-fstests = "Alexander Kanavin <alexander.kanavin@intel.com>" |
| 178 | RECIPE_MAINTAINER_pn-gawk = "Chen Qi <Qi.Chen@windriver.com>" | 177 | RECIPE_MAINTAINER_pn-gawk = "Chen Qi <Qi.Chen@windriver.com>" |
| @@ -452,7 +451,6 @@ RECIPE_MAINTAINER_pn-mesa-demos = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | |||
| 452 | RECIPE_MAINTAINER_pn-mesa-gl = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | 451 | RECIPE_MAINTAINER_pn-mesa-gl = "Jussi Kukkonen <jussi.kukkonen@intel.com>" |
| 453 | RECIPE_MAINTAINER_pn-meta-ide-support = "Cristian Iorga <cristian.iorga@intel.com>" | 452 | RECIPE_MAINTAINER_pn-meta-ide-support = "Cristian Iorga <cristian.iorga@intel.com>" |
| 454 | RECIPE_MAINTAINER_pn-meta-toolchain = "Cristian Iorga <cristian.iorga@intel.com>" | 453 | RECIPE_MAINTAINER_pn-meta-toolchain = "Cristian Iorga <cristian.iorga@intel.com>" |
| 455 | RECIPE_MAINTAINER_pn-meta-toolchain-qte = "Cristian Iorga <cristian.iorga@intel.com>" | ||
| 456 | RECIPE_MAINTAINER_pn-mingetty = "Kai Kang <kai.kang@windriver.com>" | 454 | RECIPE_MAINTAINER_pn-mingetty = "Kai Kang <kai.kang@windriver.com>" |
| 457 | RECIPE_MAINTAINER_pn-mini-x-session = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | 455 | RECIPE_MAINTAINER_pn-mini-x-session = "Jussi Kukkonen <jussi.kukkonen@intel.com>" |
| 458 | RECIPE_MAINTAINER_pn-minicom = "Maxin B. John <maxin.john@intel.com>" | 456 | RECIPE_MAINTAINER_pn-minicom = "Maxin B. John <maxin.john@intel.com>" |
| @@ -471,9 +469,7 @@ RECIPE_MAINTAINER_pn-mtdev = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | |||
| 471 | RECIPE_MAINTAINER_pn-mtools = "Maxin B. John <maxin.john@intel.com>" | 469 | RECIPE_MAINTAINER_pn-mtools = "Maxin B. John <maxin.john@intel.com>" |
| 472 | RECIPE_MAINTAINER_pn-mx-1.0 = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | 470 | RECIPE_MAINTAINER_pn-mx-1.0 = "Jussi Kukkonen <jussi.kukkonen@intel.com>" |
| 473 | RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>" | 471 | RECIPE_MAINTAINER_pn-nasm = "Richard Purdie <richard.purdie@linuxfoundation.org>" |
| 474 | RECIPE_MAINTAINER_pn-nativesdk-packagegroup-qte-toolchain-host = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 475 | RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Cristian Iorga <cristian.iorga@intel.com>" | 472 | RECIPE_MAINTAINER_pn-nativesdk-qemu-helper = "Cristian Iorga <cristian.iorga@intel.com>" |
| 476 | RECIPE_MAINTAINER_pn-nativesdk-qt4-tools = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 477 | RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>" | 473 | RECIPE_MAINTAINER_pn-ncurses = "Hongxu Jia <hongxu.jia@windriver.com>" |
| 478 | RECIPE_MAINTAINER_pn-neard = "Maxin B. John <maxin.john@intel.com>" | 474 | RECIPE_MAINTAINER_pn-neard = "Maxin B. John <maxin.john@intel.com>" |
| 479 | RECIPE_MAINTAINER_pn-neon = "Maxin B. John <maxin.john@intel.com>" | 475 | RECIPE_MAINTAINER_pn-neon = "Maxin B. John <maxin.john@intel.com>" |
| @@ -512,8 +508,6 @@ RECIPE_MAINTAINER_pn-packagegroup-core-directfb = "Ross Burton <ross.burton@inte | |||
| 512 | RECIPE_MAINTAINER_pn-packagegroup-core-full-cmdline = "Ross Burton <ross.burton@intel.com>" | 508 | RECIPE_MAINTAINER_pn-packagegroup-core-full-cmdline = "Ross Burton <ross.burton@intel.com>" |
| 513 | RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Ross Burton <ross.burton@intel.com>" | 509 | RECIPE_MAINTAINER_pn-packagegroup-core-lsb = "Ross Burton <ross.burton@intel.com>" |
| 514 | RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Ross Burton <ross.burton@intel.com>" | 510 | RECIPE_MAINTAINER_pn-packagegroup-core-nfs = "Ross Burton <ross.burton@intel.com>" |
| 515 | RECIPE_MAINTAINER_pn-packagegroup-core-qt = "Ross Burton <ross.burton@intel.com>" | ||
| 516 | RECIPE_MAINTAINER_pn-packagegroup-core-qt4e = "Ross Burton <ross.burton@intel.com>" | ||
| 517 | RECIPE_MAINTAINER_pn-packagegroup-core-sdk = "Ross Burton <ross.burton@intel.com>" | 511 | RECIPE_MAINTAINER_pn-packagegroup-core-sdk = "Ross Burton <ross.burton@intel.com>" |
| 518 | RECIPE_MAINTAINER_pn-packagegroup-core-ssh-dropbear = "Ross Burton <ross.burton@intel.com>" | 512 | RECIPE_MAINTAINER_pn-packagegroup-core-ssh-dropbear = "Ross Burton <ross.burton@intel.com>" |
| 519 | RECIPE_MAINTAINER_pn-packagegroup-core-ssh-openssh = "Ross Burton <ross.burton@intel.com>" | 513 | RECIPE_MAINTAINER_pn-packagegroup-core-ssh-openssh = "Ross Burton <ross.burton@intel.com>" |
| @@ -525,7 +519,6 @@ RECIPE_MAINTAINER_pn-packagegroup-core-x11 = "Ross Burton <ross.burton@intel.com | |||
| 525 | RECIPE_MAINTAINER_pn-packagegroup-core-x11-base = "Ross Burton <ross.burton@intel.com>" | 519 | RECIPE_MAINTAINER_pn-packagegroup-core-x11-base = "Ross Burton <ross.burton@intel.com>" |
| 526 | RECIPE_MAINTAINER_pn-packagegroup-core-x11-sato = "Ross Burton <ross.burton@intel.com>" | 520 | RECIPE_MAINTAINER_pn-packagegroup-core-x11-sato = "Ross Burton <ross.burton@intel.com>" |
| 527 | RECIPE_MAINTAINER_pn-packagegroup-core-x11-xserver = "Ross Burton <ross.burton@intel.com>" | 521 | RECIPE_MAINTAINER_pn-packagegroup-core-x11-xserver = "Ross Burton <ross.burton@intel.com>" |
| 528 | RECIPE_MAINTAINER_pn-packagegroup-qte-toolchain-target = "Ross Burton <ross.burton@intel.com>" | ||
| 529 | RECIPE_MAINTAINER_pn-packagegroup-self-hosted = "Ross Burton <ross.burton@intel.com>" | 522 | RECIPE_MAINTAINER_pn-packagegroup-self-hosted = "Ross Burton <ross.burton@intel.com>" |
| 530 | RECIPE_MAINTAINER_pn-pango = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | 523 | RECIPE_MAINTAINER_pn-pango = "Jussi Kukkonen <jussi.kukkonen@intel.com>" |
| 531 | RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>" | 524 | RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>" |
| @@ -585,14 +578,6 @@ RECIPE_MAINTAINER_pn-python3-distribute = "Alejandro Hernandez <alejandro.hernan | |||
| 585 | RECIPE_MAINTAINER_pn-python3-setuptools = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>" | 578 | RECIPE_MAINTAINER_pn-python3-setuptools = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>" |
| 586 | RECIPE_MAINTAINER_pn-qemu = "Cristian Iorga <cristian.iorga@intel.com>" | 579 | RECIPE_MAINTAINER_pn-qemu = "Cristian Iorga <cristian.iorga@intel.com>" |
| 587 | RECIPE_MAINTAINER_pn-qemu-helper-native = "Cristian Iorga <cristian.iorga@intel.com>" | 580 | RECIPE_MAINTAINER_pn-qemu-helper-native = "Cristian Iorga <cristian.iorga@intel.com>" |
| 588 | RECIPE_MAINTAINER_pn-qmmp = "Hongxu Jia <hongxu.jia@windriver.com>" | ||
| 589 | RECIPE_MAINTAINER_pn-qt-demo-init = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 590 | RECIPE_MAINTAINER_pn-qt4-embedded = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 591 | RECIPE_MAINTAINER_pn-qt4-graphics-system = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 592 | RECIPE_MAINTAINER_pn-qt4-native = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 593 | RECIPE_MAINTAINER_pn-qt4-x11-free = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 594 | RECIPE_MAINTAINER_pn-qt4e-demo-image = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 595 | RECIPE_MAINTAINER_pn-quicky = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | ||
| 596 | RECIPE_MAINTAINER_pn-quilt = "Robert Yang <liezhi.yang@windriver.com>" | 581 | RECIPE_MAINTAINER_pn-quilt = "Robert Yang <liezhi.yang@windriver.com>" |
| 597 | RECIPE_MAINTAINER_pn-quota = "Maxin B. John <maxin.john@intel.com>" | 582 | RECIPE_MAINTAINER_pn-quota = "Maxin B. John <maxin.john@intel.com>" |
| 598 | RECIPE_MAINTAINER_pn-randrproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>" | 583 | RECIPE_MAINTAINER_pn-randrproto = "Jussi Kukkonen <jussi.kukkonen@intel.com>" |
diff --git a/meta-yocto/conf/distro/poky-tiny.conf b/meta-yocto/conf/distro/poky-tiny.conf index fbcbf1ae71..fcf0a1ec0c 100644 --- a/meta-yocto/conf/distro/poky-tiny.conf +++ b/meta-yocto/conf/distro/poky-tiny.conf | |||
| @@ -137,7 +137,6 @@ PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" | |||
| 137 | PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny" | 137 | PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny" |
| 138 | PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny" | 138 | PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny" |
| 139 | PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" | 139 | PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" |
| 140 | PNBLACKLIST[qt4e-demo-image] = "not buildable with poky-tiny" | ||
| 141 | PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" | 140 | PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" |
| 142 | 141 | ||
| 143 | # Disable python usage in opkg-utils since it won't build with tiny config | 142 | # Disable python usage in opkg-utils since it won't build with tiny config |
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended index bc765a100f..925270b011 100644 --- a/meta-yocto/conf/local.conf.sample.extended +++ b/meta-yocto/conf/local.conf.sample.extended | |||
| @@ -191,8 +191,7 @@ | |||
| 191 | # commercial_lame \ | 191 | # commercial_lame \ |
| 192 | # commercial_libmad \ | 192 | # commercial_libmad \ |
| 193 | # commercial_libomxil \ | 193 | # commercial_libomxil \ |
| 194 | # commercial_mpeg2dec \ | 194 | # commercial_mpeg2dec" |
| 195 | # commercial_qmmp" | ||
| 196 | 195 | ||
| 197 | 196 | ||
| 198 | # | 197 | # |
