From owner-svn-ports-head@freebsd.org Tue May 30 07:34:08 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2C4E9AFEC32; Tue, 30 May 2017 07:34:08 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EE60F7BD07; Tue, 30 May 2017 07:34:07 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4U7Y7C9069858; Tue, 30 May 2017 07:34:07 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4U7Y7BC069857; Tue, 30 May 2017 07:34:07 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <201705300734.v4U7Y7BC069857@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Tue, 30 May 2017 07:34:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442051 - in head/sysutils/amazon-ssm-agent: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2017 07:34:08 -0000 Author: cperciva Date: Tue May 30 07:34:06 2017 New Revision: 442051 URL: https://svnweb.freebsd.org/changeset/ports/442051 Log: Build amazon-ssm-agent directly from the port Makefile rather than recursing into the makefile distributed with the source code. In particular, this should fix the build on i386, where it is currently broken due to amd64 being hard-coded as the build architecture. Numerous other cleanups to the build. [1] Change LICENSE and remove subsidiary variables, as Amazon has relicensed this from the "Amazon" license to Apache 2.0. Submitted by: swills [1] Deleted: head/sysutils/amazon-ssm-agent/files/patch-makefile Modified: head/sysutils/amazon-ssm-agent/Makefile Modified: head/sysutils/amazon-ssm-agent/Makefile ============================================================================== --- head/sysutils/amazon-ssm-agent/Makefile Tue May 30 02:56:43 2017 (r442050) +++ head/sysutils/amazon-ssm-agent/Makefile Tue May 30 07:34:06 2017 (r442051) @@ -2,38 +2,38 @@ PORTNAME= amazon-ssm-agent PORTVERSION= 2.0.790.0 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= cperciva@FreeBSD.org COMMENT= Amazon Simple Systems Manager Agent -LICENSE= Amazon -LICENSE_NAME= Amazon Software License +LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= bash:shells/bash \ - go:lang/go +BUILD_DEPENDS= go:lang/go RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USE_GITHUB= yes GH_ACCOUNT= aws +GH_SUBDIR= src/github.com/aws/amazon-ssm-agent -WRKSRC= ${WRKDIR}/src/github.com/aws/amazon-ssm-agent -USES= gmake -MAKEFILE= makefile -ALL_TARGET= build-freebsd -INSTALL_TARGET= install-freebsd -MAKE_ARGS= SKIP_CHECKSTYLE="YES" DESTDIR=${STAGEDIR}${PREFIX} - PLIST_FILES= etc/amazon/ssm/amazon-ssm-agent.json.template \ etc/amazon/ssm/seelog_unix.xml.template \ sbin/amazon-ssm-agent USE_RC_SUBR= amazon-ssm-agent -post-extract: - ${MKDIR} ${WRKDIR}/src/github.com/aws - ${MV} ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/v//} ${WRKSRC} +do-build: + @cd ${WRKSRC}; \ + ${SETENV} GOPATH=${WRKSRC}:${WRKSRC}/vendor CGO_ENABLED=0 \ + go build -ldflags "-s -w" -o amazon-ssm-agent \ + agent/agent.go agent/agent_unix.go agent/agent_parser.go + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/amazon-ssm-agent ${STAGEDIR}${PREFIX}/sbin + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/amazon/ssm + ${INSTALL_DATA} ${WRKSRC}/amazon-ssm-agent.json.template ${STAGEDIR}${PREFIX}/etc/amazon/ssm + ${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${PREFIX}/etc/amazon/ssm/seelog_unix.xml.template .include