diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-02-18 09:52:06 +0100 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2011-02-18 09:52:06 +0100 |
| commit | e9e66a4f6a692265b8ef0d710642722d3b4270c9 (patch) | |
| tree | 9de8628ed727f32636e41234082c8e88f48a2219 /rules | |
| parent | 9251ffe202e498a7efd91c86c7a17efb98822d79 (diff) | |
| download | ptxdist-e9e66a4f6a692265b8ef0d710642722d3b4270c9.tar.gz ptxdist-e9e66a4f6a692265b8ef0d710642722d3b4270c9.tar.xz | |
glib: version bump 2.26.1 -> 2.28.0
There is a new stable series out there, so this patch bumps to 2.28. As
this is almost identical with the former 2.27.93 beta version, remove
the experimental version for now. The result was build-tested with the
AllYes BSP.
We leave the experimental mechanism in the rules file: there is
currently no experimental series released yet, but this will happen
again in the future.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/dconf.in | 1 | ||||
| -rw-r--r-- | rules/glib.in | 6 | ||||
| -rw-r--r-- | rules/glib.make | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/rules/dconf.in b/rules/dconf.in index 8e60bb95f..2da990783 100644 --- a/rules/dconf.in +++ b/rules/dconf.in @@ -3,7 +3,6 @@ config DCONF tristate select GLIB - select GLIB_EXPERIMENTAL select LIBC_RT select LIBC_RESOLV select DBUS diff --git a/rules/glib.in b/rules/glib.in index 3893d2c96..80a761a22 100644 --- a/rules/glib.in +++ b/rules/glib.in @@ -22,9 +22,9 @@ menuconfig GLIB if GLIB -config GLIB_EXPERIMENTAL - bool - prompt "experimental version" +#config GLIB_EXPERIMENTAL +# bool +# prompt "experimental version" choice diff --git a/rules/glib.make b/rules/glib.make index c4aaae186..38e3b9530 100644 --- a/rules/glib.make +++ b/rules/glib.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_GLIB) += glib # # Paths and names # -ifdef PTXCONF_GLIB_EXPERIMENTAL -GLIB_VERSION := 2.27.93 -else -GLIB_VERSION := 2.26.1 -endif +#ifdef PTXCONF_GLIB_EXPERIMENTAL +#GLIB_VERSION := 2.27.93 +#else +GLIB_VERSION := 2.28.0 +#endif GLIB := glib-$(GLIB_VERSION) GLIB_SUFFIX := tar.bz2 |