| Submitter | Philippe De Swert |
|---|---|
| Date | March 28, 2011, 6:33 p.m. |
| Message ID | <1301337206-24526-1-git-send-email-philippedeswert@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/1837/ |
| State | Accepted |
| Headers | show |
Comments
On Tue, Mar 29, 2011 at 10:47:18AM +0200, Paul Menzel wrote: > Dear Philippe, > > > please read the commit policy [1] and example [2] on how to format the > commit message. You do not have to resend this patch as I will edit the > commit message before pushing your patch. > > Am Montag, den 28.03.2011, 21:33 +0300 schrieb phdeswer: > > > remove default_preference game as everybody wants to use the latest > > version, but the default_prefernce is -1 so this fails building packages > > that depend on poppler if not used with a distro that has a preferred > > version or default_preference bump > > Please note that you can always set your preferred version in > `conf/local.conf`. > > > Signed-off-by: phdeswer <philippedeswert@gmail.com> > > > > --- > > recipes/poppler/poppler_0.12.3.bb | 5 ----- > > 1 files changed, 0 insertions(+), 5 deletions(-) > > > > diff --git a/recipes/poppler/poppler_0.12.3.bb b/recipes/poppler/poppler_0.12.3.bb > > index 8b9fcca..ce1952e 100644 > > --- a/recipes/poppler/poppler_0.12.3.bb > > +++ b/recipes/poppler/poppler_0.12.3.bb > > @@ -2,11 +2,6 @@ require poppler.inc > > > > DEPENDS += "lcms" > > > > -DEFAULT_PREFERENCE = "-1" > > -DEFAULT_PREFERENCE_angstrom = "1" > > -DEFAULT_PREFERENCE_minimal = "1" > > -DEFAULT_PREFERENCE_minimal-uclibc = "1" > > - > > EXTRA_OECONF_append = " --disable-abiword-output " > > > > RDEPENDS_${PN} = "poppler-data" > > Do all distribution maintainers agree with this patch? I do not see a > problem since it has been used in tested in ?ngström and > minimal{,-uclibc} for over six months. and in SHR too (pinned in preferred-shr-versions.inc), feel free to remove it there too. Acked-by: Martin Jansa <Martin.Jansa@gmail.com> > Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> > > > Thanks, > > Paul > > > [1] http://openembedded.org/index.php/Commit_Policy > [2] http://openembedded.org/index.php/Commit_log_example > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Dear Philippe, Am Dienstag, den 29.03.2011, 10:56 +0200 schrieb Martin Jansa: > On Tue, Mar 29, 2011 at 10:47:18AM +0200, Paul Menzel wrote: > > please read the commit policy [1] and example [2] on how to format the > > commit message. You do not have to resend this patch as I will edit the > > commit message before pushing your patch. > > > > Am Montag, den 28.03.2011, 21:33 +0300 schrieb phdeswer: > > > > > remove default_preference game as everybody wants to use the latest > > > version, but the default_prefernce is -1 so this fails building packages > > > that depend on poppler if not used with a distro that has a preferred > > > version or default_preference bump > > > > Please note that you can always set your preferred version in > > `conf/local.conf`. > > > > > Signed-off-by: phdeswer <philippedeswert@gmail.com> > > > > > > --- > > > recipes/poppler/poppler_0.12.3.bb | 5 ----- > > > 1 files changed, 0 insertions(+), 5 deletions(-) > > > > > > diff --git a/recipes/poppler/poppler_0.12.3.bb b/recipes/poppler/poppler_0.12.3.bb > > > index 8b9fcca..ce1952e 100644 > > > --- a/recipes/poppler/poppler_0.12.3.bb > > > +++ b/recipes/poppler/poppler_0.12.3.bb > > > @@ -2,11 +2,6 @@ require poppler.inc > > > > > > DEPENDS += "lcms" > > > > > > -DEFAULT_PREFERENCE = "-1" > > > -DEFAULT_PREFERENCE_angstrom = "1" > > > -DEFAULT_PREFERENCE_minimal = "1" > > > -DEFAULT_PREFERENCE_minimal-uclibc = "1" > > > - > > > EXTRA_OECONF_append = " --disable-abiword-output " > > > > > > RDEPENDS_${PN} = "poppler-data" > > > > Do all distribution maintainers agree with this patch? I do not see a > > problem since it has been used in tested in ?ngström and > > minimal{,-uclibc} for over six months. > > and in SHR too (pinned in preferred-shr-versions.inc), feel free to > remove it there too. > > Acked-by: Martin Jansa <Martin.Jansa@gmail.com> > > > Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> I pushed the edited patch in bb63320b [3]. Philippe, please update the state of your patch in the patch queue [4], since I do not have the permissions to do so. bin/pwclient update -s Accepted -c bb63320bc4c955c51619d73cfc622001d602911a 1837 Thanks, Paul > > [1] http://openembedded.org/index.php/Commit_Policy > > [2] http://openembedded.org/index.php/Commit_log_example [3] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=bb63320bc4c955c51619d73cfc622001d602911a [4] http://openembedded.org/index.php/Patchwork
Hi Paul, On 29/03/2011, Paul Menzel <paulepanter@users.sourceforge.net> wrote: > please read the commit policy [1] and example [2] on how to format the > commit message. You do not have to resend this patch as I will edit the > commit message before pushing your patch. Thanks. Seem they are still pretty the same as way back when I had commit rights on the monotone OE tree... Things got a bit complicated due to my inexperience with git. So some stuff went wrong... My second patch looks already better ;) > Am Montag, den 28.03.2011, 21:33 +0300 schrieb phdeswer: > >> remove default_preference game as everybody wants to use the latest >> version, but the default_prefernce is -1 so this fails building packages >> that depend on poppler if not used with a distro that has a preferred >> version or default_preference bump > > Please note that you can always set your preferred version in > `conf/local.conf`. I know. Or in a distro/include/<distro-name>.inc with preferred_versions... >> Signed-off-by: phdeswer <philippedeswert@gmail.com> >> >> --- >> recipes/poppler/poppler_0.12.3.bb | 5 ----- >> 1 files changed, 0 insertions(+), 5 deletions(-) >> >> diff --git a/recipes/poppler/poppler_0.12.3.bb >> b/recipes/poppler/poppler_0.12.3.bb >> index 8b9fcca..ce1952e 100644 >> --- a/recipes/poppler/poppler_0.12.3.bb >> +++ b/recipes/poppler/poppler_0.12.3.bb >> @@ -2,11 +2,6 @@ require poppler.inc >> >> DEPENDS += "lcms" >> >> -DEFAULT_PREFERENCE = "-1" >> -DEFAULT_PREFERENCE_angstrom = "1" >> -DEFAULT_PREFERENCE_minimal = "1" >> -DEFAULT_PREFERENCE_minimal-uclibc = "1" >> - >> EXTRA_OECONF_append = " --disable-abiword-output " >> >> RDEPENDS_${PN} = "poppler-data" > > Do all distribution maintainers agree with this patch? I do not see a > problem since it has been used in tested in ?ngström and > minimal{,-uclibc} for over six months. No idea. It is just that if you do a default build without Angstrom or other distro it will pick the wrong version (unless you set a preferred version). Removing the distro specific workarounds and the default_preference= -1 makes it pick that version. Even Debian stable is ahead of us there as they use poppler 0.12.4... I also hoped this patch would bring up why there are all the workarounds in that file. Thanks a lot! And hopefully I'll do a bit better on the next patch. Philippe
Patch
diff --git a/recipes/poppler/poppler_0.12.3.bb b/recipes/poppler/poppler_0.12.3.bb index 8b9fcca..ce1952e 100644 --- a/recipes/poppler/poppler_0.12.3.bb +++ b/recipes/poppler/poppler_0.12.3.bb @@ -2,11 +2,6 @@ require poppler.inc DEPENDS += "lcms" -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_angstrom = "1" -DEFAULT_PREFERENCE_minimal = "1" -DEFAULT_PREFERENCE_minimal-uclibc = "1" - EXTRA_OECONF_append = " --disable-abiword-output " RDEPENDS_${PN} = "poppler-data"