From c4ab8818086988cfeaf81992e9f5f1cadcd5ac0f Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Tue, 14 Jun 2016 22:26:21 +0200
Subject: glib: version bump 2.48.0 -> 2.48.1

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 rules/glib.in   |  4 ----
 rules/glib.make | 10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'rules')

diff --git a/rules/glib.in b/rules/glib.in
index a6571681c..ddc4625cd 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -22,10 +22,6 @@ menuconfig GLIB
 
 if GLIB
 
-#config GLIB_EXPERIMENTAL
-#	bool
-#	prompt "experimental version"
-
 config GLIB_GDBUS
 	bool
 	prompt "gdbus"
diff --git a/rules/glib.make b/rules/glib.make
index 2e1ecd715..4f65714e4 100644
--- a/rules/glib.make
+++ b/rules/glib.make
@@ -17,14 +17,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
 #
 # Paths and names
 #
-#ifdef PTXCONF_GLIB_EXPERIMENTAL
-#GLIB_VERSION	:= 2.27.93
-#GLIB_MD5	:=
-#else
-GLIB_VERSION	:= 2.48.0
-GLIB_MD5	:= 093a586f37d2853bdb129231e1b350e0
-#endif
-
+GLIB_VERSION	:= 2.48.1
+GLIB_MD5	:= 67bd3b75c9f6d5587b457dc01cdcd5bb
 GLIB		:= glib-$(GLIB_VERSION)
 GLIB_SUFFIX	:= tar.xz
 GLIB_SOURCE	:= $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX)
-- 
cgit v1.2.3