[PATCH 1/2] openssh_5.8p2.bb: Update SRC_URI checksums

[PATCH 1/2] openssh_5.8p2.bb: Update SRC_URI checksums

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-connectivity/openssh/openssh_5.8p2.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
index 04d99d9..d5c9e49 100644
--- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
@@ -26,8 +26,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
            file://ssh_config \
            file://init \
           "
-SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
-SRC_URI[sha256sum] = "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
+SRC_URI[md5sum] = "88a4a83b0e0e60cd545430d4e4bd7e0c"
+SRC_URI[sha256sum] = "e5a1c821dd8dc33a94c445290956d52e03b3c450f9cd448b96d92317fd4cce42"
 
 inherit autotools
 
-- 
1.7.4.1

[PATCH 2/2] sysklogd.inc: Check for package-management in IMAGE_FEATURES

[Khem Raj]

ONLINE_PACKAGE_MANAGEMENT does not exist on oe-core

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/sysklogd/sysklogd.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index f2b1c15..f6a56ec 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
 # syslog initscript is handled explicitly because order of
 # update-rc.d and update-alternatives is important (see below)
 DEPENDS_append = " update-rc.d update-rc.d-native"
-RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
+RDEPENDS_${PN}_append = " ${@oe.utils.contains("IMAGE_FEATURES", "package-management", "update-rc.d", "", d)}"
 
 SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
            file://no-strip-install.patch \
-- 
1.7.4.1

Re: [PATCH 2/2] sysklogd.inc: Check for package-management in IMAGE_FEATURES

[Koen Kooi]

Op 10 jun 2011, om 02:57 heeft Khem Raj het volgende geschreven:

> ONLINE_PACKAGE_MANAGEMENT does not exist on oe-core
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-extended/sysklogd/sysklogd.inc |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
> index f2b1c15..f6a56ec 100644
> --- a/meta/recipes-extended/sysklogd/sysklogd.inc
> +++ b/meta/recipes-extended/sysklogd/sysklogd.inc
> @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
> # syslog initscript is handled explicitly because order of
> # update-rc.d and update-alternatives is important (see below)
> DEPENDS_append = " update-rc.d update-rc.d-native"
> -RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
> +RDEPENDS_${PN}_append = " ${@oe.utils.contains("IMAGE_FEATURES", "package-management", "update-rc.d", "", d)}"

You can't do IMAGE_FEATURES in RDEPENDS, consider what happens when I build 2 images, one with package-management and one without. Phils changes to catch update-rc.d usage in the image* classes should be enough to fix this.

regards,

Koen

Re: [PATCH 2/2] sysklogd.inc: Check for package-management in IMAGE_FEATURES

[Phil Blundell]

On Thu, 2011-06-09 at 17:57 -0700, Khem Raj wrote:
> -RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
> +RDEPENDS_${PN}_append = " ${@oe.utils.contains("IMAGE_FEATURES", "package-management", "update-rc.d", "", d)}"

This sort of thing shouldn't be necessary in oe-core.  See previous
discussions between me and Richard as to why IMAGE_FEATURES is not the
right thing, and code in package_ipk.bbclass which ought to be taking
care of it.  If you're using a different package manager then it should
be fairly straightforward to adapt that logic to suit.

You're right though the the reference to O_P_M is clearly wrong and
should be removed.  I'm not quite sure how that got in there in the
first place; must have been some oversight during patch review I guess.

p.

Re: [PATCH 1/2] openssh_5.8p2.bb: Update SRC_URI checksums

[Saul Wold]

On 06/09/2011 05:57 PM, Khem Raj wrote:
> Signed-off-by: Khem Raj<raj.khem@gmail.com>
> ---
>   meta/recipes-connectivity/openssh/openssh_5.8p2.bb |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> index 04d99d9..d5c9e49 100644
> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
> @@ -26,8 +26,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>              file://ssh_config \
>              file://init \
>             "
> -SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
> -SRC_URI[sha256sum] = "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
> +SRC_URI[md5sum] = "88a4a83b0e0e60cd545430d4e4bd7e0c"
> +SRC_URI[sha256sum] = "e5a1c821dd8dc33a94c445290956d52e03b3c450f9cd448b96d92317fd4cce42"
>
>   inherit autotools
>
This is strange, since we are building in other places with this, please 
confirm you have a good tarball, vs what's in the upstream and on the 
autobuilder.yoctoproject.org downloads area.

Thanks
	Sau!

Re: [PATCH 1/2] openssh_5.8p2.bb: Update SRC_URI checksums

[Khem Raj]

On 06/09/2011 06:18 PM, Saul Wold wrote:
> On 06/09/2011 05:57 PM, Khem Raj wrote:
>> Signed-off-by: Khem Raj<raj.khem@gmail.com>
>> ---
>> meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>> b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>> index 04d99d9..d5c9e49 100644
>> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>> @@ -26,8 +26,8 @@ SRC_URI =
>> "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>> file://ssh_config \
>> file://init \
>> "
>> -SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
>> -SRC_URI[sha256sum] =
>> "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
>> +SRC_URI[md5sum] = "88a4a83b0e0e60cd545430d4e4bd7e0c"
>> +SRC_URI[sha256sum] =
>> "e5a1c821dd8dc33a94c445290956d52e03b3c450f9cd448b96d92317fd4cce42"
>>
>> inherit autotools
>>
> This is strange, since we are building in other places with this, please
> confirm you have a good tarball, vs what's in the upstream and on the
> autobuilder.yoctoproject.org downloads area.
>

have you tried

bitbake -ccleanall openssh;bitbake openssh ?

> Thanks
> Sau!

