Skip to contentSkip to conversation

syslog-ng: fix SRC_URIs

PATCH In review Michael Smith 3 participants 6 messages May 28, 2009 – May 30, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 syslog-ng: fix SRC_URIs

---
 conf/checksums.ini                    |    6 +++---
 recipes/syslog-ng/syslog-ng_1.6.11.bb |    2 +-
 recipes/syslog-ng/syslog-ng_1.6.8.bb  |    2 +-
 recipes/syslog-ng/syslog-ng_2.0.5.bb  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
conf/checksums.ini +3 -3
index 19192ba..04737b1 100644
@@ -22470,15 +22470,15 @@ sha256=c087b112da0afd1c50ba8a8a2727c4cabfb1e5a57f43701c5abdc05865072649
 md5=ee6b84cc7b598b4e1a00a4a8c6676d4e
 sha256=d4d17102e014d3183a11719896061dc464c3d9a836caaf47b3b57da4ac23b52d
 
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.11.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.11.tar.gz]
 md5=8f9ca6140f428dc9adec9fa1c270a2dd
 sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
 
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.8.tar.gz]
 md5=ffbad7e8e6dcbe385820b8ffba23b622
 sha256=3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
 
-[http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/syslog-ng-2.0.5.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-2.0.5.tar.gz]
 md5=c161eefc450fabc246c1a10997c6c6a5
 sha256=34862f87d9d404ad4874d95ee871334f5bc2acad65420f672ad2ee286ab660a1
 
recipes/syslog-ng/syslog-ng_1.6.11.bb +1 -1
index 794ad53..0ae0090 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
 PR = "r0"
 
-SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/${PN}-${PV}.tar.gz \
           file://syslog-ng.conf \
           file://initscript"
 
recipes/syslog-ng/syslog-ng_1.6.8.bb +1 -1
index d8e02d0..9535656 100644
@@ -2,7 +2,7 @@ PR = "r9"
 DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
 
-SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/${PN}-${PV}.tar.gz \
           file://syslog-ng.conf \
 	  file://initscript"
 
recipes/syslog-ng/syslog-ng_2.0.5.bb +1 -1
index 80f0fc5..5b3431c 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex eventlog glib-2.0"
 PR = "r2"
 
-SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/${P}.tar.gz \
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/${P}.tar.gz \
           file://syslog-ng.conf \
           file://initscript"
 
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 vim: be an alternative to /bin/vi; switch to INC_PR

---
 recipes/vim/gvim_7.0.bb |    2 +-
 recipes/vim/vim.inc     |    9 ++++++++-
 recipes/vim/vim_6.4.bb  |    2 ++
 recipes/vim/vim_7.0.bb  |    2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
recipes/vim/gvim_7.0.bb +1 -1
index a073e65..60aa041 100644
@@ -3,7 +3,7 @@ VIMVER = "70"
 require vim.inc
 
 DEPENDS += "gtk+ xt"
-PR = "r1"
+PR = "${INC_PR}.1"
 FILESPATHPKG =. "vim-${PV}:vim:"
 
 EXTRA_OECONF = "--enable-gui=gtk2 --enable-gtk2-test --disable-gtktest \
recipes/vim/vim.inc +8 -1
index f675ce8..a766acc 100644
@@ -3,12 +3,14 @@ SECTION = "console/utils"
 DEPENDS = "ncurses"
 LICENSE = "vim"
 
+INC_PR = "r2"
+
 SRC_URI = "ftp://ftp.vim.org/pub/vim/unix/vim-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1"
 
 S = "${WORKDIR}/vim${VIMVER}/src"
 
