* [oe-core 1/6] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe
2011-11-07 14:19 [oe-core 0/6] Merge more stuff from meta-oe Martin Jansa
@ 2011-11-07 14:19 ` Martin Jansa
2011-11-08 19:15 ` Saul Wold
2011-11-07 14:19 ` [oe-core 2/6] kbd: import " Martin Jansa
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2011-11-07 14:19 UTC (permalink / raw)
To: openembedded-core
* virtual/libsdl is used in sdl.bbclass but nothing was providing it
* rpath disabled because otherwise libtool and ld try to link against
${libdir}/libdl.so.2 on the host
(see OE-classic commit af1a2e0e7626e372f22afbcabf08d9ae6b0d7b01)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
index 6b23344..17a3103 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -10,10 +10,12 @@ SECTION = "libs"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
-DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
+PROVIDES = "virtual/libsdl"
+
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
file://configure_tweak.patch \
@@ -26,25 +28,29 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
inherit autotools binconfig pkgconfig
-EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
- --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
+EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
+ --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
--disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
--disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
--disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
--disable-video-xbios --disable-video-gem --disable-video-dummy \
- --enable-input-events --enable-pthreads \
+ --enable-input-events --enable-input-tslib --enable-pthreads \
${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
--disable-video-svga \
- --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+ --disable-video-picogui --disable-video-qtopia --enable-dlopen \
+ --disable-rpath"
PARALLEL_MAKE = ""
+EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
+
do_configure_prepend() {
# Remove old libtool macros.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
for i in ${MACROS}; do
rm -f acinclude/$i
done
+ export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
}
BBCLASSEXTEND = "nativesdk"
--
1.7.7.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [oe-core 1/6] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe
2011-11-07 14:19 ` [oe-core 1/6] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes " Martin Jansa
@ 2011-11-08 19:15 ` Saul Wold
2011-11-09 16:01 ` Martin Jansa
0 siblings, 1 reply; 12+ messages in thread
From: Saul Wold @ 2011-11-08 19:15 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 11/07/2011 06:19 AM, Martin Jansa wrote:
> * virtual/libsdl is used in sdl.bbclass but nothing was providing it
> * rpath disabled because otherwise libtool and ld try to link against
> ${libdir}/libdl.so.2 on the host
> (see OE-classic commit af1a2e0e7626e372f22afbcabf08d9ae6b0d7b01)
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 18 ++++++++++++------
> 1 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> index 6b23344..17a3103 100644
> --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> @@ -10,10 +10,12 @@ SECTION = "libs"
> LICENSE = "LGPLv2.1"
> LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
>
> -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
> +PROVIDES = "virtual/libsdl"
> +
> +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
> DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
>
Shouldn't the enabling of alsa be based on the DISTRO_FEATURE of alsa?
Sau!
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
> file://configure_tweak.patch \
> @@ -26,25 +28,29 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
>
> inherit autotools binconfig pkgconfig
>
> -EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
> - --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
> +EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
> + --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
> --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
> --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
> --disable-video-xbios --disable-video-gem --disable-video-dummy \
> - --enable-input-events --enable-pthreads \
> + --enable-input-events --enable-input-tslib --enable-pthreads \
> ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> --disable-video-svga \
> - --disable-video-picogui --disable-video-qtopia --enable-dlopen"
> + --disable-video-picogui --disable-video-qtopia --enable-dlopen \
> + --disable-rpath"
>
> PARALLEL_MAKE = ""
>
> +EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
> +
> do_configure_prepend() {
> # Remove old libtool macros.
> MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
> for i in ${MACROS}; do
> rm -f acinclude/$i
> done
> + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
> }
>
> BBCLASSEXTEND = "nativesdk"
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [oe-core 1/6] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes from meta-oe
2011-11-08 19:15 ` Saul Wold
@ 2011-11-09 16:01 ` Martin Jansa
0 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2011-11-09 16:01 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 3793 bytes --]
On Tue, Nov 08, 2011 at 11:15:56AM -0800, Saul Wold wrote:
> On 11/07/2011 06:19 AM, Martin Jansa wrote:
> > * virtual/libsdl is used in sdl.bbclass but nothing was providing it
> > * rpath disabled because otherwise libtool and ld try to link against
> > ${libdir}/libdl.so.2 on the host
> > (see OE-classic commit af1a2e0e7626e372f22afbcabf08d9ae6b0d7b01)
> >
> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > ---
> > meta/recipes-graphics/libsdl/libsdl_1.2.14.bb | 18 ++++++++++++------
> > 1 files changed, 12 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > index 6b23344..17a3103 100644
> > --- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
> > @@ -10,10 +10,12 @@ SECTION = "libs"
> > LICENSE = "LGPLv2.1"
> > LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
> >
> > -DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender"
> > +PROVIDES = "virtual/libsdl"
> > +
> > +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender alsa-lib tslib"
> > DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"
> >
> Shouldn't the enabling of alsa be based on the DISTRO_FEATURE of alsa?
OK
I'll send patch changing this and opengl to PACKAGECONFIG options.
>
> Sau!
>
> > -PR = "r0"
> > +PR = "r1"
> >
> > SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
> > file://configure_tweak.patch \
> > @@ -26,25 +28,29 @@ SRC_URI[sha256sum] = "5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642
> >
> > inherit autotools binconfig pkgconfig
> >
> > -EXTRA_OECONF = "--disable-static --disable-debug --disable-cdrom --enable-threads --enable-timers --enable-endian \
> > - --enable-file --disable-oss --disable-alsa --disable-esd --disable-arts \
> > +EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
> > + --enable-file --disable-oss --enable-alsa --disable-esd --disable-arts \
> > --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
> > --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
> > --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs --disable-video-ps3 \
> > --disable-video-xbios --disable-video-gem --disable-video-dummy \
> > - --enable-input-events --enable-pthreads \
> > + --enable-input-events --enable-input-tslib --enable-pthreads \
> > ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
> > --disable-video-svga \
> > - --disable-video-picogui --disable-video-qtopia --enable-dlopen"
> > + --disable-video-picogui --disable-video-qtopia --enable-dlopen \
> > + --disable-rpath"
> >
> > PARALLEL_MAKE = ""
> >
> > +EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
> > +
> > do_configure_prepend() {
> > # Remove old libtool macros.
> > MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
> > for i in ${MACROS}; do
> > rm -f acinclude/$i
> > done
> > + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
> > }
> >
> > BBCLASSEXTEND = "nativesdk"
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [oe-core 2/6] kbd: import from meta-oe
2011-11-07 14:19 [oe-core 0/6] Merge more stuff from meta-oe Martin Jansa
2011-11-07 14:19 ` [oe-core 1/6] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes " Martin Jansa
@ 2011-11-07 14:19 ` Martin Jansa
2011-11-08 15:36 ` Saul Wold
2011-11-07 14:19 ` [oe-core 3/6] kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools Martin Jansa
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2011-11-07 14:19 UTC (permalink / raw)
To: openembedded-core
* replaces console-tools used in keymaps
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/kbd/kbd_1.15.2.bb | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
new file mode 100644
index 0000000..36e68a0
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "This package contains keytable files and keyboard utilities"
+# everything minus console-fonts is GPLv2+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb"
+
+inherit autotools gettext
+
+BBCLASSEXTEND = "native"
+
+SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
+SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
+SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6"
+
+PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
+
+FILES_${PN}-consolefonts = "${datadir}/consolefonts"
+FILES_${PN}-consoletrans = "${datadir}/consoletrans"
+FILES_${PN}-keymaps = "${datadir}/keymaps"
+FILES_${PN}-unimaps = "${datadir}/unimaps"
--
1.7.7.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [oe-core 2/6] kbd: import from meta-oe
2011-11-07 14:19 ` [oe-core 2/6] kbd: import " Martin Jansa
@ 2011-11-08 15:36 ` Saul Wold
2011-11-08 15:44 ` Martin Jansa
2011-11-08 15:45 ` Koen Kooi
0 siblings, 2 replies; 12+ messages in thread
From: Saul Wold @ 2011-11-08 15:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 11/07/2011 06:19 AM, Martin Jansa wrote:
> * replaces console-tools used in keymaps
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta/recipes-core/kbd/kbd_1.15.2.bb | 19 +++++++++++++++++++
> 1 files changed, 19 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb
>
> diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
> new file mode 100644
> index 0000000..36e68a0
> --- /dev/null
> +++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
> @@ -0,0 +1,19 @@
> +DESCRIPTION = "This package contains keytable files and keyboard utilities"
> +# everything minus console-fonts is GPLv2+
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb"
> +
> +inherit autotools gettext
> +
> +BBCLASSEXTEND = "native"
> +
> +SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
Apparently this is not currently fetchable, do you have an updated
location? I found something at fossies.org, but the COPYING file is
different that your checksum, so I am not sure of the differences.
Sau!
> +SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
> +SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6"
> +
> +PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
> +
> +FILES_${PN}-consolefonts = "${datadir}/consolefonts"
> +FILES_${PN}-consoletrans = "${datadir}/consoletrans"
> +FILES_${PN}-keymaps = "${datadir}/keymaps"
> +FILES_${PN}-unimaps = "${datadir}/unimaps"
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [oe-core 2/6] kbd: import from meta-oe
2011-11-08 15:36 ` Saul Wold
@ 2011-11-08 15:44 ` Martin Jansa
2011-11-08 15:45 ` Koen Kooi
1 sibling, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2011-11-08 15:44 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1751 bytes --]
On Tue, Nov 08, 2011 at 07:36:51AM -0800, Saul Wold wrote:
> On 11/07/2011 06:19 AM, Martin Jansa wrote:
> > * replaces console-tools used in keymaps
> >
> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > ---
> > meta/recipes-core/kbd/kbd_1.15.2.bb | 19 +++++++++++++++++++
> > 1 files changed, 19 insertions(+), 0 deletions(-)
> > create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb
> >
> > diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
> > new file mode 100644
> > index 0000000..36e68a0
> > --- /dev/null
> > +++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
> > @@ -0,0 +1,19 @@
> > +DESCRIPTION = "This package contains keytable files and keyboard utilities"
> > +# everything minus console-fonts is GPLv2+
> > +LICENSE = "GPLv2+"
> > +LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb"
> > +
> > +inherit autotools gettext
> > +
> > +BBCLASSEXTEND = "native"
> > +
> > +SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
>
> Apparently this is not currently fetchable, do you have an updated
> location? I found something at fossies.org, but the COPYING file is
> different that your checksum, so I am not sure of the differences.
Don't know about official mirror, but file on my premirror
http://build.shr-project.org/sources/kbd-1.15.2.tar.bz2
is the same as other google hits:
http://pkgs.fedoraproject.org/repo/pkgs/kbd/kbd-1.15.2.tar.bz2/e850eb91e4d3b94b194efe8e953204c5/kbd-1.15.2.tar.bz2
http://mirror.anl.gov/pub/linux/utils/kbd/kbd-1.15.2.tar.bz2
And I haven't found kbd-1.15.2.tar.bz2 (only 1.15.3) on fissies.org to compare.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [oe-core 2/6] kbd: import from meta-oe
2011-11-08 15:36 ` Saul Wold
2011-11-08 15:44 ` Martin Jansa
@ 2011-11-08 15:45 ` Koen Kooi
1 sibling, 0 replies; 12+ messages in thread
From: Koen Kooi @ 2011-11-08 15:45 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]
Op 8 nov. 2011, om 16:36 heeft Saul Wold het volgende geschreven:
> On 11/07/2011 06:19 AM, Martin Jansa wrote:
>> * replaces console-tools used in keymaps
>>
>> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
>> ---
>> meta/recipes-core/kbd/kbd_1.15.2.bb | 19 +++++++++++++++++++
>> 1 files changed, 19 insertions(+), 0 deletions(-)
>> create mode 100644 meta/recipes-core/kbd/kbd_1.15.2.bb
>>
>> diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
>> new file mode 100644
>> index 0000000..36e68a0
>> --- /dev/null
>> +++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
>> @@ -0,0 +1,19 @@
>> +DESCRIPTION = "This package contains keytable files and keyboard utilities"
>> +# everything minus console-fonts is GPLv2+
>> +LICENSE = "GPLv2+"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb"
>> +
>> +inherit autotools gettext
>> +
>> +BBCLASSEXTEND = "native"
>> +
>> +SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
>
> Apparently this is not currently fetchable, do you have an updated location? I found something at fossies.org, but the COPYING file is different that your checksum, so I am not sure of the differences.
http://www.angstrom-distribution.org/unstable/sources/kbd-1.15.2.tar.bz2 should be good for another 3 years.
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [oe-core 3/6] kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools
2011-11-07 14:19 [oe-core 0/6] Merge more stuff from meta-oe Martin Jansa
2011-11-07 14:19 ` [oe-core 1/6] libsdl: enable cdrom, alsa and tslib, disable rpath and add few fixes " Martin Jansa
2011-11-07 14:19 ` [oe-core 2/6] kbd: import " Martin Jansa
@ 2011-11-07 14:19 ` Martin Jansa
2011-11-07 14:19 ` [oe-core 4/6] task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all Martin Jansa
` (2 subsequent siblings)
5 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2011-11-07 14:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-core/kbd/kbd_1.15.2.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_1.15.2.bb
index 36e68a0..2e0406b 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -6,6 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb"
inherit autotools gettext
BBCLASSEXTEND = "native"
+RREPLACES_${PN} = "console-tools"
+RPROVIDES_${PN} = "console-tools"
+RCONFLICTS_${PN} = "console-tools"
+
+PR = "r1"
SRC_URI="${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2"
SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
--
1.7.7.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [oe-core 4/6] task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all
2011-11-07 14:19 [oe-core 0/6] Merge more stuff from meta-oe Martin Jansa
` (2 preceding siblings ...)
2011-11-07 14:19 ` [oe-core 3/6] kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools Martin Jansa
@ 2011-11-07 14:19 ` Martin Jansa
2011-11-07 14:19 ` [oe-core 5/6] keymaps: depend on kbd instead of console-tools Martin Jansa
2011-11-07 14:19 ` [oe-core 6/6] task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and graphical_init_manager Martin Jansa
5 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2011-11-07 14:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-bsp/keymaps/keymaps_1.0.bb | 6 +++++-
meta/recipes-core/tasks/task-core-boot.bb | 6 ++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 23a3051..4fe7987 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -1,7 +1,11 @@
SUMMARY = "Keyboard maps"
DESCRIPTION = "Keymaps and initscript to set the keymap on bootup."
SECTION = "base"
-RDEPENDS_${PN} = "initscripts console-tools"
+
+# Distro can override initscripts provider
+VIRTUAL-RUNTIME_initscripts ?= "initscripts"
+
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} console-tools"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
index 9e63ebb..05c280d 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/tasks/task-core-boot.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS = "virtual/kernel"
ALLOW_EMPTY = "1"
-PR = "r8"
+PR = "r9"
#
# Set by the machine configuration with packages essential for device bootup
@@ -23,6 +23,8 @@ VIRTUAL-RUNTIME_dev_manager ?= "udev"
VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
# Distro can override init_manager provider
VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
+# Distro can override initscripts provider
+VIRTUAL-RUNTIME_initscripts ?= "initscripts"
PACKAGES = "\
task-core-boot \
@@ -34,7 +36,7 @@ RDEPENDS_task-core-boot = "\
base-files \
base-passwd \
busybox \
- initscripts \
+ ${VIRTUAL-RUNTIME_initscripts} \
${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
modutils-initscripts \
netbase \
--
1.7.7.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [oe-core 5/6] keymaps: depend on kbd instead of console-tools
2011-11-07 14:19 [oe-core 0/6] Merge more stuff from meta-oe Martin Jansa
` (3 preceding siblings ...)
2011-11-07 14:19 ` [oe-core 4/6] task-core-boot, keymaps: add another VIRTUAL-RUNTIME to allow distributions to use different set of initscripts or no initscripts at all Martin Jansa
@ 2011-11-07 14:19 ` Martin Jansa
2011-11-07 14:19 ` [oe-core 6/6] task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and graphical_init_manager Martin Jansa
5 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2011-11-07 14:19 UTC (permalink / raw)
To: openembedded-core
* nowadays kbd seems more active
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-bsp/keymaps/keymaps_1.0.bb | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 4fe7987..1876db8 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -5,11 +5,12 @@ SECTION = "base"
# Distro can override initscripts provider
VIRTUAL-RUNTIME_initscripts ?= "initscripts"
-RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} console-tools"
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_initscripts} kbd"
+
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r19"
+PR = "r20"
INHIBIT_DEFAULT_DEPS = "1"
--
1.7.7.2
^ permalink raw reply related [flat|nested] 12+ messages in thread* [oe-core 6/6] task-core-x11: use VIRTUAL-RUNTIME variables for xserver_common and graphical_init_manager
2011-11-07 14:19 [oe-core 0/6] Merge more stuff from meta-oe Martin Jansa
` (4 preceding siblings ...)
2011-11-07 14:19 ` [oe-core 5/6] keymaps: depend on kbd instead of console-tools Martin Jansa
@ 2011-11-07 14:19 ` Martin Jansa
5 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2011-11-07 14:19 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-sato/tasks/task-core-x11.bb | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb
index 26d550a..106bc0f 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -30,6 +30,12 @@ ALLOW_EMPTY = "1"
FILEMANAGER ?= "pcmanfm"
FILEMANAGER_mips ?= ""
+# xserver-common, x11-common
+VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
+
+# elsa, xserver-nodm-init
+VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
+
RDEPENDS_task-core-x11-base = "\
dbus \
@@ -42,8 +48,8 @@ RDEPENDS_task-core-x11-base = "\
matchbox-desktop \
matchbox-session \
${XSERVER} \
- x11-common \
- xserver-nodm-init \
+ ${VIRTUAL-RUNTIME_xserver_common} \
+ ${VIRTUAL-RUNTIME_graphical_init_manager} \
liberation-fonts \
xauth \
xhost \
--
1.7.7.2
^ permalink raw reply related [flat|nested] 12+ messages in thread