mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Quite some conflicts, so here goes ..

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2016-09-02 16:20:33 +02:00
parent cff53ce35b 1bd02bc230
commit 7353967690
192 changed files with 1612 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch
View File

@@ -35,7 +35,7 @@ diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am
@@ -97,6 +97,7 @@
slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@
watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
+watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
top_top_SOURCES = \
top/top.h \

4
package/procps-ng/procps-ng.hash
View File

@@ -1,3 +1,3 @@
# From http://sourceforge.net/projects/procps-ng/files/Production/
md5 6cc5b94c1c5b8cbc89ad345a7b522f74 procps-ng-3.3.11.tar.xz
sha1 1bdca65547df9ed019bd83649b0f8b8eaa017e25 procps-ng-3.3.11.tar.xz
md5 957e42e8b193490b2111252e4a2b443c procps-ng-3.3.12.tar.xz
sha1 82c0745f150f1385ca01fe7d24f05f74e31c94c6 procps-ng-3.3.12.tar.xz

2
package/procps-ng/procps-ng.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
PROCPS_NG_VERSION = 3.3.11
PROCPS_NG_VERSION = 3.3.12
PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
PROCPS_NG_LICENSE = GPLv2+, libproc and libps LGPLv2+