Skip to content

Commit

Permalink
psmisc: bump to version 23.2
Browse files Browse the repository at this point in the history
Drop patch #1; applied upstream.

Drop patch #2; not needed since we don't autoreconf, and the issue is
fixed upstream anyway.

Add license hash.

Signed-off-by: Baruch Siach <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
  • Loading branch information
baruchsiach authored and jacmet committed Oct 20, 2018
1 parent cfa3447 commit d6f2fb1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 246 deletions.
37 changes: 0 additions & 37 deletions package/psmisc/0001-link-against-libintl.patch

This file was deleted.

198 changes: 0 additions & 198 deletions package/psmisc/0002-add-git-version-get.patch

This file was deleted.

7 changes: 4 additions & 3 deletions package/psmisc/psmisc.hash
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# From https://sourceforge.net/projects/psmisc/files/psmisc/
md5 bbba1f701c02fb50d59540d1ff90d8d1 psmisc-23.1.tar.xz
sha1 d19031a5ba18a530aa0bb768cb74593f9af74b08 psmisc-23.1.tar.xz
md5 0524258861f00be1a02d27d39d8e5e62 psmisc-23.2.tar.xz
sha1 2bf3ec1c87ab3bc0610c819452c21cf4b849b0b8 psmisc-23.2.tar.xz
# Locally computed:
sha256 2e84d474cf75dfbe3ecdacfb797bbfab71a35c7c2639d1b9f6d5f18b2149ba30 psmisc-23.1.tar.xz
sha256 4b7cbffdc9373474da49b85dc3457ae511c43dc7fa7d94513fe06f89dcb87880 psmisc-23.2.tar.xz
sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING
9 changes: 1 addition & 8 deletions package/psmisc/psmisc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
#
################################################################################

PSMISC_VERSION = 23.1
PSMISC_VERSION = 23.2
PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
PSMISC_SOURCE = psmisc-$(PSMISC_VERSION).tar.xz
PSMISC_LICENSE = GPL-2.0+
PSMISC_LICENSE_FILES = COPYING
PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
# Patching Makefile.am
PSMISC_AUTORECONF = YES

define PSMISC_GIT_VERSION_EXEC
chmod +x $(@D)/misc/git-version-gen
endef
PSMISC_POST_PATCH_HOOKS += PSMISC_GIT_VERSION_EXEC

ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
# Don't force -fstack-protector when SSP is not available in toolchain
Expand Down

0 comments on commit d6f2fb1

Please sign in to comment.