merge conflict, update hash

package/mysql/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.6.19
-PKG_RELEASE:=		2
-PKG_HASH:=		80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f
+PKG_VERSION:=		5.6.22
+PKG_RELEASE:=		1
+PKG_HASH:=		c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6
 PKG_DESCR:=		mysql client library
 PKG_SECTION:=		libs/db
 PKG_DEPENDS:=		libncurses zlib libevent
@@ -34,8 +34,7 @@ CMAKE_FLAGS+=		-DSTACK_DIRECTION=1 \
 			-DCURSES_INCLUDE_PATH="$(STAGING_TARGET_DIR)/usr/include"
 
 host-configure:
-	cd ${WRKBUILD} && PATH='${HOST_PATH}' \
-		cmake .
+	cd ${WRKBUILD} && PATH='${HOST_PATH}' cmake .
 
 host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \

package/mysql/patches/patch-cmake_os_Linux_cmake

@@ -1,7 +1,7 @@
---- mysql-5.6.17.orig/cmake/os/Linux.cmake	2014-03-14 20:07:26.000000000 +0100
-+++ mysql-5.6.17/cmake/os/Linux.cmake	2014-04-04 10:11:45.000000000 +0200
-@@ -23,14 +23,6 @@ SET(TARGET_OS_LINUX 1)
- SET(HAVE_NPTL 1)
+--- mysql-5.6.22.orig/cmake/os/Linux.cmake	2014-11-20 23:39:51.000000000 -0600
++++ mysql-5.6.22/cmake/os/Linux.cmake	2014-12-26 10:30:24.216372609 -0600
+@@ -22,14 +22,6 @@ INCLUDE(CheckSymbolExists)
+ SET(TARGET_OS_LINUX 1)
  SET(_GNU_SOURCE 1)
  
 -# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.

package/mysql/patches/patch-include_my_global_h

@@ -0,0 +1,15 @@
+--- mysql-5.6.22.orig/include/my_global.h	2014-11-20 23:39:51.000000000 -0600
++++ mysql-5.6.22/include/my_global.h	2014-12-26 10:33:04.736371139 -0600
+@@ -769,11 +769,7 @@ inline unsigned long long my_double2ulon
+   #define my_isnan(X) std::isnan(X)
+   #define my_isinf(X) std::isinf(X)
+ #else
+-  #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
+-    #define my_isfinite(X) isfinite(X)
+-  #else
+-    #define my_isfinite(X) finite(X)
+-  #endif
++  #define my_isfinite(X) isfinite(X)
+   #define my_isnan(X) isnan(X)
+   #ifdef HAVE_ISINF
+     /* System-provided isinf() is available and safe to use */

package/xz/Makefile

@@ -1,12 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xz
-PKG_VERSION:=		5.0.5
-PKG_RELEASE:=		2
-PKG_HASH:=		5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a
+PKG_VERSION:=		5.2.0
+PKG_RELEASE:=		1
+PKG_HASH:=		231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba98bf3d6
 PKG_DESCR:=		compression utility
 PKG_SECTION:=		app/archive
 PKG_DEPENDS:=		libxz
@@ -17,28 +17,28 @@ PKG_LIBNAME:=		libxz
 PKG_OPTS:=		dev
 PKG_BB:=		1
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SUBPKGS:=		XZ LIBXZ
 PKGSD_LIBXZ:=		xz compression library
 PKGSC_LIBXZ:=		libs/comp
 
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call HOST_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXZ,libxz,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXZ},${PKGSD_LIBXZ},${PKGSC_LIBXZ},${PKG_OPTS}))
+$(eval $(call HOST_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,LIBXZ,libxz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LIBXZ),$(PKGSD_LIBXZ),$(PKGSC_LIBXZ),$(PKG_OPTS)))
 
 HOST_CONFIGURE_ARGS+=	--disable-shared
 
 xz-install:
