kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix few style violations in u-boot ports:

Browse source 
- 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
This commit is contained in:
Pawel Pekala 2016-07-24 09:48:39 +00:00
parent afe2e12dfa
commit d9ed9ba794
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=418996
10 changed files with 44 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sysutils/u-boot-beaglebone/Makefile
View file

@ -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 <bsd.port.mk>

13
sysutils/u-boot-cubieboard/Makefile
View file

@ -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 <bsd.port.mk>

5
sysutils/u-boot-cubox-hummingboard/Makefile
View file

@ -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 <bsd.port.mk>

9
sysutils/u-boot-duovero/Makefile
View file

@ -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 <bsd.port.mk>

9
sysutils/u-boot-pandaboard/Makefile
View file

@ -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 <bsd.port.mk>

6
sysutils/u-boot-pine64/Makefile
View file

@ -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 <bsd.port.post.mk>

7
sysutils/u-boot-rpi/Makefile
View file

@ -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 <bsd.port.mk>

8
sysutils/u-boot-rpi2/Makefile
View file

@ -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 <bsd.port.mk>

5
sysutils/u-boot-utilite/Makefile
View file

@ -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 <bsd.port.mk>

5
sysutils/u-boot-wandboard/Makefile
View file

@ -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 <bsd.port.mk>