Skip to contentSkip to conversation

bitbake.conf: SRCPV always upgradeable paths for git recipes

PATCH In review Martin Jansa 6 participants 9 messages Nov 11, 2009 – Nov 12, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bitbake.conf: SRCPV always upgradeable paths for git recipes

* Holger Hans Peter Freyther <[email protected]> did for the OM git tree that was never merged back into OE.
* Taken from xora/angstrom-srcpv branch where it rot for long enough

---
 conf/bitbake.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
conf/bitbake.conf +2 -1
index 39a1f27..7c0defe 100644
@@ -570,7 +570,8 @@ UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P $
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
 SRCDATE = "${DATE}"
 SRCREV = "1"
-AUTOREV = "${@bb.fetch.get_srcrev(d)}"
+SRCPV = "${@bb.fetch.get_srcrev(d)}"
+AUTOREV = "${SRCPV}"
 
 SRC_URI = "file://${FILE}"
 
Signature · 1 line
1.6.5.2
#1 lore raw
Quoted 3 lines · Martin Jansa

* Holger Hans Peter Freyther <[email protected]> did for the OM git tree that was never merged back into OE.
* Taken from xora/angstrom-srcpv branch where it rot for long enough

We also discussed it during the OEDEM...

Signature · 1 line
Denys
Quoted 26 lines
---
 conf/bitbake.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
conf/bitbake.conf +2 -1
index 39a1f27..7c0defe 100644
@@ -570,7 +570,8 @@ UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P $
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
 SRCDATE = "${DATE}"
 SRCREV = "1"
-AUTOREV = "${@bb.fetch.get_srcrev(d)}"
+SRCPV = "${@bb.fetch.get_srcrev(d)}"
+AUTOREV = "${SRCPV}"
 
 SRC_URI = "file://${FILE}"
 
Signature · 7 lines
1.6.5.2


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
#2 lore raw
Quoted 6 lines · Denys Dmytriyenko
Quoted 3 lines · Martin Jansa

* Holger Hans Peter Freyther <[email protected]> did for the OM git tree that was never merged back into OE.
* Taken from xora/angstrom-srcpv branch where it rot for long enough

We also discussed it during the OEDEM...

RP said you did on #oe
16:25:45 < RP> JaMa|Wrk: I can't sanction that, needs to be proposed on list but I'd ack it
16:26:18 < XorA> JaMa|Wrk: got my Ack
16:26:46 < RP> It was mentioned informally at OEDEM and nobody I talked to objected...

Mickey acked too on #openmoko-cdevel 16:47:28 < JaMa|Wrk> mickey|office: ack for SRCPV? 16:50:47 < mickey|office> ya

So that's at least 3 ACKs, if there is no objection today I'll push it.

Signature · 3 lines
uin:136542059                jid:[email protected]
Jansa Martin                 sip:[email protected] 
JaMa                         
#3 lore raw
Quoted 15 lines · Martin Jansa
Quoted 6 lines · Denys Dmytriyenko
Quoted 3 lines · Martin Jansa

* Holger Hans Peter Freyther<[email protected]> did for the OM git tree that was never merged back into OE.
* Taken from xora/angstrom-srcpv branch where it rot for long enough

We also discussed it during the OEDEM...

RP said you did on #oe
16:25:45< RP> JaMa|Wrk: I can't sanction that, needs to be proposed on list but I'd ack it
16:26:18< XorA> JaMa|Wrk: got my Ack
16:26:46< RP> It was mentioned informally at OEDEM and nobody I talked to objected...

Quoted 5 lines

Mickey acked too on #openmoko-cdevel 16:47:28< JaMa|Wrk> mickey|office: ack for SRCPV? 16:50:47< mickey|office> ya

So that's at least 3 ACKs, if there is no objection today I'll push it.

Can people please get in the habit of using proper acks for patches? This fishing though the random forms people are using is getting tiresome.

For me: Acked-by: Philip Balister <[email protected]>

Patchwork will pick these up, so it makes tracking things much easier. Even if you agree to ack something in irc, please follow up with the proper ack on the mailing list.

Philip

#4 lore raw
Quoted 4 lines · Philip Balister

Can people please get in the habit of using proper acks for patches? This fishing though the random forms people are using is getting tiresome.

For me: Acked-by: Philip Balister <[email protected]>

Give me a chance, I don't spent all day staring at the list! :)

#5 lore raw
In reply to Philip Balister
Quoted 8 lines · Philip Balister

Can people please get in the habit of using proper acks for patches? This fishing though the random forms people are using is getting tiresome.