-	${INSTALL_DIR} ${IDIR_XZ}/usr/bin
-	${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin
+	$(INSTALL_DIR) $(IDIR_XZ)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/* $(IDIR_XZ)/usr/bin
 
 libxz-install:
-	${INSTALL_DIR} ${IDIR_LIBXZ}/usr/lib
-	${CP} ${WRKINST}/usr/lib/liblzma.so* ${IDIR_LIBXZ}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBXZ)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/liblzma.so* $(IDIR_LIBXZ)/usr/lib
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/xz/patches/patch-build-aux_ltmain_sh

@@ -1,11 +0,0 @@
---- xz-5.0.0.orig/build-aux/ltmain.sh	2010-10-23 16:48:07.000000000 +0200
-+++ xz-5.0.0/build-aux/ltmain.sh	2011-01-17 17:54:37.000000000 +0100
-@@ -5840,7 +5840,7 @@ func_mode_link ()
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"

scripts/create.sh

@@ -238,7 +238,7 @@ print -n "$ostr" | \
 
 print Extracting installation archive...
 mkdir "$T/src"
-gzip -dc "$src" | (cd "$T/src"; tar -xpf -)
+xz -dc "$src" | (cd "$T/src"; tar -xpf -)
 cd "$T/src"
 rnddev=/dev/urandom
 [[ -c /dev/arandom ]] && rnddev=/dev/arandom

target/mips64/lemote-yeelong/patches/3.17.7/sm7xx-fb.patch

@@ -1,29 +1,29 @@
-diff -Nur linux-3.15.6.orig/drivers/staging/Kconfig linux-3.15.6/drivers/staging/Kconfig
---- linux-3.15.6.orig/drivers/staging/Kconfig	2014-07-18 01:23:31.000000000 +0200
-+++ linux-3.15.6/drivers/staging/Kconfig	2014-07-22 17:59:31.842279622 +0200
-@@ -80,6 +80,8 @@
+diff -Nur linux-3.17.7.orig/drivers/staging/Kconfig linux-3.17.7/drivers/staging/Kconfig
+--- linux-3.17.7.orig/drivers/staging/Kconfig	2014-12-16 11:37:26.000000000 -0600
++++ linux-3.17.7/drivers/staging/Kconfig	2014-12-26 11:10:09.700350770 -0600
+@@ -64,6 +64,8 @@
  
- source "drivers/staging/wlags49_h25/Kconfig"
+ source "drivers/staging/iio/Kconfig"
  
 +source "drivers/staging/sm7xxfb/Kconfig"
 +
- source "drivers/staging/crystalhd/Kconfig"
+ source "drivers/staging/xgifb/Kconfig"
  
- source "drivers/staging/cxt1e1/Kconfig"
-diff -Nur linux-3.15.6.orig/drivers/staging/Makefile linux-3.15.6/drivers/staging/Makefile
---- linux-3.15.6.orig/drivers/staging/Makefile	2014-07-18 01:23:31.000000000 +0200
-+++ linux-3.15.6/drivers/staging/Makefile	2014-07-22 17:59:31.842279622 +0200
-@@ -34,6 +34,7 @@
+ source "drivers/staging/emxx_udc/Kconfig"
+diff -Nur linux-3.17.7.orig/drivers/staging/Makefile linux-3.17.7/drivers/staging/Makefile
+--- linux-3.17.7.orig/drivers/staging/Makefile	2014-12-16 11:37:26.000000000 -0600
++++ linux-3.17.7/drivers/staging/Makefile	2014-12-26 11:09:30.844351126 -0600
+@@ -27,6 +27,7 @@
+ obj-$(CONFIG_VME_BUS)		+= vme/
  obj-$(CONFIG_IIO)		+= iio/
- obj-$(CONFIG_WLAGS49_H2)	+= wlags49_h2/
- obj-$(CONFIG_WLAGS49_H25)	+= wlags49_h25/
-+obj-$(CONFIG_FB_SM7XX)		+= sm7xxfb/
- obj-$(CONFIG_CRYSTALHD)		+= crystalhd/
- obj-$(CONFIG_CXT1E1)		+= cxt1e1/
  obj-$(CONFIG_FB_XGI)		+= xgifb/
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/Kconfig linux-3.15.6/drivers/staging/sm7xxfb/Kconfig
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/Kconfig	2014-07-22 17:59:31.846279635 +0200
++obj-$(CONFIG_FB_SM7XX)		+= sm7xxfb/
+ obj-$(CONFIG_USB_EMXX)		+= emxx_udc/
+ obj-$(CONFIG_BCM_WIMAX)		+= bcm/
+ obj-$(CONFIG_FT1000)		+= ft1000/
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/Kconfig linux-3.17.7/drivers/staging/sm7xxfb/Kconfig
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/Kconfig	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/Kconfig	2014-12-26 11:08:55.868351446 -0600
 @@ -0,0 +1,13 @@
 +config FB_SM7XX
 +	tristate "Silicon Motion SM7XX framebuffer support"
@@ -38,14 +38,14 @@ diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/Kconfig linux-3.15.6/drivers
 +	  This driver is also available as a module. The module will be
 +	  called sm7xxfb. If you want to compile it as a module, say M
 +	  here and read <file:Documentation/kbuild/modules.txt>.
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/Makefile linux-3.15.6/drivers/staging/sm7xxfb/Makefile
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/Makefile	2014-07-22 17:59:31.846279635 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/Makefile linux-3.17.7/drivers/staging/sm7xxfb/Makefile
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/Makefile	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/Makefile	2014-12-26 11:08:55.868351446 -0600
 @@ -0,0 +1 @@
 +obj-$(CONFIG_FB_SM7XX) += sm7xxfb.o
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xxfb.c linux-3.15.6/drivers/staging/sm7xxfb/sm7xxfb.c
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xxfb.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/sm7xxfb.c	2014-07-22 17:59:31.930279894 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xxfb.c linux-3.17.7/drivers/staging/sm7xxfb/sm7xxfb.c
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xxfb.c	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/sm7xxfb.c	2014-12-26 11:08:55.872351446 -0600
 @@ -0,0 +1,1026 @@
 +/*
 + * Silicon Motion SM7XX frame buffer device
@@ -1073,9 +1073,9 @@ diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xxfb.c linux-3.15.6/drive
 +MODULE_AUTHOR("Siliconmotion ");
 +MODULE_DESCRIPTION("Framebuffer driver for SMI Graphic Cards");
 +MODULE_LICENSE("GPL");
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xx.h linux-3.15.6/drivers/staging/sm7xxfb/sm7xx.h
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xx.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/sm7xx.h	2014-07-22 17:59:31.846279635 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xx.h linux-3.17.7/drivers/staging/sm7xxfb/sm7xx.h
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/sm7xx.h	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/sm7xx.h	2014-12-26 11:08:55.872351446 -0600
 @@ -0,0 +1,779 @@
 +/*
 + * Silicon Motion SM712 frame buffer device
@@ -1856,9 +1856,9 @@ diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/sm7xx.h linux-3.15.6/drivers
 +};
 +
 +#define numVGAModes		ARRAY_SIZE(VGAMode)
-diff -Nur linux-3.15.6.orig/drivers/staging/sm7xxfb/TODO linux-3.15.6/drivers/staging/sm7xxfb/TODO
---- linux-3.15.6.orig/drivers/staging/sm7xxfb/TODO	1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.15.6/drivers/staging/sm7xxfb/TODO	2014-07-22 17:59:31.846279635 +0200
+diff -Nur linux-3.17.7.orig/drivers/staging/sm7xxfb/TODO linux-3.17.7/drivers/staging/sm7xxfb/TODO
+--- linux-3.17.7.orig/drivers/staging/sm7xxfb/TODO	1969-12-31 18:00:00.000000000 -0600
++++ linux-3.17.7/drivers/staging/sm7xxfb/TODO	2014-12-26 11:08:55.876351446 -0600
 @@ -0,0 +1,9 @@
 +TODO:
 +- Dual head support