Re: [PATCH 1/2] openssh_5.8p2.bb: Update SRC_URI checksums

[Saul Wold]

On 06/09/2011 07:44 PM, Khem Raj wrote:
> On 06/09/2011 06:18 PM, Saul Wold wrote:
>> On 06/09/2011 05:57 PM, Khem Raj wrote:
>>> Signed-off-by: Khem Raj<raj.khem@gmail.com>
>>> ---
>>> meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 4 ++--
>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>> b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>> index 04d99d9..d5c9e49 100644
>>> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>> @@ -26,8 +26,8 @@ SRC_URI =
>>> "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>>> file://ssh_config \
>>> file://init \
>>> "
>>> -SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
>>> -SRC_URI[sha256sum] =
>>> "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
>>> +SRC_URI[md5sum] = "88a4a83b0e0e60cd545430d4e4bd7e0c"
>>> +SRC_URI[sha256sum] =
>>> "e5a1c821dd8dc33a94c445290956d52e03b3c450f9cd448b96d92317fd4cce42"
>>>
>>> inherit autotools
>>>
>> This is strange, since we are building in other places with this, please
>> confirm you have a good tarball, vs what's in the upstream and on the
>> autobuilder.yoctoproject.org downloads area.
>>
>
> have you tried
>
> bitbake -ccleanall openssh;bitbake openssh ?
>
Yes, twice with out MIRROR and PREMIRROR set, same result no checksum 
errors.

Sau!

>> Thanks
>> Sau!
>
>

Re: [PATCH 1/2] openssh_5.8p2.bb: Update SRC_URI checksums

[Khem Raj]

On 06/09/2011 09:38 PM, Saul Wold wrote:
> On 06/09/2011 07:44 PM, Khem Raj wrote:
>> On 06/09/2011 06:18 PM, Saul Wold wrote:
>>> On 06/09/2011 05:57 PM, Khem Raj wrote:
>>>> Signed-off-by: Khem Raj<raj.khem@gmail.com>
>>>> ---
>>>> meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 4 ++--
>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>> b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>> index 04d99d9..d5c9e49 100644
>>>> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>> @@ -26,8 +26,8 @@ SRC_URI =
>>>> "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>>>> file://ssh_config \
>>>> file://init \
>>>> "
>>>> -SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
>>>> -SRC_URI[sha256sum] =
>>>> "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
>>>> +SRC_URI[md5sum] = "88a4a83b0e0e60cd545430d4e4bd7e0c"
>>>> +SRC_URI[sha256sum] =
>>>> "e5a1c821dd8dc33a94c445290956d52e03b3c450f9cd448b96d92317fd4cce42"
>>>>
>>>> inherit autotools
>>>>
>>> This is strange, since we are building in other places with this, please
>>> confirm you have a good tarball, vs what's in the upstream and on the
>>> autobuilder.yoctoproject.org downloads area.
>>>
>>
>> have you tried
>>
>> bitbake -ccleanall openssh;bitbake openssh ?
>>
> Yes, twice with out MIRROR and PREMIRROR set, same result no checksum
> errors.
>

OK I think I know whats going on. In my case its getting it from slugos 
source mirror which is not same size as the one from ftp.openbsd.org
probably the mirror needs update

So drop it.
> Sau!
>
>>> Thanks
>>> Sau!
>>
>>

Re: [PATCH 1/2] openssh_5.8p2.bb: Update SRC_URI checksums

[Saul Wold]

On 06/09/2011 10:36 PM, Khem Raj wrote:
> On 06/09/2011 09:38 PM, Saul Wold wrote:
>> On 06/09/2011 07:44 PM, Khem Raj wrote:
>>> On 06/09/2011 06:18 PM, Saul Wold wrote:
>>>> On 06/09/2011 05:57 PM, Khem Raj wrote:
>>>>> Signed-off-by: Khem Raj<raj.khem@gmail.com>
>>>>> ---
>>>>> meta/recipes-connectivity/openssh/openssh_5.8p2.bb | 4 ++--
>>>>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>>> b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>>> index 04d99d9..d5c9e49 100644
>>>>> --- a/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>>> +++ b/meta/recipes-connectivity/openssh/openssh_5.8p2.bb
>>>>> @@ -26,8 +26,8 @@ SRC_URI =
>>>>> "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
>>>>> file://ssh_config \
>>>>> file://init \
>>>>> "
>>>>> -SRC_URI[md5sum] = "0541579adf9d55abb15ef927048d372e"
>>>>> -SRC_URI[sha256sum] =
>>>>> "5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314"
>>>>> +SRC_URI[md5sum] = "88a4a83b0e0e60cd545430d4e4bd7e0c"
>>>>> +SRC_URI[sha256sum] =
>>>>> "e5a1c821dd8dc33a94c445290956d52e03b3c450f9cd448b96d92317fd4cce42"
>>>>>
>>>>> inherit autotools
>>>>>
>>>> This is strange, since we are building in other places with this,
>>>> please
>>>> confirm you have a good tarball, vs what's in the upstream and on the
>>>> autobuilder.yoctoproject.org downloads area.
>>>>
>>>
>>> have you tried
>>>
>>> bitbake -ccleanall openssh;bitbake openssh ?
>>>
>> Yes, twice with out MIRROR and PREMIRROR set, same result no checksum
>> errors.
>>
>
> OK I think I know whats going on. In my case its getting it from slugos
> source mirror which is not same size as the one from ftp.openbsd.org
> probably the mirror needs update
>
> So drop it.
Consider it dropped!

Sau!
>> Sau!
>>
>>>> Thanks
>>>> Sau!
>>>
>>>
>
>