From fca20e2b2fdf4a83db8e2c7904225422b11f0d2e Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 2 Aug 2019 16:53:09 -0700 Subject: [PATCH 1/2] findutils: Fixed up LICENSE information. Also cleaned some whitespace. Signed-off-by: Rosen Penev --- utils/findutils/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/findutils/Makefile b/utils/findutils/Makefile index 2463fc6ee..9293f453b 100644 --- a/utils/findutils/Makefile +++ b/utils/findutils/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2006-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -10,12 +10,13 @@ PKG_NAME:=findutils PKG_VERSION:=4.6.0 PKG_RELEASE:=3 -PKG_LICENSE:=GPL-3.0+ - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_HASH:=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d + PKG_MAINTAINER:=Daniel Dickinson +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=COPYING PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 From 8ca5cf042d6e08f1e7b9f86cb8338d2982a9d296 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 4 Aug 2019 14:47:06 -0700 Subject: [PATCH 2/2] findutils: Add missing header New version of musl no longer internally includes this header. Signed-off-by: Rosen Penev --- utils/findutils/Makefile | 2 +- utils/findutils/patches/010-sysmacros.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 utils/findutils/patches/010-sysmacros.patch diff --git a/utils/findutils/Makefile b/utils/findutils/Makefile index 9293f453b..74861029d 100644 --- a/utils/findutils/Makefile +++ b/utils/findutils/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=findutils PKG_VERSION:=4.6.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/$(PKG_NAME) diff --git a/utils/findutils/patches/010-sysmacros.patch b/utils/findutils/patches/010-sysmacros.patch new file mode 100644 index 000000000..dc3678d0a --- /dev/null +++ b/utils/findutils/patches/010-sysmacros.patch @@ -0,0 +1,11 @@ +--- a/gl/lib/mountlist.c ++++ b/gl/lib/mountlist.c +@@ -33,6 +33,8 @@ + + #include + ++#include ++ + #if HAVE_SYS_PARAM_H + # include + #endif