fix SRC_URI and update package to fix SRC_URI

PATCH Superseded Robert Yang 3 participants 12 messages Mar 6, 2015 – Mar 9, 2015

lore

Share & tools

lore

Robert Yang

author

2015-03-06 09:32 UTC #0 lore raw

cover fix SRC_URI and update package to fix SRC_URI

The following changes since commit 3c78468f12296abd02abce6eeac0f69bc7509958:

build-appliance-image: Update to master head revision (2015-03-03 13:12:50 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/uri
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/uri

Robert Yang (6):
xinetd: fixe HOMEPAGE and SRC_URI
libevent: fix SRC_URI
mailx: fix SRC_URI
net-tools: 1.60-25 -> 1.60-26
resolvconf: 1.76 -> 1.76.1
apt: fix SRC_URI

 .../{resolvconf_1.76.bb => resolvconf_1.76.1.bb}   |    5 ++---
 meta/recipes-devtools/apt/apt.inc                  |    2 +-
 meta/recipes-extended/mailx/mailx_12.5.bb          |    4 ++--
 .../{net-tools_1.60-25.bb => net-tools_1.60-26.bb} |    4 ++--
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb      |   10 ++++++----
 meta/recipes-support/libevent/libevent_2.0.21.bb   |    8 ++++----
 6 files changed, 17 insertions(+), 16 deletions(-)
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.76.bb => resolvconf_1.76.1.bb} (94%)
 rename meta/recipes-extended/net-tools/{net-tools_1.60-25.bb => net-tools_1.60-26.bb} (95%)

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-03-06 09:32 UTC #1 lore raw

PATCH 1/6 xinetd: fixe HOMEPAGE and SRC_URI

The www.xinetd.org is not available, use github to instead of it.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

meta/recipes-extended/xinetd/xinetd_2.3.15.bb +6 -4

index 288186e..98c4aeb 100644
@@ -1,5 +1,5 @@
 SUMMARY = "Socket-based service activation daemon"
-HOMEPAGE = "http://www.xinetd.org"
+HOMEPAGE = "https://github.com/xinetd-org/xinetd"
 
 # xinetd is a BSD-like license
 # Apple and Gentoo say BSD here.

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
 DEPENDS = ""
 PR = "r2"
 
-SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
+SRC_URI = "https://github.com/xinetd-org/xinetd/archive/xinetd-2-3-15.tar.gz \
       file://xinetd.init \
       file://xinetd.conf \
       file://xinetd.default \

@@ -20,8 +20,8 @@ SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
       file://xinetd.service \
       "
 
-SRC_URI[md5sum] = "77358478fd58efa6366accae99b8b04c"
-SRC_URI[sha256sum] = "bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3"
+SRC_URI[md5sum] = "dbd435d2bc822ea4566dd18632c09379"
+SRC_URI[sha256sum] = "620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c"
 
 inherit autotools update-rc.d systemd

@@ -35,6 +35,8 @@ EXTRA_OECONF="--disable-nls"
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers"
 
