diff options
84 files changed, 173 insertions, 7322 deletions
@@ -1,11 +1,9 @@ -- qemu-sh serial -- choice qemu with graphic - more output for initscripts on bootup (fancy OK/FAIL with color?) -- finish miniconfig + cleanup - try Preset Loops per Jiffy for faster bootup via lpj= - port uuterm - move tools to package host infrastructure, resolve dependency handling for host tools +- port uuterm - hash-style=gnu for non-mips and non-musl - add fb full screen logo - port opkg with gpg signing diff --git a/mk/build.mk b/mk/build.mk index c4371f477..0da34de85 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -215,16 +215,11 @@ switch: fi \ fi -ifeq (${ADK_TARGET_KERNEL64},y) -KERNEL_CFG:=kernel64.config -else -KERNEL_CFG:=kernel.config -endif - kernelconfig: - cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG} $(BUILD_DIR)/linux/.config - ${KERNEL_MAKE_ENV} ${MAKE} ARCH=$(ARCH) ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig - cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG} + ${KERNEL_MAKE_ENV} ${MAKE} \ + ARCH=$(ARCH) \ + ${KERNEL_MAKE_OPTS} \ + -C $(BUILD_DIR)/linux menuconfig # create a new package from package/.template newpackage: diff --git a/mk/mirrors.mk b/mk/mirrors.mk index 4de2fdded..ab7349288 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -15,12 +15,19 @@ MASTER_SITE_KERNEL?= \ http://www.kernel.org/pub/linux/ \ MASTER_SITE_XORG?= \ - http://www.x.org/releases/X11R7.7/src/everything/ \ - http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \ - http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \ + http://www.x.org/releases/individual/xserver/ \ + http://www.x.org/releases/individual/proto/ \ + http://www.x.org/releases/individual/app/ \ + http://www.x.org/releases/individual/xcb/ \ + http://www.x.org/releases/individual/lib/ \ + http://www.x.org/releases/individual/driver/ \ + http://www.x.org/releases/individual/util/ \ http://xorg.freedesktop.org/releases/individual/app/ \ http://xorg.freedesktop.org/releases/individual/lib/ \ http://xorg.freedesktop.org/releases/individual/driver/ \ + http://www.x.org/releases/X11R7.7/src/everything/ \ + http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \ + http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \ MASTER_SITE_GNU?= \ http://ftp.gnu.org/gnu/ \ diff --git a/mk/modules.mk b/mk/modules.mk index 5fd2f6419..a9f61e659 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1175,9 +1175,15 @@ $(eval $(call KMOD_template,SND,snd,\ $(MODULES_DIR)/kernel/sound/core/snd \ $(MODULES_DIR)/kernel/sound/core/snd-timer \ $(MODULES_DIR)/kernel/sound/core/snd-pcm \ +,40)) + +$(eval $(call KMOD_template,SND_PCM_DMAENGINE,snd-pcm-dmaengine,\ $(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \ +,41)) + +$(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\ $(MODULES_DIR)/kernel/sound/core/snd-compress \ -,40)) +,41)) $(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\ $(MODULES_DIR)/kernel/sound/core/snd-hwdep \ diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index c6e1811a5..17abe52ef 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -4,17 +4,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib -PKG_VERSION:= 9.2.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= df801a975045150790e10e2ccf32193f +PKG_VERSION:= 10.1.0 +PKG_SUBVER:= 10.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 08e796ec7122aa299d32d4f67a254315 PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat PKG_DEPENDS+= libxml2 libxml2-python -PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes libXxf86vm libdrm -PKG_BUILDDEP+= dri2proto glproto expat libXext +PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes +PKG_BUILDDEP+= libXxf86vm libdrm dri2proto glproto expat libXext +PKG_BUILDDEP+= eudev dri3proto presentproto xcb-proto libxcb +PKG_BUILDDEP+= libxshmfence PKG_URL:= http://www.mesa3d.org/ -PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/ +PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_SUBVER}/ PKG_NEED_CXX:= 1 PKG_LIBNAME:= mesalib PKG_OPTS:= dev @@ -58,6 +61,8 @@ mesalib-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESALIB)/usr/lib + $(CP) $(WRKINST)/usr/lib/libglapi.so* \ + $(IDIR_MESALIB)/usr/lib ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ ${IDIR_MESALIB}/usr/lib/dri/ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) diff --git a/package/dri2proto/Makefile b/package/dri2proto/Makefile index 402144bfd..f42ef212e 100644 --- a/package/dri2proto/Makefile +++ b/package/dri2proto/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dri2proto -PKG_VERSION:= 2.6 +PKG_VERSION:= 2.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 873142af5db695537cfe05e01d13541f -PKG_DESCR:= DRI protocol headers +PKG_MD5SUM:= 19ea18f63d8ae8053c9fa84b60365b77 +PKG_DESCR:= DRI2 protocol headers PKG_SECTION:= devel PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly diff --git a/package/glproto/Makefile b/package/glproto/Makefile index 6c3e5e715..437d208e6 100644 --- a/package/glproto/Makefile +++ b/package/glproto/Makefile @@ -4,11 +4,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= glproto -PKG_VERSION:= 1.4.15 +PKG_VERSION:= 1.4.17 PKG_RELEASE:= 1 PKG_DESCR:= OpenGL headers PKG_SECTION:= devel -PKG_MD5SUM:= be7c4e3c289db480b9e1238c03637eb7 +PKG_MD5SUM:= d69554c1b51a83f2c6976a640819911b PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile index 53180cfbe..6f873ba0b 100644 --- a/package/inputproto/Makefile +++ b/package/inputproto/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= inputproto -PKG_VERSION:= 2.2 +PKG_VERSION:= 2.3 PKG_RELEASE:= 1 PKG_DESCR:= X Input Extension headers PKG_SECTION:= devel PKG_BUILDDEP:= inputproto-host -PKG_MD5SUM:= e0047823230413e67d74e92af77fbe58 +PKG_MD5SUM:= 5ea366d32a9a78d6204a47ea35d9dc5c PKG_SITES:= ${MASTER_SITE_XORG} PKG_OPTS:= dev devonly diff --git a/package/libssh/Makefile b/package/libssh/Makefile index 6a49c346a..2543a7863 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -4,17 +4,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libssh -PKG_VERSION:= 0.5.3 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 9ad01838d3b89d98e900e0f6260a88cc +PKG_VERSION:= 0.6.3 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 66cf16e77f60913b4d54f18c92cdbf71 PKG_DESCR:= SSH library PKG_SECTION:= libs PKG_DEPENDS:= libopenssl zlib PKG_BUILDDEP:= cmake-host openssl zlib PKG_URL:= http://www.libssh.org/ -PKG_SITES:= http://www.libssh.org/files/0.5/ +PKG_SITES:= https://red.libssh.org/attachments/download/87/ PKG_OPTS:= dev +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake index a67998250..b8e077b94 100644 --- a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake +++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake @@ -1,6 +1,6 @@ ---- libssh-0.5.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/cmake/Modules/DefineCompilerFlags.cmake 2013-12-17 13:20:04.073723090 +0100 -@@ -20,11 +20,6 @@ if (UNIX AND NOT WIN32) +--- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2014-02-06 10:20:57.000000000 +0100 ++++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake 2014-03-14 09:10:56.621673326 +0100 +@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") endif (WITH_FPIC) @@ -9,6 +9,6 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") - endif (WITH_STACK_PROTECTOR) - - check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) - if (WITH_FORTIFY_SOURCE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") + if (CMAKE_BUILD_TYPE) + string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel)) diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake index 9a140e652..e7fcdfd2d 100644 --- a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake +++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake @@ -1,5 +1,5 @@ ---- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake 2014-01-11 12:11:52.000000000 +0100 +--- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake 2013-12-21 18:37:12.000000000 +0100 ++++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake 2014-03-14 09:07:03.296701809 +0100 @@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI NAMES zlib.h @@ -13,9 +13,9 @@ ) mark_as_advanced(ZLIB_INCLUDE_DIR) -@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI - zlib +@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI zlib1 + zlibd PATHS + ${ZLIB_ROOT_DIR}/lib /usr/local/lib diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h index 8811f79fb..dc60939bf 100644 --- a/package/libssh/patches/patch-include_libssh_libssh_h +++ b/package/libssh/patches/patch-include_libssh_libssh_h @@ -1,6 +1,6 @@ ---- libssh-0.5.3.orig/include/libssh/libssh.h 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/include/libssh/libssh.h 2014-01-11 12:04:00.000000000 +0100 -@@ -57,6 +57,7 @@ +--- libssh-0.6.3.orig/include/libssh/libssh.h 2014-03-04 13:20:48.000000000 +0100 ++++ libssh-0.6.3/include/libssh/libssh.h 2014-03-14 09:07:03.304701842 +0100 +@@ -56,6 +56,7 @@ typedef unsigned long long uint64_t; typedef int mode_t; #else /* _MSC_VER */ diff --git a/package/libxcb/Makefile b/package/libxcb/Makefile index 713a6c3a3..c126b66ac 100644 --- a/package/libxcb/Makefile +++ b/package/libxcb/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libxcb -PKG_VERSION:= 1.9.1 +PKG_VERSION:= 1.10 PKG_RELEASE:= 1 -PKG_MD5SUM:= 324c76024a73dba8a902638696ba87de +PKG_MD5SUM:= a484793fbfb974b09d54fa1ebf44b2e4 PKG_DESCR:= X11 keyboard library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libXau-host libpthread-stubs-host xcb-proto-host diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 2453064f5..779ebfbdd 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ncurses PKG_VERSION:= 5.9 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 8cb9c412e5f2d96bc6f459aa8c6282a1 PKG_DESCR:= a terminal handling library PKG_SECTION:= libs @@ -81,18 +81,13 @@ libncurses-install: ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/lib ${CP} ${WRKINST}/usr/lib/lib{tinfo,form,menu,ncurses,panel}.so* \ ${IDIR_LIBNCURSES}/usr/lib - for ti in rxvt rxvt-unicode; do \ - TERMINFO=${WRKINST}/usr/share/terminfo \ - PATH=$(HOST_PATH) \ - tic$(EXEEXT) -x ./files/$$ti.ti; \ - done ifeq (${ADK_PACKAGE_LIBNCURSES_FULL_TERMINFO},y) ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share ${CP} ${WRKINST}/usr/share/terminfo ${IDIR_LIBNCURSES}/usr/share/ else ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/ for f in ansi dumb linux screen vt100 vt102 \ - rxvt rxvt-unicode vt220 xterm xterm-color xterm-xfree86; do \ + vt220 xterm xterm-color xterm-xfree86; do \ ${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \ ${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \ ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \ diff --git a/package/parted/Makefile b/package/parted/Makefile index 8223abe7b..97ea55df3 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -5,11 +5,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:= parted PKG_VERSION:= 3.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 5d89d64d94bcfefa9ce8f59f4b81bdcb PKG_DESCR:= partition table editor PKG_SECTION:= fs -PKG_DEPENDS:= libuuid libreadline libpthread libgcc +PKG_DEPENDS:= libblkid libuuid libreadline libpthread libgcc PKG_BUILDDEP:= util-linux readline PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile index 407f27fbf..fbd6341e5 100644 --- a/package/randrproto/Makefile +++ b/package/randrproto/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= randrproto -PKG_VERSION:= 1.3.2 +PKG_VERSION:= 1.4.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= b8fd2f75cf156c9f6e6771addd07ef59 +PKG_MD5SUM:= af44f250b89783eb4967f1dc5b32ef68 PKG_DESCR:= Xrandr protcol headers PKG_SECTION:= devel PKG_SITES:= ${MASTER_SITE_XORG} diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile index 9e5d2b3b1..e4d2bfe97 100644 --- a/pack |