For me: Acked-by: Philip Balister <[email protected]>

Patchwork will pick these up, so it makes tracking things much easier. Even if you agree to ack something in irc, please follow up with the proper ack on the mailing list.

What exactly does patchwork do with them? From a casual browse of
http://patchwork.openembedded.org/patch/1256/ it doesn't seem as if that line in your email has produced any different effect to the other replies in this thread.

From your comment about tracking being much easier, it seems like there must be something else going on that I am not spotting. Maybe you could post a quick "idiot's guide to patchwork" or some such.

p.

#6 lore raw
Quoted 10 lines · Phil Blundell
Quoted 8 lines · Philip Balister

Can people please get in the habit of using proper acks for patches? This fishing though the random forms people are using is getting tiresome.

For me: Acked-by: Philip Balister<[email protected]>

Patchwork will pick these up, so it makes tracking things much easier. Even if you agree to ack something in irc, please follow up with the proper ack on the mailing list.

Quoted 8 lines

What exactly does patchwork do with them? From a casual browse of
http://patchwork.openembedded.org/patch/1256/ it doesn't seem as if that line in your email has produced any different effect to the other replies in this thread.

Quoted 1 line

From your comment about tracking being much easier, it seems like there

must be something else going on that I am not spotting. Maybe you could post a quick "idiot's guide to patchwork" or some such.

Real quick, click on the download mbox and you should see Grame's signed-off-by and Richard's Acked-by added to the patch. When you apply this to git, it will retain those lines.

I made mine not quit fit the format since I hadn't reviewed the patch.

The other reason is to use standard notation so people do not have to collect ack statements in various forms, from various sources. We should use the standard forms, not something we invent internally.

Philip

Quoted 10 lines

p.

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

#7 lore raw
In reply to Martin Jansa

For inclusion in .dev

Graeme

Quoted 29 lines · Martin Jansa

* Holger Hans Peter Freyther <[email protected]> did for the OM git tree that was never merged back into OE.
* Taken from xora/angstrom-srcpv branch where it rot for long enough

---
 conf/bitbake.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
conf/bitbake.conf +2 -1
index 39a1f27..7c0defe 100644
@@ -570,7 +570,8 @@ UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P $
 UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
 SRCDATE = "${DATE}"
 SRCREV = "1"
-AUTOREV = "${@bb.fetch.get_srcrev(d)}"
+SRCPV = "${@bb.fetch.get_srcrev(d)}"
+AUTOREV = "${SRCPV}"
 
 SRC_URI = "file://${FILE}"
 
Signature · 7 lines
1.6.5.2


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
#8 lore raw
Quoted 5 lines · Graeme Gregory

For inclusion in .dev

Graeme

Thanks pushed.

What about SRCREV->SRCPV migration?

1) svn recipes with +svnr{SRCREV} could be just replaced with +svnr{SRCPV} as the output should be the same

2) svn recipes with -r{SRCREV}, -svn{SRCREV}, -svnr{SRCREV}, +r{SRCREV}, +svn{SRCREV} unified to +svnr{SRCPV}? I'm not sure if '+' will be sorted higher version wise, so do we need to bump PE?

3) git recipes with -git{SRCREV}, -gitr{SRCREV}, +git{SRCREV} unified to +gitr{SRCPV} with PE bump?

Is there better way to create upgradeable path then bumping PE? Package names/.ipk filenames are a bit ugly with PE imho.

Should I prepare one BIG patch for all recipes or commit them 1 by 1?

XorA said that migrating all recipes at once in his xora/angstrom-srcpv branch was too much work to maintain and push. So I would like to push it directly to oe.dev or with really short lived tmp branch, if all agree that we should migrate all packages globally.

Some statistics:
1032 lines - grep -R "PV *=" recipes

571 "\(svn.bb\)\|\(git.bb\)\|\(SRCREV\)\|\(SRCPV\)" 342 "svn.bb"
258 "svn.bb.*SRCREV"
13 "svn.bb" | grep -v SRCREV | grep -v SRCDATE

without SRCDATEs
0 "svn.bb.*-r"
14 "svn.bb.*+svn\\$"
218 "svn.bb.*+svnr\\$" (this should be safe)

187 "git.bb"

42  "git.bb.*" | grep -v SRCREV (few with SRCDATE for git?)
0   "git.bb.*-git\\$"
32  "git.bb.*-gitr\\$"
18  "git.bb.*+git\\$"

100 "git.bb.*+gitr\\$"