+S = "${WORKDIR}/${BPN}-${BPN}-2-3-15"
+
 do_configure() {
 	# Looks like configure.in is broken, so we are skipping
 	# rebuilding configure and are just using the shipped one

Signature · 1 line

1.7.9.5

Burton, Ross

2015-03-06 12:10 UTC #2 lore raw

Re: [PATCH 1/6] xinetd: fixe HOMEPAGE and SRC_URI

Quoted 3 lines · Robert Yang

+SRC_URI = "
https://github.com/xinetd-org/xinetd/archive/xinetd-2-3-15.tar.gz \

Have GitHub changed their archive behaviour? Last I heard the archives are cached for a while but can be re-generated at any moment, resulting in a checksum change.

Ross

Martin Jansa

2015-03-06 12:17 UTC #3 lore raw

Re: [PATCH 1/6] xinetd: fixe HOMEPAGE and SRC_URI

In reply to Robert Yang

Quoted 28 lines · Robert Yang

The www.xinetd.org is not available, use github to instead of it.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/xinetd/xinetd_2.3.15.bb |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

meta/recipes-extended/xinetd/xinetd_2.3.15.bb +2 -2

index 288186e..98c4aeb 100644
@@ -1,5 +1,5 @@
 SUMMARY = "Socket-based service activation daemon"
-HOMEPAGE = "http://www.xinetd.org"
+HOMEPAGE = "https://github.com/xinetd-org/xinetd"
 
 # xinetd is a BSD-like license
 # Apple and Gentoo say BSD here.

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
 DEPENDS = ""
 PR = "r2"
 
-SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
+SRC_URI = "https://github.com/xinetd-org/xinetd/archive/xinetd-2-3-15.tar.gz \
       file://xinetd.init \
       file://xinetd.conf \
       file://xinetd.default \

meta/recipes-extended/xinetd/xinetd_2.3.15.bb SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \ · line 24

Quoted 7 lines

meta/recipes-extended/xinetd/xinetd_2.3.15.bb +2 -2

@@ -20,8 +20,8 @@ SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
       file://xinetd.service \
       "
 
-SRC_URI[md5sum] = "77358478fd58efa6366accae99b8b04c"
-SRC_URI[sha256sum] = "bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3"
+SRC_URI[md5sum] = "dbd435d2bc822ea4566dd18632c09379"
+SRC_URI[sha256sum] = "620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c"

Did you compare the archives?
Explain the difference in commit message.

Quoted 19 lines

meta/recipes-extended/xinetd/xinetd_2.3.15.bb +2 -0

 inherit autotools update-rc.d systemd

@@ -35,6 +35,8 @@ EXTRA_OECONF="--disable-nls"
 PACKAGECONFIG ??= "tcp-wrappers"
 PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers"
 
+S = "${WORKDIR}/${BPN}-${BPN}-2-3-15"
+
 do_configure() {
 	# Looks like configure.in is broken, so we are skipping
 	# rebuilding configure and are just using the shipped one

Signature · 7 lines

1.7.9.5

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Robert Yang

author

2015-03-06 09:32 UTC #4 lore raw

PATCH 2/6 libevent: fix SRC_URI

In reply to Robert Yang

The wget reported errors for the past URI since it can't follow the redirection well:
Connecting to cloud.github.com (cloud.github.com)|54.192.140.6|:443... connected.
OpenSSL: error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure Unable to establish SSL connection.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-support/libevent/libevent_2.0.21.bb |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

meta/recipes-support/libevent/libevent_2.0.21.bb +4 -4

index 5a1ff3b..3d6983f 100644
@@ -8,15 +8,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=45c5316ff684bcfe2f9f86d8b1279559"
 
 PR = "r1"
 
-SRC_URI = "http://github.com/downloads/libevent/libevent/${BPN}-${PV}-stable.tar.gz \
+SRC_URI = "https://github.com/libevent/libevent/archive/release-2.0.21-stable.tar.gz \
            file://obsolete_automake_macros.patch \
            file://disable_tests.patch \
 "
 
-SRC_URI[md5sum] = "b2405cc9ebf264aa47ff615d9de527a2"
-SRC_URI[sha256sum] = "22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5"
+SRC_URI[md5sum] = "6f72023c64a36a64ba1e0f14ceded375"
+SRC_URI[sha256sum] = "872b7cdc199ead2edd9f0d1e93b4d900e67d892c014545bd3314b3ae49505eff"
 
-S = "${WORKDIR}/${BPN}-${PV}-stable"
+S = "${WORKDIR}/${BPN}-release-${PV}-stable"
 
 EXTRA_OECONF = "--disable-openssl"

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-03-06 09:32 UTC #5 lore raw

PATCH 3/6 mailx: fix SRC_URI

In reply to Robert Yang

The old one is not available any more.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/mailx/mailx_12.5.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

meta/recipes-extended/mailx/mailx_12.5.bb +2 -2

index f2899d5..080d71f 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4202a0a62910cf94f7af8a3436a2a2dd"
 
 DEPENDS = "openssl"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}.orig.tar.gz;name=archive \
-           ${DEBIAN_MIRROR}/main/h/heirloom-mailx/heirloom-mailx_${PV}-1.diff.gz;name=patch \
+SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/heirloom-mailx_12.5.orig.tar.gz;name=archive \
+           https://launchpad.net/ubuntu/+archive/primary/+files/heirloom-mailx_12.5-1.diff.gz;name=patch \
            file://explicitly.disable.krb5.support.patch \
           "

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-03-06 09:32 UTC #6 lore raw

PATCH 4/6 net-tools: 1.60-25 -> 1.60-26

In reply to Robert Yang

The old net-tools_1.60-25.diff.gz is not available any more.

Signed-off-by Robert Yang <[email protected]>

---
 .../{net-tools_1.60-25.bb => net-tools_1.60-26.bb} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/net-tools/{net-tools_1.60-25.bb => net-tools_1.60-26.bb} (95%)

meta/recipes-extended/net-tools/net-tools_1.60-26.bb renamed from meta/recipes-extended/net-tools/net-tools_1.60-25.bb +2 -2

similarity index 95%
rename from meta/recipes-extended/net-tools/net-tools_1.60-25.bb
rename to meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index 0e4ee75..a837dc7 100644
@@ -18,8 +18,8 @@ S = "${WORKDIR}/net-tools-1.60"
 SRC_URI[tarball.md5sum] = "ecaf37acb5b5daff4bdda77785fd916d"
 SRC_URI[tarball.sha256sum] = "ec67967cf7b1a3a3828a84762fbc013ac50ee5dc9aa3095d5c591f302c2de0f5"
 
-SRC_URI[patch.md5sum] = "5ab1e2184d0fa6518031291138f2fc51"
-SRC_URI[patch.sha256sum] = "1bddcd96ac60e794978cb20fb7ea4c2e77258c56c042c9ac8b6ec2b2033bc56f"
+SRC_URI[patch.md5sum] = "ea3592f49ac8380962bc4d9b66c7e7e9"
+SRC_URI[patch.sha256sum] = "aeeeafaff68866a446f01bb639d4e0146a60af34dcd20e31a3e46585022fc76c"
 
 inherit gettext

Signature · 1 line

1.7.9.5

Burton, Ross

2015-03-06 12:24 UTC #7 lore raw

Re: [PATCH 4/6] net-tools: 1.60-25 -> 1.60-26

Quoted 2 lines · Robert Yang

The old net-tools_1.60-25.diff.gz is not available any more.

As I said yesterday, we're feature-frozen now. Instead of upgrading can we use a different mirror. snapshot.debian.org is useful as they archive all releases there:

http://snapshot.debian.org/package/net-tools/1.60-25/

Ross

Robert Yang

author

2015-03-06 09:32 UTC #8 lore raw

PATCH 5/6 resolvconf: 1.76 -> 1.76.1

In reply to Robert Yang

The old source is not available any more.

Signed-off-by Robert Yang <[email protected]>

---
 .../{resolvconf_1.76.bb => resolvconf_1.76.1.bb}   |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-connectivity/resolvconf/{resolvconf_1.76.bb => resolvconf_1.76.1.bb} (94%)

meta/recipes-connectivity/resolvconf/resolvconf_1.76.1.bb renamed from meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb +2 -3

similarity index 94%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.76.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.76.1.bb
index 20a2c19..fb9ca2b 100644
@@ -16,9 +16,8 @@ SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.xz \
            file://99_resolvconf \
           "
 
-
-SRC_URI[md5sum] = "d78ce30ea068999cd3e0523300b27255"
-SRC_URI[sha256sum] = "c9f40f7405b37399ddbf29ca4205b4911ee35cb9ffd9be7671faa2385b1fa573"
+SRC_URI[md5sum] = "16f395f43ef5d832922b0cd4a82efcaa"
+SRC_URI[sha256sum] = "05318a7988f2b6fa400468ea096f0ccf73d166ac47a4fbab287ff63bea9502d3"
 
 inherit allarch

Signature · 1 line

1.7.9.5

Robert Yang

author

2015-03-06 09:32 UTC #9 lore raw

PATCH 6/6 apt: fix SRC_URI

In reply to Robert Yang

The old one is not available any more.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-devtools/apt/apt.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-devtools/apt/apt.inc +1 -1

index 378021a..12dfcaf 100644
@@ -2,7 +2,7 @@ SUMMARY = "Advanced front-end for dpkg"
 LICENSE = "GPLv2.0+"
 SECTION = "base"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
+SRC_URI = "https://launchpad.net/debian/+archive/primary/+files/apt_0.9.9.4.tar.gz \
            file://no-ko-translation.patch \
            file://use-host.patch \
            file://makerace.patch \

Signature · 1 line

1.7.9.5

Burton, Ross

2015-03-06 12:35 UTC #10 lore raw

Re: [PATCH 6/6] apt: fix SRC_URI

Quoted 4 lines · Robert Yang

(quoted diff) +1 -1
-SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
+SRC_URI = "
https://launchpad.net/debian/+archive/primary/+files/apt_0.9.9.4.tar.gz \

Surely this should continue using ${PV}, especially as this is a .inc.

Ross

Robert Yang

author

2015-03-09 01:39 UTC #11 lore raw

Re: [PATCH 6/6] apt: fix SRC_URI

Quoted 10 lines · Ross

On 6 March 2015 at 09:32, Robert Yang <[email protected] <mailto:[email protected]>> wrote:
    -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
    +SRC_URI =
    "https://launchpad.net/debian/+archive/primary/+files/apt_0.9.9.4.tar.gz \
Surely this should continue using ${PV}, especially as this is a .inc.

Thanks, I will update them and resend these patches.

// Robert

Quoted 2 lines

Ross