Skip to contentSkip to conversation

lftp: change SRC_URI source

PATCH In review Martin Jansa 2 participants 3 messages Sep 21, 2017

lore
Share & tools
lore

Martin Jansa

author
#0 lore raw

PATCH 1/2 lftp: change SRC_URI source

From: Oleksandr Kravchuk <[email protected]>

Changed SRC_URI source to official web-site, which keeps tarballs with old releases.

Cherry-picked from master, but without the upgrade to 4.7.5.

commit a2e075ba656a89da58ca4f849c2f08ec6d50a96f
Author: Oleksandr Kravchuk <[email protected]>
Date: Mon Jan 9 15:34:07 2017 +0100

lftp: update to 4.7.5 and change SRC_URI source

Updated lftp to version 4.7.5 and changed SRC_URI source to official web-site, which keeps tarballs with old releases.

Signed-off-by Oleksandr Kravchuk <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
Signed-off-by Joe MacDonald <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb +1 -1
index 287821194..d62453745 100644
@@ -6,7 +6,7 @@ SECTION = "console/network"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "http://fossies.org/linux/misc/lftp-${PV}.tar.gz \
+SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.gz \
            file://fix-gcc-6-conflicts-signbit.patch \
           "
 SRC_URI[md5sum] = "8eb1fe5f113126b60f172643c7f6c2e6"
Signature · 1 line
2.14.1
author
#1 lore raw

PATCH 2/2 opensaf: fix QA Issue

From: "[email protected]" <[email protected]>

Move the do_sysvinit_install contents to do_install_append.

Signed-off-by Dengke Du <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
Signed-off-by Joe MacDonald <[email protected]>
---
 meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb +5 -9
index da9c10520..6ceb225e9 100644
@@ -53,6 +53,11 @@ do_install_append() {
     install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \
         ${D}${systemd_unitdir}/system
     install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system
+
+    if [ ! -d "${D}${sysconfdir}/init.d" ]; then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/
+    fi
 }
 
 FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service"

@@ -62,12 +67,3 @@ INSANE_SKIP_${PN} = "dev-so"
 
 RDEPENDS_${PN} += "bash python"
 
-do_sysvinit_install() {
-    if [ ! -d "${D}${sysconfdir}/init.d" ]; then
-       install -d ${D}${sysconfdir}/init.d
-       install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/
-    fi
-}
-
-addtask sysvinit_install after do_install before do_package
-
Signature · 1 line
2.14.1
#2 lore raw
In reply to Martin Jansa
Quoted 6 lines · Martin Jansa

From: Oleksandr Kravchuk <[email protected]>

Changed SRC_URI source to official web-site, which keeps tarballs with old releases.

Cherry-picked from master, but without the upgrade to 4.7.5.

Both in stagging.

Thanks,
Armin

Quoted 31 lines

commit a2e075ba656a89da58ca4f849c2f08ec6d50a96f
Author: Oleksandr Kravchuk <[email protected]>
Date: Mon Jan 9 15:34:07 2017 +0100

lftp: update to 4.7.5 and change SRC_URI source

Updated lftp to version 4.7.5 and changed SRC_URI source to official web-site, which keeps tarballs with old releases.

Signed-off-by Oleksandr Kravchuk <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
Signed-off-by Joe MacDonald <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
---
 meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb +1 -1
index 287821194..d62453745 100644
@@ -6,7 +6,7 @@ SECTION = "console/network"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-SRC_URI = "http://fossies.org/linux/misc/lftp-${PV}.tar.gz \
+SRC_URI = "http://lftp.yar.ru/ftp/lftp-${PV}.tar.gz \
            file://fix-gcc-6-conflicts-signbit.patch \
           "
 SRC_URI[md5sum] = "8eb1fe5f113126b60f172643c7f6c2e6"