Which should be resolved by package maintained maybe?
13 "svn.bb" | grep -v SRCREV | grep -v SRCDATE
(probably should have SRCPV in PV, maybe its in PR)
./fltk/fltk2_svn.bb:PV = "1.9.9+svnr${SVNREL}" ./openscada/openscada_svn.bb:PV = "0.6.4" ./mythtv/mythtv_svn.bb:REALPV = "0.22" ./freesmartphone/fsoraw_svn.bb:PV = "0.0.1"
this should be easy:
./openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb:PV = "0.1.0+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-battery_svn.bb:PV = "0.1.1+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-bt_svn.bb:PV = "0.1.0+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-gps_svn.bb:PV = "0.1.0+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-memory_svn.bb:PV = "0.0.0+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-wifi_svn.bb:PV = "0.0.0+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-gsm_svn.bb:PV = "0.1.0+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-usb_svn.bb:PV = "0.1.0+svn${SVNREV}" ./openmoko-panel-plugins/openmoko-panel-clock_svn.bb:PV = "0.1.0+svn${SVNREV}"

42 "git.bb.*" | grep -v SRCREV (few with SRCDATE for git?) ./gnome/gnome-bluetooth_git.bb:PV = "2.28.1"
./libdlo/libdlo_git.bb:PV = "0.1.0"
./networkmanager/networkmanager_git.bb:PV = "0.7.1+git" ./networkmanager/cnetworkmanager_git.bb:PV = "0.8+git" ./networkmanager/netm-cli_git.bb:PV = "0.4+git" ./networkmanager/network-manager-applet_git.bb:PV = "0.7.1+git" ./cairo/cairo_git.bb:PV = "1.9.3"
./xorg-xserver/xserver-kdrive_git.bb:PV = "1.4+git${SRCDATE}" ./linux/linux-hackndev-2.6_git.bb:PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}" ./linux/linux-efika_2.6.21+git.bb:PV = "2.6.21+git${SRCDATE}" ./linux/linux-omap_git.bb:PV = "2.6.31"
./linux/linux-powerpc-fsl_git.bb:PV = "2.6.30"
./linux/linux-omap2_git.bb:PV = "2.6.26"
./kexecboot/kexecboot_git.bb:PV = "0.5"
./ekiga/ekiga_git.bb:PV = "3.2.6+git"
./moblin/nbtk_git.bb:PV = "0.8.0"
./moblin/hornsey_git.bb:PV = "0.0"
./moblin/bognor-regis_git.bb:PV = "0.4.1"
./moblin/bickley_git.bb:PV = "0.0"
./gtk-theme-torturer/gtk-theme-torturer_git.bb:PV = "0.0.0+git${SRCDATE}" ./matchbox-keyboard/mboxkbd-layouts-gui_git.bb:PV = "0.0+git5b42aeff36d930dc3a9b75eedc74dacfec45f43f" ./connman/connman-gnome_git.bb:PV = "0.5+git"
./connman/connman_git.bb:PV = "0.42+git"
./python/python-phoneutils_git.bb:PV = "0.0.2+gitr${SRCPV}" ./quake/quake3-pandora-gles_git.bb:PV = "0.0"
./gstreamer/gst-plugin-gles_git.bb:PV = "0.10"
./bluez/bluez-gnome_git.bb:PV = "0.10+git${SRCDATE}" ./mamona/mamona-input-methods_git.bb:PV = "0.1+git" ./mamona/mamonaim-e-applet_git.bb:PV = "0.1+git"
./xorg-lib/pixman_git.bb:PV = "0.17.1"
./packagekit/packagekit_git.bb:PV = "0.4.6+git"
./hal/hal_git.bb:PV = "0.5.9.1+git${SRCDATE}"
./hal/hal-info_git.bb:PV = "${SRCDATE}+git"
./xcb/xcb-demo_git.bb:PV = "0.1+git"
./xcb/libxcb_git.bb:PV = "1.0+git"
./xcb/xcb-util_git.bb:PV = "0.2+git"
./xcb/xcb-proto_git.bb:PV = "1.0+git"
./gphoto2/ptp-gadget_git.bb:PV = "1.1"
./clutter/clutter-gst-0.9_git.bb:PV = "0.9.0"
./clutter/clutter_0.8+git.bb:PV = "0.8.8"
./clutter/clutter-0.9_git.bb:PV = "1.1.0"
./geoclue/geoclue_git.bb:PV = "0.11.1"

Signature · 3 lines
uin:136542059                jid:[email protected]
Jansa Martin                 sip:[email protected] 
JaMa