* [PATCH v2] Remove last remnants of kernel26 MACHINE_FEATURES
@ 2012-01-07 4:51 Steve Sakoman
2012-01-12 6:26 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Steve Sakoman @ 2012-01-07 4:51 UTC (permalink / raw)
To: openembedded-core; +Cc: Steve Sakoman
There is no reason to continue to carry this feature
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/conf/bitbake.conf | 1 -
meta/conf/machine/include/qemu.inc | 2 +-
.../update-modules/update-modules_1.0.bb | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b858364..336b1d7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -685,7 +685,6 @@ OES_BITBAKE_CONF = "1"
# Machine properties and task-base stuff
##################################################################
-MACHINE_FEATURES ?= "kernel26"
DISTRO_FEATURES ?= ""
# This is used to limit what packages goes into images built, so set big by default
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 3cebfab..10ab76e 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,7 @@
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
+MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
IMAGE_FSTYPES ?= "tar.bz2 ext3"
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index 1ea97a8..dc44965 100644
--- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
@@ -3,8 +3,8 @@ SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
-RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
-PR = "r10"
+RDEPENDS_${PN} = "module-init-tools-depmod"
+PR = "r11"
SRC_URI = "file://update-modules \
file://COPYING.GPL"
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Remove last remnants of kernel26 MACHINE_FEATURES
2012-01-07 4:51 [PATCH v2] Remove last remnants of kernel26 MACHINE_FEATURES Steve Sakoman
@ 2012-01-12 6:26 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2012-01-12 6:26 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Steve Sakoman
On 01/06/2012 08:51 PM, Steve Sakoman wrote:
> There is no reason to continue to carry this feature
>
> Signed-off-by: Steve Sakoman<steve@sakoman.com>
> ---
> meta/conf/bitbake.conf | 1 -
> meta/conf/machine/include/qemu.inc | 2 +-
> .../update-modules/update-modules_1.0.bb | 4 ++--
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index b858364..336b1d7 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -685,7 +685,6 @@ OES_BITBAKE_CONF = "1"
> # Machine properties and task-base stuff
> ##################################################################
>
> -MACHINE_FEATURES ?= "kernel26"
> DISTRO_FEATURES ?= ""
>
> # This is used to limit what packages goes into images built, so set big by default
> diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
> index 3cebfab..10ab76e 100644
> --- a/meta/conf/machine/include/qemu.inc
> +++ b/meta/conf/machine/include/qemu.inc
> @@ -1,7 +1,7 @@
> PCMCIA_MANAGER = "pcmciautils"
> PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
>
> -MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
> +MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
>
> IMAGE_FSTYPES ?= "tar.bz2 ext3"
>
> diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
> index 1ea97a8..dc44965 100644
> --- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
> +++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
> @@ -3,8 +3,8 @@ SECTION = "base"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
>
> -RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
> -PR = "r10"
> +RDEPENDS_${PN} = "module-init-tools-depmod"
> +PR = "r11"
>
> SRC_URI = "file://update-modules \
> file://COPYING.GPL"
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-12 23:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-07 4:51 [PATCH v2] Remove last remnants of kernel26 MACHINE_FEATURES Steve Sakoman
2012-01-12 6:26 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.