Date: Mon, 23 Jul 2018 03:04:08 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475141 - in head/sysutils: u-boot-rpi u-boot-rpi/files u-boot-rpi2 u-boot-rpi2/files u-boot-rpi3 u-boot-rpi3/files Message-ID: <201807230304.w6N348et069410@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Jul 23 03:04:07 2018 New Revision: 475141 URL: https://svnweb.freebsd.org/changeset/ports/475141 Log: Revert r475122, r475123 and r475124. To manage upstream, we use the exact patches we've submitted upstream via their patchwork server. This deviates a little from a standard port, but it's what we do with all the other u-boot ports and isn't grossly out of line (many other ports pull patches during the build). We do it this way because the standard way was an unmanageable nightmare and resulted in divergence of u-boot ports. Approved by: uboot@ (maintainer of these ports) Differential Revision: https://reviews.freebsd.org/D16397 Deleted: head/sysutils/u-boot-rpi/files/patch-include_configs_rpi.h head/sysutils/u-boot-rpi2/files/patch-include_configs_rpi.h head/sysutils/u-boot-rpi3/files/patch-include_configs_rpi.h Modified: head/sysutils/u-boot-rpi/Makefile (contents, props changed) head/sysutils/u-boot-rpi2/Makefile (contents, props changed) head/sysutils/u-boot-rpi3/Makefile (contents, props changed) Modified: head/sysutils/u-boot-rpi/Makefile ============================================================================== --- head/sysutils/u-boot-rpi/Makefile Mon Jul 23 02:57:15 2018 (r475140) +++ head/sysutils/u-boot-rpi/Makefile Mon Jul 23 03:04:07 2018 (r475141) @@ -1,5 +1,6 @@ # $FreeBSD$ +MAINTAINER= manu@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= rpi @@ -8,7 +9,10 @@ FAMILY= rpi DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware +PATCHFILES+= 937869/mbox/? \ + 939129/mbox/? + +CONFIG_FRAGMENT= ${.CURDIR}/files/rpi_fragment FRAGMENT_NAME= rpi_fragment -CONFIG_FRAGMENT= ${.CURDIR}/files/${FRAGMENT_NAME} .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-rpi2/Makefile ============================================================================== --- head/sysutils/u-boot-rpi2/Makefile Mon Jul 23 02:57:15 2018 (r475140) +++ head/sysutils/u-boot-rpi2/Makefile Mon Jul 23 03:04:07 2018 (r475141) @@ -1,5 +1,6 @@ # $FreeBSD$ +MAINTAINER= manu@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= rpi2 @@ -8,7 +9,10 @@ FAMILY= rpi DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware -FRAGMENT_NAME= rpi2_fragment -CONFIG_FRAGMENT= ${.CURDIR}/files/${FRAGMENT_NAME} +PATCHFILES+= 937869/mbox/? \ + 939129/mbox/? + +CONFIG_FRAGMENT= ${.CURDIR}/files/rpi2_fragment +FRAGMENT_NAME= rpi2_fragment .include "${MASTERDIR}/Makefile" Modified: head/sysutils/u-boot-rpi3/Makefile ============================================================================== --- head/sysutils/u-boot-rpi3/Makefile Mon Jul 23 02:57:15 2018 (r475140) +++ head/sysutils/u-boot-rpi3/Makefile Mon Jul 23 03:04:07 2018 (r475141) @@ -1,5 +1,6 @@ # $FreeBSD$ +MAINTAINER= uboot@FreeBSD.org MASTERDIR= ${.CURDIR}/../u-boot-master MODEL= rpi3 @@ -9,7 +10,11 @@ UBOOT_ARCH= aarch64 DEPENDS= ${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware -FRAGMENT_NAME= rpi3_fragment -CONFIG_FRAGMENT= ${.CURDIR}/files/${FRAGMENT_NAME} +EXTRA_PATCHES= ${.CURDIR}/files/ +PATCHFILES+= 937869/mbox/? \ + 939129/mbox/? + +CONFIG_FRAGMENT= ${.CURDIR}/files/rpi3_fragment +FRAGMENT_NAME= rpi3_fragment .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807230304.w6N348et069410>