* Re: [PATCH] Add new IMAGE_CLASSES variable for classes for image generation
From: McClintock Matthew-B29882 @ 2011-11-02 0:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CAEsOVNdaEPihB8ecoMuxzSw-TR-CsK1ZKsCgcj5nktjtHmA32Q@mail.gmail.com>
On Tue, Nov 1, 2011 at 7:50 PM, McClintock Matthew-B29882
<B29882@freescale.com> wrote:
> IMAGE_CLASSES += "image_types_uboot" and leave the other bit as is...
Except it seems I have to do this:
IMAGE_CLASSES_append = " image_types_uboot"
if I want the value to actually be appended.
-M
^ permalink raw reply
* Re: [PATCH] Add new IMAGE_CLASSES variable for classes for image generation
From: McClintock Matthew-B29882 @ 2011-11-02 0:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <4EB08F6B.5080009@intel.com>
On Tue, Nov 1, 2011 at 7:31 PM, Saul Wold <saul.wold@intel.com> wrote:
>> +# Additional image generation features
>> +#
>> +# The following is a list of classes to import to use in the generation
>> of images
>> +# currently an example class is image_types_uboot
>> +# IMAGE_CLASSES ?= "image_types_uboot"
>> +
>> #
>> # Runtime testing of images
>> #
>> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
>> index 05f4331..e932879 100644
>> --- a/meta/classes/image.bbclass
>> +++ b/meta/classes/image.bbclass
>> @@ -111,7 +111,8 @@ def get_devtable_list(d):
>> str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
>> return str
>>
>> -inherit image_types
>> +IMAGE_CLASSES = "image_types"
>> +inherit ${IMAGE_CLASSES}
>>
> Does this really work with =, should it not be ?= here?
Ugh. No. This was an attempt to fix this:
+IMAGE_CLASSES ??= ""
+inherit image_types ${IMAGE_CLASSES}
which gives the following bitbake error:
ERROR: classes/.bbclass is not a BitBake file
ERROR: Command execution failed: Exited with 1
when IMAGE_CLASSES is left as "". It's trying to inherit a ".bbclass"
file. There is no good alternative because I have to enforce
IMAGE_CLASSES is only modified by appending to it. So the only
solution is to modifed the local.conf.sample to say
IMAGE_CLASSES += "image_types_uboot" and leave the other bit as is...
-M
^ permalink raw reply
* Re: [PATCH 0/3] RFC v3: provide 3.0.x and 3.1 libc headers
From: Bruce Ashfield @ 2011-11-02 0:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Saul Wold
In-Reply-To: <4EB092D4.40300@intel.com>
On 11-11-01 8:46 PM, Saul Wold wrote:
> On 11/01/2011 05:41 PM, Bruce Ashfield wrote:
>> On Thu, Oct 27, 2011 at 10:32 AM, Bruce Ashfield
>> <bruce.ashfield@windriver.com> wrote:
>>> Richard,
>>>
>>> Here's v3 of the series, the details are below.
>>
>> I see no comments on v3. So I'm just bumping the thread. Should I send
>> a separate
>> pull request for this, or is this sufficient ?
>>
>
> Appears that RP merged them in the last day or so. So I guess this is
> sufficent, consider them merged into OE-Core!
Aargh! Thanks, I pulled this morning and didn't see them, but didn't
take a closer look.
I'll check this off my list .. only 4000 things remaining :)
Bruce
>
> Thanks
> Sau!
>
>
>> Bruce
>>
>> p.s. yes, I realize that everyone is catching up, I just didn't want
>> to forget myself that
>> this is out, but not merged or in a known state.
>>
>>>
>>> Changes since v2:
>>>
>>> - moved more code into the .inc file
>>> - modifed the python code to not import unnecessary functions and
>>> to use d.get/setVar.
>>> - Included an optional patch 3/3 to remove 2.6 based header recipes.
>>> Whether you want this or not .. is up to you!
>>>
>>> Changes since v1:
>>>
>>> - factored common code out into the .inc file. Captured in patch 1/2
>>> - patch 2/2 is the introduction of the new headers
>>>
>>> v1 Email is included below:
>>>
>>> Here's a RFC patch for updating the toolchain linux-libc headers to 3.x
>>> variants.
>>>
>>> The reason I'm calling it a RFC is:
>>>
>>> - I wrote some anonymous python code (and I'm no python coder) to
>>> deal with 2.6 / 3.0 tgz location differences. This could have
>>> also been done with a variable set in the recipes and used by
>>> the .inc. I wasn't sure of the preferred approach, hence the RFC.
>>> I'll take no offense corrections here.
>>>
>>> - I changed the .inc, but didn't bump the PR of the existing recipes
>>> and didn't remove the existing 2.6 variants. If either of these
>>> should have been done, let me know and I'll respin.
>>>
>>> - I bumped the default to be 3.1. If that's too agressive for the
>>> default, and we'd prefer 3.0.8, let me know and I'll respin.
>>>
>>> I built and booted all the qemu machines with the 3.1 kernel headers. So
>>> from the testing I was able to do, this looks to be safe and ready to
>>> go.
>>>
>>> This is based on my yocto repo, I also did the changes in my oe-core
>>> repository, but I don't have a oe-core contrib branch that I could
>>> push to,
>>> so I chose to send the yocto variant. If someone points me to who I
>>> email for
>>> an oe-core contrib branch, I can push that variant as well.
>>>
>>> Cheers,
>>>
>>> Bruce
>>>
>>>
>>> The following changes since commit
>>> fc94f925e848684244a38dcffe15cb1192dfbed8:
>>> Martin Jansa (1):
>>> libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git:
>>> bump PR to rebuild after perl upgrade
>>>
>>> are available in the git repository at:
>>>
>>> git://git.pokylinux.org/poky-contrib zedd/libc-headers-v3
>>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/libc-headers-v3
>>>
>>>
>>> Bruce Ashfield (3):
>>> linux-libc-headers: factor common code into linux-libc-headers.inc
>>> linux-libc-headers: provide 3.0.x and 3.1 headers
>>> linux-libc-headers: remove older recipes
>>>
>>> meta/conf/distro/include/tcmode-default.inc | 2 +-
>>> .../linux-libc-headers/linux-libc-headers.inc | 62 +++++++++++++++++++-
>>> .../linux-libc-headers_2.6.37.2.bb | 53 -----------------
>>> .../linux-libc-headers_2.6.39.bb | 54 -----------------
>>> .../linux-libc-headers/linux-libc-headers_3.0.8.bb | 7 ++
>>> .../linux-libc-headers/linux-libc-headers_3.1.bb | 7 ++
>>> 6 files changed, 74 insertions(+), 111 deletions(-)
>>> delete mode 100644
>>> meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
>>> delete mode 100644
>>> meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
>>> create mode 100644
>>> meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
>>> create mode 100644
>>> meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
>>>
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>>
>>
>>
>>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH 0/3] RFC v3: provide 3.0.x and 3.1 libc headers
From: Saul Wold @ 2011-11-02 0:46 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CADkTA4NcNdQVFXuVXC5r7u64ZX9bEZp6VW-dHxPd=EhB7sXX-w@mail.gmail.com>
On 11/01/2011 05:41 PM, Bruce Ashfield wrote:
> On Thu, Oct 27, 2011 at 10:32 AM, Bruce Ashfield
> <bruce.ashfield@windriver.com> wrote:
>> Richard,
>>
>> Here's v3 of the series, the details are below.
>
> I see no comments on v3. So I'm just bumping the thread. Should I send
> a separate
> pull request for this, or is this sufficient ?
>
Appears that RP merged them in the last day or so. So I guess this is
sufficent, consider them merged into OE-Core!
Thanks
Sau!
> Bruce
>
> p.s. yes, I realize that everyone is catching up, I just didn't want
> to forget myself that
> this is out, but not merged or in a known state.
>
>>
>> Changes since v2:
>>
>> - moved more code into the .inc file
>> - modifed the python code to not import unnecessary functions and
>> to use d.get/setVar.
>> - Included an optional patch 3/3 to remove 2.6 based header recipes.
>> Whether you want this or not .. is up to you!
>>
>> Changes since v1:
>>
>> - factored common code out into the .inc file. Captured in patch 1/2
>> - patch 2/2 is the introduction of the new headers
>>
>> v1 Email is included below:
>>
>> Here's a RFC patch for updating the toolchain linux-libc headers to 3.x
>> variants.
>>
>> The reason I'm calling it a RFC is:
>>
>> - I wrote some anonymous python code (and I'm no python coder) to
>> deal with 2.6 / 3.0 tgz location differences. This could have
>> also been done with a variable set in the recipes and used by
>> the .inc. I wasn't sure of the preferred approach, hence the RFC.
>> I'll take no offense corrections here.
>>
>> - I changed the .inc, but didn't bump the PR of the existing recipes
>> and didn't remove the existing 2.6 variants. If either of these
>> should have been done, let me know and I'll respin.
>>
>> - I bumped the default to be 3.1. If that's too agressive for the
>> default, and we'd prefer 3.0.8, let me know and I'll respin.
>>
>> I built and booted all the qemu machines with the 3.1 kernel headers. So
>> from the testing I was able to do, this looks to be safe and ready to go.
>>
>> This is based on my yocto repo, I also did the changes in my oe-core
>> repository, but I don't have a oe-core contrib branch that I could push to,
>> so I chose to send the yocto variant. If someone points me to who I email for
>> an oe-core contrib branch, I can push that variant as well.
>>
>> Cheers,
>>
>> Bruce
>>
>>
>> The following changes since commit fc94f925e848684244a38dcffe15cb1192dfbed8:
>> Martin Jansa (1):
>> libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR to rebuild after perl upgrade
>>
>> are available in the git repository at:
>>
>> git://git.pokylinux.org/poky-contrib zedd/libc-headers-v3
>> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/libc-headers-v3
>>
>> Bruce Ashfield (3):
>> linux-libc-headers: factor common code into linux-libc-headers.inc
>> linux-libc-headers: provide 3.0.x and 3.1 headers
>> linux-libc-headers: remove older recipes
>>
>> meta/conf/distro/include/tcmode-default.inc | 2 +-
>> .../linux-libc-headers/linux-libc-headers.inc | 62 +++++++++++++++++++-
>> .../linux-libc-headers_2.6.37.2.bb | 53 -----------------
>> .../linux-libc-headers_2.6.39.bb | 54 -----------------
>> .../linux-libc-headers/linux-libc-headers_3.0.8.bb | 7 ++
>> .../linux-libc-headers/linux-libc-headers_3.1.bb | 7 ++
>> 6 files changed, 74 insertions(+), 111 deletions(-)
>> delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
>> delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
>> create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
>> create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
>
>
^ permalink raw reply
* Re: [PATCH 0/3] RFC v3: provide 3.0.x and 3.1 libc headers
From: Bruce Ashfield @ 2011-11-02 0:41 UTC (permalink / raw)
To: richard.purdie; +Cc: saul.wold, openembedded-core
In-Reply-To: <cover.1319725711.git.bruce.ashfield@windriver.com>
On Thu, Oct 27, 2011 at 10:32 AM, Bruce Ashfield
<bruce.ashfield@windriver.com> wrote:
> Richard,
>
> Here's v3 of the series, the details are below.
I see no comments on v3. So I'm just bumping the thread. Should I send
a separate
pull request for this, or is this sufficient ?
Bruce
p.s. yes, I realize that everyone is catching up, I just didn't want
to forget myself that
this is out, but not merged or in a known state.
>
> Changes since v2:
>
> - moved more code into the .inc file
> - modifed the python code to not import unnecessary functions and
> to use d.get/setVar.
> - Included an optional patch 3/3 to remove 2.6 based header recipes.
> Whether you want this or not .. is up to you!
>
> Changes since v1:
>
> - factored common code out into the .inc file. Captured in patch 1/2
> - patch 2/2 is the introduction of the new headers
>
> v1 Email is included below:
>
> Here's a RFC patch for updating the toolchain linux-libc headers to 3.x
> variants.
>
> The reason I'm calling it a RFC is:
>
> - I wrote some anonymous python code (and I'm no python coder) to
> deal with 2.6 / 3.0 tgz location differences. This could have
> also been done with a variable set in the recipes and used by
> the .inc. I wasn't sure of the preferred approach, hence the RFC.
> I'll take no offense corrections here.
>
> - I changed the .inc, but didn't bump the PR of the existing recipes
> and didn't remove the existing 2.6 variants. If either of these
> should have been done, let me know and I'll respin.
>
> - I bumped the default to be 3.1. If that's too agressive for the
> default, and we'd prefer 3.0.8, let me know and I'll respin.
>
> I built and booted all the qemu machines with the 3.1 kernel headers. So
> from the testing I was able to do, this looks to be safe and ready to go.
>
> This is based on my yocto repo, I also did the changes in my oe-core
> repository, but I don't have a oe-core contrib branch that I could push to,
> so I chose to send the yocto variant. If someone points me to who I email for
> an oe-core contrib branch, I can push that variant as well.
>
> Cheers,
>
> Bruce
>
>
> The following changes since commit fc94f925e848684244a38dcffe15cb1192dfbed8:
> Martin Jansa (1):
> libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR to rebuild after perl upgrade
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib zedd/libc-headers-v3
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/libc-headers-v3
>
> Bruce Ashfield (3):
> linux-libc-headers: factor common code into linux-libc-headers.inc
> linux-libc-headers: provide 3.0.x and 3.1 headers
> linux-libc-headers: remove older recipes
>
> meta/conf/distro/include/tcmode-default.inc | 2 +-
> .../linux-libc-headers/linux-libc-headers.inc | 62 +++++++++++++++++++-
> .../linux-libc-headers_2.6.37.2.bb | 53 -----------------
> .../linux-libc-headers_2.6.39.bb | 54 -----------------
> .../linux-libc-headers/linux-libc-headers_3.0.8.bb | 7 ++
> .../linux-libc-headers/linux-libc-headers_3.1.bb | 7 ++
> 6 files changed, 74 insertions(+), 111 deletions(-)
> delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.37.2.bb
> delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.39.bb
> create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.0.8.bb
> create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.1.bb
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply
* Re: [PATCH 0/1] distro_tracking_fields: update packages tracking fields
From: Saul Wold @ 2011-11-02 0:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1319510805.git.wenzong.fan@windriver.com>
On 10/24/2011 07:49 PM, wenzong.fan@windriver.com wrote:
> From: Wenzong Fan<wenzong.fan@windriver.com>
>
> Update distro tracking fields for ccache, chkconfig.
>
> The following changes since commit 53ee27a1c5b589cba874f674c428e1a36557cc3b:
> Joshua Lock (1):
> doc: update manual for checksum changes
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib wenzong/distro_tracking_fields_update
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=wenzong/distro_tracking_fields_update
>
> Wenzong Fan (1):
> distro_tracking_fields: update packages tracking fields
>
> .../conf/distro/include/distro_tracking_fields.inc | 12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
This got pulled, but I still need a fix for Month format to MMM please
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH v3 1/2] Add new strace-graph package to avoid making perl a dependecy for all of strace
From: Saul Wold @ 2011-11-02 0:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Matthew McClintock
In-Reply-To: <1320078403-23724-1-git-send-email-msm@freescale.com>
On 10/31/2011 09:26 AM, Matthew McClintock wrote:
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
> v2: Change to use PACKAGES_prepend instead of explictly listing all packages
> and also fixing the fact we missed the -dev and -dbg packages before
>
> v3: Use += instead of _prepend to add strace-graph packages
>
> meta/recipes-devtools/strace/strace_4.5.20.bb | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-devtools/strace/strace_4.5.20.bb b/meta/recipes-devtools/strace/strace_4.5.20.bb
> index b3d2aa5..53df067 100644
> --- a/meta/recipes-devtools/strace/strace_4.5.20.bb
> +++ b/meta/recipes-devtools/strace/strace_4.5.20.bb
> @@ -5,7 +5,9 @@ LICENSE = "BSD"
> LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
> PR = "r2"
>
> -RDEPENDS = "perl"
> +PACKAGES =+ "${PN}-graph "
> +FILES_${PN}-graph = "${bindir}/strace-graph"
> +RDEPENDS_${PN}-graph = "perl"
>
> SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
> file://sigmask.patch \
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH 0/1] documentation audit script
From: Saul Wold @ 2011-11-02 0:32 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Scott Garman
In-Reply-To: <cover.1319580412.git.scott.a.garman@intel.com>
On 10/25/2011 03:12 PM, Scott Garman wrote:
> Hello,
>
> I've been using this script to perform audits of which packages
> are producing documentation, and feel it's long overdue for this
> to be added to the git tree. So here it is.
>
> The following changes since commit f586aaa8d00361a9597a546d665077c75cf4d520:
>
> libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR to rebuild after perl upgrade (2011-10-25 08:36:01 +0100)
>
> are available in the git repository at:
> git://git.yoctoproject.org/poky-contrib sgarman/docaudit-script
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/docaudit-script
>
> Scott Garman (1):
> documentation-audit.sh: script for auditing documentation build
> status
>
> scripts/contrib/documentation-audit.sh | 92 ++++++++++++++++++++++++++++++++
> 1 files changed, 92 insertions(+), 0 deletions(-)
> create mode 100755 scripts/contrib/documentation-audit.sh
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply
* Re: [PATCH] Add new IMAGE_CLASSES variable for classes for image generation
From: Saul Wold @ 2011-11-02 0:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Matthew McClintock
In-Reply-To: <1319786807-9015-1-git-send-email-msm@freescale.com>
On 10/28/2011 12:26 AM, Matthew McClintock wrote:
> Allows us to import classes only for images and not to the global
> namespace
>
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
> This is a resend
>
> meta-yocto/conf/local.conf.sample | 6 ++++++
> meta/classes/image.bbclass | 3 ++-
> 2 files changed, 8 insertions(+), 1 deletions(-)
>
> diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
> index da3f8df..5e59ad4 100644
> --- a/meta-yocto/conf/local.conf.sample
> +++ b/meta-yocto/conf/local.conf.sample
> @@ -163,6 +163,12 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks"
> # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
> USER_CLASSES ?= "image-mklibs image-prelink"
>
> +# Additional image generation features
> +#
> +# The following is a list of classes to import to use in the generation of images
> +# currently an example class is image_types_uboot
> +# IMAGE_CLASSES ?= "image_types_uboot"
> +
> #
> # Runtime testing of images
> #
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 05f4331..e932879 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -111,7 +111,8 @@ def get_devtable_list(d):
> str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
> return str
>
> -inherit image_types
> +IMAGE_CLASSES = "image_types"
> +inherit ${IMAGE_CLASSES}
>
Does this really work with =, should it not be ?= here?
Sau!
> IMAGE_POSTPROCESS_COMMAND ?= ""
> MACHINE_POSTPROCESS_COMMAND ?= ""
^ permalink raw reply
* Re: [PATCH] libxslt: don't replace COPYING with symlink to Copyright
From: Saul Wold @ 2011-11-02 0:23 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <1320190662-748-1-git-send-email-Martin.Jansa@gmail.com>
On 11/01/2011 04:37 PM, Martin Jansa wrote:
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> .../dont.replace.COPYING.with.symlink.patch | 27 ++++++++++++++++++++
> meta/recipes-support/libxslt/libxslt_1.1.26.bb | 3 +-
> 2 files changed, 29 insertions(+), 1 deletions(-)
> create mode 100644 meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
>
> diff --git a/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
> new file mode 100644
> index 0000000..a38b686
> --- /dev/null
> +++ b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
> @@ -0,0 +1,27 @@
> +When it's replaced with symlink to Copyright, then we end with link to nonexistent file like this:
> +
> +OE om-gta02@shr ~/shr-core $ ll tmp/deploy/licenses/libxslt/
> +total 40
> +drwxr-xr-x 2 bitbake bitbake 4096 Nov 2 00:27 ./
> +drwxr-xr-x 818 bitbake bitbake 32768 Nov 2 00:27 ../
> +lrwxrwxrwx 1 bitbake bitbake 9 Nov 2 00:27 COPYING -> Copyright
> +lrwxrwxrwx 1 bitbake bitbake 52 Nov 2 00:27 generic_MIT -> /OE/shr-core/tmp/deploy/licenses/common-licenses/MIT
> +
> +Upstream-Status: Pending
> +
No Signed-off-by: in the patch itself.
Thanks
Sau!
> +diff -uNr libxslt-1.1.26.orig/configure.in libxslt-1.1.26/configure.in
> +--- libxslt-1.1.26.orig/configure.in 2009-09-24 16:27:30.000000000 +0200
> ++++ libxslt-1.1.26/configure.in 2011-11-02 00:30:47.651452392 +0100
> +@@ -671,12 +671,6 @@
> + RELDATE=`date +'%a %b %e %Y'`
> + AC_SUBST(RELDATE)
> +
> +-( cd $srcdir
> +-rm -f COPYING.LIB COPYING
> +-$LN_S Copyright COPYING
> +-)
> +-
> +-
> + AC_OUTPUT([
> + Makefile
> + libxslt.pc
> diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> index 96bffc6..4dd6b55 100644
> --- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> +++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
> @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
>
> SECTION = "libs"
> DEPENDS = "libxml2"
> -PR = "r3"
> +PR = "r4"
>
> SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
> + file://dont.replace.COPYING.with.symlink.patch \
> file://pkgconfig_fix.patch"
>
> SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
^ permalink raw reply
* [Pull v3 4/4] dbus: ensure that the useradd shell is set to /bin/false
From: Saul Wold @ 2011-11-02 0:21 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320191934.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/dbus/dbus.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5028310..caa781c 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -22,7 +22,8 @@ INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "-r netdev"
USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
- --no-create-home --user-group messagebus"
+ --no-create-home --shell /bin/false \
+ --user-group messagebus"
CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
--
1.7.6.4
^ permalink raw reply related
* [Pull v3 3/4] connman: Use useradd to add the xuser for DBus
From: Saul Wold @ 2011-11-02 0:21 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320191934.git.sgw@linux.intel.com>
Connmand needs to start as the xuser as defined in the dbus
configuration and needs to share this with rootless X. Since
it's possible for connmand to run on a sytem without rootless
X we still need to create the user here.
Useradd will fail gracefully if the user already exists.
Fixes: [YOCTO #1699]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 7 ++++++-
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ae1b725..480b59c 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -18,7 +18,12 @@ DEPENDS = "libgdbus dbus glib-2.0 iptables"
INITSCRIPT_NAME = "connman"
INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
-inherit autotools pkgconfig update-rc.d
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home \
+ --shell /bin/false --groups video,tty,audio \
+ --user-group xuser"
+
+inherit autotools pkgconfig update-rc.d useradd
do_install_append() {
install -d ${D}${sysconfdir}/init.d/
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index 8a02753..78f2199 100644
--- a/meta/recipes-connectivity/connman/connman_0.75.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -1,5 +1,5 @@
require connman.inc
-PR = "r2"
+PR = "r3"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
--
1.7.6.4
^ permalink raw reply related
* [Pull v3 2/4] xserver-nodm-init: Use useradd to add the xuser for rootless X
From: Saul Wold @ 2011-11-02 0:21 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320191934.git.sgw@linux.intel.com>
This also address an issue with dbus and connman, since connmand
needs to start as the xuser in the rootless X situation.
Fixes: [YOCTO #1699]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../x11-common/xserver-nodm-init.bb | 28 +++++++------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index ea4222d..dbc1c42 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r26"
+PR = "r28"
RDEPENDS_${PN} = "sudo"
SRC_URI = "file://xserver-nodm \
@@ -23,23 +23,15 @@ do_install() {
fi
}
-pkg_postinst_${PN} () {
- if [ "x$D" != "x" ] ; then
- exit 1
- fi
-
- if [ -f /etc/X11/Xusername ]; then
- # create the rootless X user, and add user to group tty, video, audio
- username=`cat /etc/X11/Xusername`
- adduser --disabled-password $username
- # FIXME: use addgroup if busybox addgroup is ready
- sed -i -e "s/^video:.*/&${username}/g" /etc/group
- sed -i -e "s/^tty:.*/&${username}/g" /etc/group
- sed -i -e "s/^audio:.*/&${username}/g" /etc/group
- fi
-}
-
-inherit update-rc.d
+inherit update-rc.d useradd
INITSCRIPT_NAME = "xserver-nodm"
INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+
+# Use fixed Xusername of xuser for now, this will need to be
+# fixed if the Xusername changes from xuser
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home \
+ --shell /bin/false --groups video,tty,audio \
+ --user-group xuser"
+
--
1.7.6.4
^ permalink raw reply related
* [Pull v3 1/4] avahi: use useradd to create avahi user for avahi-daemon
From: Saul Wold @ 2011-11-02 0:21 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320191934.git.sgw@linux.intel.com>
DBus was failing to start correct since the avahi user was
not setup.
Keep the dbus reload since this could still be installed
as a package an would require a dbus restart.
Fixes: [YOCTO #1699]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5ad9db0..79cfd73 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-INC_PR = "r8"
+INC_PR = "r9"
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
@@ -23,7 +23,12 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://99avahi-autoipd \
file://initscript.patch"
-inherit autotools pkgconfig update-rc.d gettext
+USERADD_PACKAGES = "${PN}-daemon"
+USERADD_PARAM_${PN}-daemon = "--system --home /var/run/avahi-daemon \
+ --no-create-home --shell /bin/false \
+ --user-group avahi"
+
+inherit autotools pkgconfig update-rc.d gettext useradd
EXTRA_OECONF = "--with-distro=debian \
--disable-introspection \
@@ -116,15 +121,12 @@ do_install_avahi-autoipd() {
install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
}
-# At the time the postinst runs, dbus might not be setup so only restart if running
+# At the time the postinst runs, dbus might not be setup so only restart if running
pkg_postinst_avahi-daemon () {
- # can't do this offline
if [ "x$D" != "x" ]; then
- exit 1
+ exit 0
fi
- grep "^avahi:" /etc/group > /dev/null || addgroup avahi
- grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
DBUSPID=`pidof dbus-daemon`
--
1.7.6.4
^ permalink raw reply related
* [Pull v3 0/4] Add User Fixes
From: Saul Wold @ 2011-11-02 0:21 UTC (permalink / raw)
To: openembedded-core
Richard,
Hope that third times the charm!
Fixes 1699, additional commit comments, fixed whitespace.
Sau!
The following changes since commit d0a2c87d068f2d769d47c8455bb1434b90a7a844:
Fix HOMEPAGE values in libzypp and sat-solver .bb files (2011-11-01 18:28:06 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (4):
avahi: use useradd to create avahi user for avahi-daemon
xserver-nodm-init: Use useradd to add the xuser for rootless X
connman: Use useradd to add the xuser for DBus
dbus: ensure that the useradd shell is set to /bin/false
meta/recipes-connectivity/avahi/avahi.inc | 16 ++++++-----
meta/recipes-connectivity/connman/connman.inc | 7 ++++-
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
meta/recipes-core/dbus/dbus.inc | 3 +-
.../x11-common/xserver-nodm-init.bb | 28 +++++++------------
5 files changed, 28 insertions(+), 28 deletions(-)
--
1.7.6.4
^ permalink raw reply
* [PATCH] libxslt: don't replace COPYING with symlink to Copyright
From: Martin Jansa @ 2011-11-01 23:37 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../dont.replace.COPYING.with.symlink.patch | 27 ++++++++++++++++++++
meta/recipes-support/libxslt/libxslt_1.1.26.bb | 3 +-
2 files changed, 29 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
diff --git a/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
new file mode 100644
index 0000000..a38b686
--- /dev/null
+++ b/meta/recipes-support/libxslt/libxslt/dont.replace.COPYING.with.symlink.patch
@@ -0,0 +1,27 @@
+When it's replaced with symlink to Copyright, then we end with link to nonexistent file like this:
+
+OE om-gta02@shr ~/shr-core $ ll tmp/deploy/licenses/libxslt/
+total 40
+drwxr-xr-x 2 bitbake bitbake 4096 Nov 2 00:27 ./
+drwxr-xr-x 818 bitbake bitbake 32768 Nov 2 00:27 ../
+lrwxrwxrwx 1 bitbake bitbake 9 Nov 2 00:27 COPYING -> Copyright
+lrwxrwxrwx 1 bitbake bitbake 52 Nov 2 00:27 generic_MIT -> /OE/shr-core/tmp/deploy/licenses/common-licenses/MIT
+
+Upstream-Status: Pending
+
+diff -uNr libxslt-1.1.26.orig/configure.in libxslt-1.1.26/configure.in
+--- libxslt-1.1.26.orig/configure.in 2009-09-24 16:27:30.000000000 +0200
++++ libxslt-1.1.26/configure.in 2011-11-02 00:30:47.651452392 +0100
+@@ -671,12 +671,6 @@
+ RELDATE=`date +'%a %b %e %Y'`
+ AC_SUBST(RELDATE)
+
+-( cd $srcdir
+-rm -f COPYING.LIB COPYING
+-$LN_S Copyright COPYING
+-)
+-
+-
+ AC_OUTPUT([
+ Makefile
+ libxslt.pc
diff --git a/meta/recipes-support/libxslt/libxslt_1.1.26.bb b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
index 96bffc6..4dd6b55 100644
--- a/meta/recipes-support/libxslt/libxslt_1.1.26.bb
+++ b/meta/recipes-support/libxslt/libxslt_1.1.26.bb
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0cd9a07afbeb24026c9b03aecfeba458"
SECTION = "libs"
DEPENDS = "libxml2"
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://xmlsoft.org/libxslt//libxslt-${PV}.tar.gz \
+ file://dont.replace.COPYING.with.symlink.patch \
file://pkgconfig_fix.patch"
SRC_URI[md5sum] = "e61d0364a30146aaa3001296f853b2b9"
--
1.7.7.1
^ permalink raw reply related
* [PATCH] meta: glib-2.0: don't apply qsort_r test removable patch for native version
From: Simon Busch @ 2011-11-01 22:08 UTC (permalink / raw)
To: openembedded-core
On some buildhosts with an older version of native glib-2.0 installed (in this case
2.16.6) the qsort_r test removable patch leads to a compilation error:
| ./.libs/libglib-2.0.so: undefined reference to `qsort_r'
| collect2: ld returned 1 exit status
This patch fixes this so the patch gets only applied for the native version of this
recipe.
Signed-off-by: Simon Busch <morphis@gravedo.de>
---
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
index 566355d..0efce40 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r2"
+PR = "r3"
PE = "1"
DEPENDS += "libffi python-argparse-native"
@@ -9,11 +9,14 @@ DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nat
SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+QSORT_PATCH = "file://remove.test.for.qsort_r.patch"
+QSORT_PATCH_virtclass-native = ""
+
SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
file://configure-libtool.patch \
file://60_wait-longer-for-threads-to-die.patch \
file://g_once_init_enter.patch \
- file://remove.test.for.qsort_r.patch \
+ ${QSORT_PATCH} \
"
SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b"
SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687"
--
1.7.5.4
^ permalink raw reply related
* [Pull v2 4/4] dbus: fix up ADDUSER_PARAMS
From: Saul Wold @ 2011-11-01 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320183757.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/dbus/dbus.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 5028310..caa781c 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -22,7 +22,8 @@ INITSCRIPT_PARAMS = "start 02 5 3 2 . stop 20 0 1 6 ."
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "-r netdev"
USERADD_PARAM_${PN} = "--system --home ${localstatedir}/lib/dbus \
- --no-create-home --user-group messagebus"
+ --no-create-home --shell /bin/false \
+ --user-group messagebus"
CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
--
1.7.6.4
^ permalink raw reply related
* [Pull v2 3/4] connman: create xuser
From: Saul Wold @ 2011-11-01 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320183757.git.sgw@linux.intel.com>
We create xuser here as a backup incase that xerver-nodm-init
is not on the system.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 7 ++++++-
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index ae1b725..480b59c 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -18,7 +18,12 @@ DEPENDS = "libgdbus dbus glib-2.0 iptables"
INITSCRIPT_NAME = "connman"
INITSCRIPT_PARAMS = "start 05 5 2 3 . stop 22 0 1 6 ."
-inherit autotools pkgconfig update-rc.d
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home \
+ --shell /bin/false --groups video,tty,audio \
+ --user-group xuser"
+
+inherit autotools pkgconfig update-rc.d useradd
do_install_append() {
install -d ${D}${sysconfdir}/init.d/
diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb
index 8a02753..78f2199 100644
--- a/meta/recipes-connectivity/connman/connman_0.75.bb
+++ b/meta/recipes-connectivity/connman/connman_0.75.bb
@@ -1,5 +1,5 @@
require connman.inc
-PR = "r2"
+PR = "r3"
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \
--
1.7.6.4
^ permalink raw reply related
* [Pull v2 0/4] convert these recipes to adduser bbclass
From: Saul Wold @ 2011-11-01 21:44 UTC (permalink / raw)
To: openembedded-core
Richard,
So I ended up just hardcoding the xuser and unconditionally
creating that user in xserver and connman recipes. There
might be an alternative, but it will require more time to devlop.
V2: Fixed audioi -> audio (per Martin's email)
PR Bumps updated
Sau!
The following changes since commit d0a2c87d068f2d769d47c8455bb1434b90a7a844:
Fix HOMEPAGE values in libzypp and sat-solver .bb files (2011-11-01 18:28:06 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (4):
avahi: use useradd to create user
xserver-nodm-init: Add xuser (hardcoded)
connman: create xuser
dbus: fix up ADDUSER_PARAMS
meta/recipes-connectivity/avahi/avahi.inc | 15 +++++----
meta/recipes-connectivity/connman/connman.inc | 7 ++++-
meta/recipes-connectivity/connman/connman_0.75.bb | 2 +-
meta/recipes-core/dbus/dbus.inc | 3 +-
.../x11-common/xserver-nodm-init.bb | 30 +++++++------------
5 files changed, 28 insertions(+), 29 deletions(-)
--
1.7.6.4
^ permalink raw reply
* [Pull v2 2/4] xserver-nodm-init: Add xuser (hardcoded)
From: Saul Wold @ 2011-11-01 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320183757.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../x11-common/xserver-nodm-init.bb | 30 +++++++------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index ea4222d..5b06bc6 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r26"
+PR = "r28"
RDEPENDS_${PN} = "sudo"
SRC_URI = "file://xserver-nodm \
@@ -19,27 +19,19 @@ do_install() {
install xserver-nodm ${D}/etc/init.d
if [ "${ROOTLESS_X}" = "1" ] ; then
install -d ${D}/etc/X11
- install Xusername ${D}/etc/X11
+ install Xusername ${D}/etc/X11
fi
}
-pkg_postinst_${PN} () {
- if [ "x$D" != "x" ] ; then
- exit 1
- fi
-
- if [ -f /etc/X11/Xusername ]; then
- # create the rootless X user, and add user to group tty, video, audio
- username=`cat /etc/X11/Xusername`
- adduser --disabled-password $username
- # FIXME: use addgroup if busybox addgroup is ready
- sed -i -e "s/^video:.*/&${username}/g" /etc/group
- sed -i -e "s/^tty:.*/&${username}/g" /etc/group
- sed -i -e "s/^audio:.*/&${username}/g" /etc/group
- fi
-}
-
-inherit update-rc.d
+inherit update-rc.d useradd
INITSCRIPT_NAME = "xserver-nodm"
INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+
+# Use fixed Xusername of xuser for now, this will need to be
+# fixed if the Xusername changes from xuser
+USERADD_PACKAGES = "${PN}"
+USERADD_PARAM_${PN} = "--system --no-create-home \
+ --shell /bin/false --groups video,tty,audio \
+ --user-group xuser"
+
--
1.7.6.4
^ permalink raw reply related
* [Pull v2 1/4] avahi: use useradd to create user
From: Saul Wold @ 2011-11-01 21:44 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320183757.git.sgw@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5ad9db0..4ab9f07 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
# python scripts are under GPLv2+
LICENSE = "GPLv2+ & LGPLv2.1+"
-INC_PR = "r8"
+INC_PR = "r9"
DEPENDS = "expat libcap libdaemon dbus glib-2.0"
@@ -23,7 +23,12 @@ SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
file://99avahi-autoipd \
file://initscript.patch"
-inherit autotools pkgconfig update-rc.d gettext
+USERADD_PACKAGES = "${PN}-daemon"
+USERADD_PARAM_${PN}-daemon = "--system --home /var/run/avahi-daemon \
+ --no-create-home --shell /bin/false \
+ --user-group avahi"
+
+inherit autotools pkgconfig update-rc.d gettext useradd
EXTRA_OECONF = "--with-distro=debian \
--disable-introspection \
@@ -116,15 +121,11 @@ do_install_avahi-autoipd() {
install ${WORKDIR}/99avahi-autoipd ${D}${sysconfdir}/udhcpc.d
}
-# At the time the postinst runs, dbus might not be setup so only restart if running
-
pkg_postinst_avahi-daemon () {
# can't do this offline
if [ "x$D" != "x" ]; then
- exit 1
+ exit 0
fi
- grep "^avahi:" /etc/group > /dev/null || addgroup avahi
- grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi
DBUSPID=`pidof dbus-daemon`
--
1.7.6.4
^ permalink raw reply related
* Re: [PATCH 2/4] xserver-nodm-init: Add xuser (hardcoded)
From: Saul Wold @ 2011-11-01 21:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
In-Reply-To: <20111101213059.GB9949@jama.jama.net>
On 11/01/2011 02:30 PM, Martin Jansa wrote:
> On Tue, Nov 01, 2011 at 02:27:17PM -0700, Saul Wold wrote:
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>> .../x11-common/xserver-nodm-init.bb | 30 +++++++------------
>> 1 files changed, 11 insertions(+), 19 deletions(-)
>>
>> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
>> index ea4222d..1183f0e 100644
>> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
>> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
>> @@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
>> LICENSE = "GPLv2"
>> LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
>> SECTION = "x11"
>> -PR = "r26"
>> +PR = "r28"
>> RDEPENDS_${PN} = "sudo"
>>
>> SRC_URI = "file://xserver-nodm \
>> @@ -19,27 +19,19 @@ do_install() {
>> install xserver-nodm ${D}/etc/init.d
>> if [ "${ROOTLESS_X}" = "1" ] ; then
>> install -d ${D}/etc/X11
>> - install Xusername ${D}/etc/X11
>> + install Xusername ${D}/etc/X11
>> fi
>> }
>>
>> -pkg_postinst_${PN} () {
>> - if [ "x$D" != "x" ] ; then
>> - exit 1
>> - fi
>> -
>> - if [ -f /etc/X11/Xusername ]; then
>> - # create the rootless X user, and add user to group tty, video, audio
>> - username=`cat /etc/X11/Xusername`
>> - adduser --disabled-password $username
>> - # FIXME: use addgroup if busybox addgroup is ready
>> - sed -i -e "s/^video:.*/&${username}/g" /etc/group
>> - sed -i -e "s/^tty:.*/&${username}/g" /etc/group
>> - sed -i -e "s/^audio:.*/&${username}/g" /etc/group
>> - fi
>> -}
>> -
>> -inherit update-rc.d
>> +inherit update-rc.d useradd
>>
>> INITSCRIPT_NAME = "xserver-nodm"
>> INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
>> +
>> +# Use fixed Xusername of xuser for now, this will need to be
>> +# fixed if the Xusername changes from xuser
>> +USERADD_PACKAGES = "${PN}"
>> +USERADD_PARAM_${PN} = "--system --no-create-home \
>> + --shell /bin/false --groups video,tty,audioi \
>
> audioi?
>
> I guess you're also using vim :)
i
good catch (fixed in the branch)
:w
:q
:-)
Sau!
>
> Cheers,
>
>> + --user-group xuser"
>> +
>> --
>> 1.7.6.4
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH 2/2] libarchive: modify the status of updating
From: Saul Wold @ 2011-11-01 21:33 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <6f0b96b7ef399fd7c78b2135a71b010e2613ae26.1319793342.git.xiaofeng.yan@windriver.com>
On 10/28/2011 02:21 AM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> update to 2.8.5
>
> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> ---
> .../conf/distro/include/distro_tracking_fields.inc | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
> index 1f3540e..12c8fc0 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -4615,7 +4615,10 @@ RECIPE_MAINTAINER_pn-libx11-diet = "Xiaofeng Yan<xiaofeng.yan@windriver.com>"
> RECIPE_STATUS_pn-directfb = "red"
> RECIPE_MAINTAINER_pn-directfb = "Xiaofeng Yan<xiaofeng.yan@windriver.com>"
>
> -RECIPE_STATUS_pn-libarchive = "red"
> +RECIPE_STATUS_pn-libarchive = "green"
> +RECIPE_LATEST_VERSION_pn-libarchive = "2.8.5"
> ++RECIPE_LATEST_RELEASE_DATE_pn-libarchive = "Sept 3, 2011"
> ++RECIPE_LAST_UPDATE_pn-libarchive = "Oct 28, 2011"
> RECIPE_MAINTAINER_pn-libarchive = "Xiaofeng Yan<xiaofeng.yan@windriver.com>"
>
> RECIPE_STATUS_pn-xserver-kdrive = "red"
This does not look right, there are extra + in the lines.
Sau!
^ permalink raw reply
* Re: [PATCH 2/4] xserver-nodm-init: Add xuser (hardcoded)
From: Martin Jansa @ 2011-11-01 21:30 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <43df49f1967ebd4e5a956c601c9865f67598d52f.1320182590.git.sgw@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 2519 bytes --]
On Tue, Nov 01, 2011 at 02:27:17PM -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../x11-common/xserver-nodm-init.bb | 30 +++++++------------
> 1 files changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> index ea4222d..1183f0e 100644
> --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
> SECTION = "x11"
> -PR = "r26"
> +PR = "r28"
> RDEPENDS_${PN} = "sudo"
>
> SRC_URI = "file://xserver-nodm \
> @@ -19,27 +19,19 @@ do_install() {
> install xserver-nodm ${D}/etc/init.d
> if [ "${ROOTLESS_X}" = "1" ] ; then
> install -d ${D}/etc/X11
> - install Xusername ${D}/etc/X11
> + install Xusername ${D}/etc/X11
> fi
> }
>
> -pkg_postinst_${PN} () {
> - if [ "x$D" != "x" ] ; then
> - exit 1
> - fi
> -
> - if [ -f /etc/X11/Xusername ]; then
> - # create the rootless X user, and add user to group tty, video, audio
> - username=`cat /etc/X11/Xusername`
> - adduser --disabled-password $username
> - # FIXME: use addgroup if busybox addgroup is ready
> - sed -i -e "s/^video:.*/&${username}/g" /etc/group
> - sed -i -e "s/^tty:.*/&${username}/g" /etc/group
> - sed -i -e "s/^audio:.*/&${username}/g" /etc/group
> - fi
> -}
> -
> -inherit update-rc.d
> +inherit update-rc.d useradd
>
> INITSCRIPT_NAME = "xserver-nodm"
> INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
> +
> +# Use fixed Xusername of xuser for now, this will need to be
> +# fixed if the Xusername changes from xuser
> +USERADD_PACKAGES = "${PN}"
> +USERADD_PARAM_${PN} = "--system --no-create-home \
> + --shell /bin/false --groups video,tty,audioi \
audioi?
I guess you're also using vim :)
Cheers,
> + --user-group xuser"
> +
> --
> 1.7.6.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox