From owner-svn-ports-all@freebsd.org Mon Jul 23 03:04:09 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27DBD103BB9E; Mon, 23 Jul 2018 03:04:09 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CDB7690652; Mon, 23 Jul 2018 03:04:08 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AED5216EAE; Mon, 23 Jul 2018 03:04:08 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6N348k0069412; Mon, 23 Jul 2018 03:04:08 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6N348et069410; Mon, 23 Jul 2018 03:04:08 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807230304.w6N348et069410@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Mon, 23 Jul 2018 03:04:08 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sysutils: u-boot-rpi u-boot-rpi/files u-boot-rpi2 u-boot-rpi2/files u-boot-rpi3 u-boot-rpi3/files X-SVN-Commit-Revision: 475141 X-SVN-Commit-Repository: ports 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.27 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: Mon, 23 Jul 2018 03:04:09 -0000 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"