From owner-svn-ports-all@freebsd.org Sun Jul 24 09:48:41 2016 Return-Path: Delivered-To: svn-ports-all@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 A440FB9B427; Sun, 24 Jul 2016 09:48:41 +0000 (UTC) (envelope-from pawel@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 7795417B3; Sun, 24 Jul 2016 09:48:41 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6O9meUY005151; Sun, 24 Jul 2016 09:48:40 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6O9mdZd005141; Sun, 24 Jul 2016 09:48:39 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201607240948.u6O9mdZd005141@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Sun, 24 Jul 2016 09:48:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418996 - in head/sysutils: u-boot-beaglebone u-boot-cubieboard u-boot-cubox-hummingboard u-boot-duovero u-boot-pandaboard u-boot-pine64 u-boot-rpi u-boot-rpi2 u-boot-utilite u-boot-wan... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jul 2016 09:48:41 -0000 Author: pawel Date: Sun Jul 24 09:48:39 2016 New Revision: 418996 URL: https://svnweb.freebsd.org/changeset/ports/418996 Log: Fix few style violations in u-boot ports: - GMAKE -> MAKE_CMD, MAKE_CMD is always set to required make implementation - CP -> INSTALL_DATA, INSTALL_DATA makes sure files are always installed with proper permissions - sysutils/u-boot-rpi: include missed files installed in STAGEDIR in PLIST_FILES PR: 210982 Submitted by: myself Approved by: maintainers timeout Modified: head/sysutils/u-boot-beaglebone/Makefile head/sysutils/u-boot-cubieboard/Makefile head/sysutils/u-boot-cubox-hummingboard/Makefile head/sysutils/u-boot-duovero/Makefile head/sysutils/u-boot-pandaboard/Makefile head/sysutils/u-boot-pine64/Makefile head/sysutils/u-boot-rpi/Makefile head/sysutils/u-boot-rpi2/Makefile head/sysutils/u-boot-utilite/Makefile head/sysutils/u-boot-wandboard/Makefile Modified: head/sysutils/u-boot-beaglebone/Makefile ============================================================================== --- head/sysutils/u-boot-beaglebone/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-beaglebone/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -32,12 +32,13 @@ MAKE_ARGS+= ARCH=arm \ CROSS_COMPILE=arm-none-eabi- do-configure: - (cd ${WRKSRC}; ${GMAKE} am335x_boneblack_defconfig) + (cd ${WRKSRC}; ${MAKE_CMD} am335x_boneblack_defconfig) do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/MLO ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/u-boot.img - ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${WRKSRC}/MLO ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${.CURDIR}/pkg-descr \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include Modified: head/sysutils/u-boot-cubieboard/Makefile ============================================================================== --- head/sysutils/u-boot-cubieboard/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-cubieboard/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -36,13 +36,16 @@ post-patch: ${WRKSRC}/include/configs/sunxi-common.h do-configure: - (cd ${WRKSRC}; ${GMAKE} ${CONF_TARGET}) + (cd ${WRKSRC}; ${MAKE_CMD} ${CONF_TARGET}) do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/spl/sunxi-spl.bin ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/u-boot-sunxi-with-spl.bin ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${WRKSRC}/spl/sunxi-spl.bin \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${WRKSRC}/u-boot-sunxi-with-spl.bin \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${.CURDIR}/pkg-descr \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include Modified: head/sysutils/u-boot-cubox-hummingboard/Makefile ============================================================================== --- head/sysutils/u-boot-cubox-hummingboard/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-cubox-hummingboard/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -36,7 +36,7 @@ MAKE_ARGS+= ARCH=arm \ HOSTCC=cc do-configure: - cd ${WRKSRC}; ${GMAKE} ${MAKE_ARGS} mx6_cubox-i_config + cd ${WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} mx6_cubox-i_config # The build results in two output files: SPL, and u-boot.img. # Combine them into a single u-boot.imx so that there is only one file to be @@ -46,6 +46,7 @@ do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} dd bs=1k oseek=0 conv=sync of=${IMXFILE} if=${WRKSRC}/SPL dd bs=1k oseek=41 conv=sync of=${IMXFILE} if=${WRKSRC}/u-boot.img - ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${.CURDIR}/pkg-descr \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include Modified: head/sysutils/u-boot-duovero/Makefile ============================================================================== --- head/sysutils/u-boot-duovero/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-duovero/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -31,12 +31,13 @@ MAKE_ARGS+= ARCH=arm \ CROSS_COMPILE=arm-none-eabi- do-configure: - (cd ${WRKSRC}; ${GMAKE} duovero_config) + (cd ${WRKSRC}; ${MAKE_CMD} duovero_config) do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/MLO ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/u-boot.img - ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${WRKSRC}/MLO ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${.CURDIR}/pkg-descr \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include Modified: head/sysutils/u-boot-pandaboard/Makefile ============================================================================== --- head/sysutils/u-boot-pandaboard/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-pandaboard/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -31,12 +31,13 @@ MAKE_ARGS+= ARCH=arm \ CROSS_COMPILE=arm-none-eabi- do-configure: - (cd ${WRKSRC}; ${GMAKE} omap4_panda_config) + (cd ${WRKSRC}; ${MAKE_CMD} omap4_panda_config) do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/MLO ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/u-boot.img - ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${WRKSRC}/MLO ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${WRKSRC}/u-boot.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${.CURDIR}/pkg-descr \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include Modified: head/sysutils/u-boot-pine64/Makefile ============================================================================== --- head/sysutils/u-boot-pine64/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-pine64/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -42,7 +42,7 @@ post-extract: (cd ${WRKSRC}; ${EXTRACT_CMD} xvf pine64atf.tar.xz) do-configure: - (cd ${WRKSRC}; ${GMAKE} pine64_plus_defconfig) + (cd ${WRKSRC}; ${MAKE_CMD} pine64_plus_defconfig) post-build: (cd ${WRKSRC}/arm-trusted-firmware; ${GMAKE} ${MAKE_ARGS} DEBUG=1) @@ -53,7 +53,7 @@ post-build: do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/pine64.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/ - ${CP} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${WRKSRC}/pine64.img ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include Modified: head/sysutils/u-boot-rpi/Makefile ============================================================================== --- head/sysutils/u-boot-rpi/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-rpi/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -2,6 +2,7 @@ PORTNAME= u-boot PORTVERSION= 2016.01 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ \ LOCAL/ian/:bootfiles @@ -31,6 +32,8 @@ PLIST_FILES= ${U_BOOT_DIR}/u-boot.img \ ${U_BOOT_DIR}/config.txt \ ${U_BOOT_DIR}/fixup.dat \ ${U_BOOT_DIR}/fixup_cd.dat \ + ${U_BOOT_DIR}/fixup_db.dat \ + ${U_BOOT_DIR}/fixup_x.dat \ ${U_BOOT_DIR}/start.elf \ ${U_BOOT_DIR}/start_cd.elf @@ -38,7 +41,7 @@ MAKE_ARGS+= ARCH=arm \ CROSS_COMPILE=arm-none-eabi- do-configure: - (cd ${WRKSRC}; ${GMAKE} rpi_defconfig) + (cd ${WRKSRC}; ${MAKE_CMD} rpi_defconfig) # The output of the u-boot build process is u-boot.bin. We have to put a # standard (for the RPi) image header on the front of it, and the resulting @@ -49,6 +52,6 @@ do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} ${GZCAT} ${FILESDIR}/imgprefix.bin.gz >${IMGFILE} ${CAT} ${WRKSRC}/u-boot.bin >>${IMGFILE} - ${CP} ${WRK_BOOTFILES}/* ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/ + ${INSTALL_DATA} ${WRK_BOOTFILES}/* ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} .include Modified: head/sysutils/u-boot-rpi2/Makefile ============================================================================== --- head/sysutils/u-boot-rpi2/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-rpi2/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -41,7 +41,7 @@ MAKE_ARGS+= ARCH=arm \ CROSS_COMPILE=arm-none-eabi- do-configure: - (cd ${WRKSRC}; ${GMAKE} rpi_2_defconfig) + (cd ${WRKSRC}; ${MAKE_CMD} rpi_2_defconfig) # The output of the u-boot build process is u-boot.bin. Older firmware # versions require a standard header, but the recent versions (our case) @@ -51,8 +51,8 @@ do-configure: IMGFILE=${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/u-boot.img do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} - ${CP} ${WRKSRC}/u-boot.bin ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/ - ${CP} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README - ${CP} ${WRK_BOOTFILES}/* ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/ + ${INSTALL_DATA} ${WRKSRC}/u-boot.bin ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} + ${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${WRK_BOOTFILES}/* ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} .include Modified: head/sysutils/u-boot-utilite/Makefile ============================================================================== --- head/sysutils/u-boot-utilite/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-utilite/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -35,7 +35,7 @@ MAKE_ARGS+= ARCH=arm \ HOSTCC=cc do-configure: - cd ${WRKSRC}; ${GMAKE} ${MAKE_ARGS} cm_fx6_config + cd ${WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} cm_fx6_config # The build results in two output files: SPL, and u-boot.img. # Combine them into a single u-boot.imx so that there is only one file to be @@ -46,6 +46,7 @@ do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} dd if=/dev/zero count=500 bs=1K | ${TR} '\000' '\377' > ${CM_FX6_FIRMWARE} dd if=${WRKSRC}/spl.img of=${CM_FX6_FIRMWARE} bs=1K seek=1 conv=notrunc && dd if=${WRKSRC}/u-boot.img of=${CM_FX6_FIRMWARE} bs=1K seek=64 conv=notrunc - ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${.CURDIR}/pkg-descr \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include Modified: head/sysutils/u-boot-wandboard/Makefile ============================================================================== --- head/sysutils/u-boot-wandboard/Makefile Sun Jul 24 09:38:56 2016 (r418995) +++ head/sysutils/u-boot-wandboard/Makefile Sun Jul 24 09:48:39 2016 (r418996) @@ -34,7 +34,7 @@ MAKE_ARGS+= ARCH=arm \ HOSTCC=cc do-configure: - cd ${WRKSRC}; ${GMAKE} ${MAKE_ARGS} edm_cf_imx6_config + cd ${WRKSRC}; ${MAKE_CMD} ${MAKE_ARGS} edm_cf_imx6_config # The build results in two output files: SPL, and u-boot.img. # Combine them into a single u-boot.imx so that there is only one file to be @@ -44,6 +44,7 @@ do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR} dd bs=1k oseek=0 conv=sync of=${IMXFILE} if=${WRKSRC}/SPL dd bs=1k oseek=68 conv=sync of=${IMXFILE} if=${WRKSRC}/u-boot.img - ${CP} ${.CURDIR}/pkg-descr ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README + ${INSTALL_DATA} ${.CURDIR}/pkg-descr \ + ${STAGEDIR}/${PREFIX}/${U_BOOT_DIR}/README .include