-inherit autotools
+inherit autotools update-alternatives
 
 do_configure () {
 	rm -f auto/*
@@ -28,3 +30,8 @@ FILES_vim-tutor = "${datadir}/vim/vim${VIMVER}/tutor ${bindir}/vimtutor"
 #FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
 #	       ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \
 #	       /bin /sbin /lib/*/ /lib/*.so* ${datadir}/vim"
+
+ALTERNATIVE_NAME = "vi"
+ALTERNATIVE_PATH = "vim"
+ALTERNATIVE_LINK = "${base_bindir}/vi"
+ALTERNATIVE_PRIORITY = "100"
recipes/vim/vim_6.4.bb +2 -0
index 4cf6591..d062bc5 100644
@@ -2,6 +2,8 @@ VIMVER = "64"
 
 require vim.inc
 
+PR = "${INC_PR}.1"
+
 EXTRA_OECONF = "--enable-gui=none --disable-gtktest \
 		--disable-xim --with-features=normal \
 		--disable-gpm --without-x --disable-netbeans \
recipes/vim/vim_7.0.bb +1 -1
index c821f6e..e3fa7ab 100644
@@ -2,7 +2,7 @@ VIMVER = "70"
 
 require vim.inc
 
-PR = "r1"
+PR = "${INC_PR}.1"
 
 EXTRA_OECONF = "--enable-gui=none --disable-gtktest \
 		--disable-xim --with-features=big \
Signature · 1 line
1.5.6.5
Acked-by on v1 1/1
#2 lore raw

Re: [PATCH] vim: be an alternative to /bin/vi; switch to INC_PR

Quoted 13 lines · Michael Smith
---
 recipes/vim/gvim_7.0.bb |    2 +-
 recipes/vim/vim.inc     |    9 ++++++++-
 recipes/vim/vim_6.4.bb  |    2 ++
 recipes/vim/vim_7.0.bb  |    2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)
recipes/vim/gvim_7.0.bb +0 -0
index a073e65..60aa041 100644

recipes/vim/gvim_7.0.bb VIMVER = "70" · line 7

Quoted 6 lines
recipes/vim/gvim_7.0.bb +1 -1
@@ -3,7 +3,7 @@ VIMVER = "70"
 require vim.inc
 
 DEPENDS += "gtk+ xt"
-PR = "r1"
+PR = "${INC_PR}.1"
 FILESPATHPKG =. "vim-${PV}:vim:"

The FILESPATHPKG change here hasn't been submitted yet :) This particular change is

But I can't git am without the missing bit :)

Signature · 1 line
Tom Rini
#3 lore raw

Re: [PATCH] vim: be an alternative to /bin/vi; switch to INC_PR

Quoted 7 lines · Tom Rini

recipes/vim/gvim_7.0.bb VIMVER = "70" · line 7

Quoted 4 lines · Michael Smith

DEPENDS += "gtk+ xt"

recipes/vim/gvim_7.0.bb +1 -1
-PR = "r1"
+PR = "${INC_PR}.1"
 FILESPATHPKG =. "vim-${PV}:vim:"

The FILESPATHPKG change here hasn't been submitted yet :)

Oops, that was sloppy on my part -- would you mind trying to am again now that the FILESPATHPKG series is applied? This is the URL:

http://patchwork.openembedded.org/patch/655/mbox/

(thanks for applying that series, btw)

Mike

#4 lore raw

Re: [PATCH] vim: be an alternative to /bin/vi; switch to INC_PR

Quoted 10 lines · Michael Smith
Quoted 7 lines · Tom Rini

recipes/vim/gvim_7.0.bb VIMVER = "70" · line 7

Quoted 4 lines · Michael Smith

DEPENDS += "gtk+ xt"

recipes/vim/gvim_7.0.bb +1 -1
-PR = "r1"
+PR = "${INC_PR}.1"
 FILESPATHPKG =. "vim-${PV}:vim:"

The FILESPATHPKG change here hasn't been submitted yet :)

Quoted 6 lines

Oops, that was sloppy on my part -- would you mind trying to am again now that the FILESPATHPKG series is applied? This is the URL:

http://patchwork.openembedded.org/patch/655/mbox/

(thanks for applying that series, btw)

Done, thanks for the good work :)

Signature · 1 line
Tom Rini
Acked-by on v1 1/1
#5 lore raw
In reply to Michael Smith
Quoted 1 line · Michael Smith
Quoted 77 lines
---
 conf/checksums.ini                    |    6 +++---
 recipes/syslog-ng/syslog-ng_1.6.11.bb |    2 +-
 recipes/syslog-ng/syslog-ng_1.6.8.bb  |    2 +-
 recipes/syslog-ng/syslog-ng_2.0.5.bb  |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
conf/checksums.ini +3 -3
index 19192ba..04737b1 100644
@@ -22470,15 +22470,15 @@ sha256=c087b112da0afd1c50ba8a8a2727c4cabfb1e5a57f43701c5abdc05865072649
 md5=ee6b84cc7b598b4e1a00a4a8c6676d4e
 sha256=d4d17102e014d3183a11719896061dc464c3d9a836caaf47b3b57da4ac23b52d
 
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.11.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.11.tar.gz]
 md5=8f9ca6140f428dc9adec9fa1c270a2dd
 sha256=dd37f1e280bd6c2d66c9a15aa3ee9e209a1b649e3b79e70fee58aea1cb0ea093
 
-[http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-1.6.8.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/syslog-ng-1.6.8.tar.gz]
 md5=ffbad7e8e6dcbe385820b8ffba23b622
 sha256=3c841fd89599ffb770cdf2844426980d75dc3dab12e0f707e4cbb51937f6125e
 
-[http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/syslog-ng-2.0.5.tar.gz]
+[http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/syslog-ng-2.0.5.tar.gz]
 md5=c161eefc450fabc246c1a10997c6c6a5
 sha256=34862f87d9d404ad4874d95ee871334f5bc2acad65420f672ad2ee286ab660a1
 
recipes/syslog-ng/syslog-ng_1.6.11.bb +1 -1
index 794ad53..0ae0090 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
 PR = "r0"
 
-SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/${PN}-${PV}.tar.gz \
           file://syslog-ng.conf \
           file://initscript"
 
recipes/syslog-ng/syslog-ng_1.6.8.bb +1 -1
index d8e02d0..9535656 100644
@@ -2,7 +2,7 @@ PR = "r9"
 DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex"
 
-SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/${PN}-${PV}.tar.gz \
           file://syslog-ng.conf \
 	  file://initscript"
 
recipes/syslog-ng/syslog-ng_2.0.5.bb +1 -1
index 80f0fc5..5b3431c 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Alternative system logger daemon"
 DEPENDS = "libol flex eventlog glib-2.0"
 PR = "r2"
 
-SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/${P}.tar.gz \
+SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/src/${P}.tar.gz \
           file://syslog-ng.conf \
           file://initscript"
 
Signature · 7 lines
1.5.6.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel