pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils Add installboot(8) overlay support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6045947e67fa
branches:  trunk
changeset: 395538:6045947e67fa
user:      thorpej <thorpej%pkgsrc.org@localhost>
date:      Wed May 08 05:06:48 2019 +0000

description:
Add installboot(8) overlay support.

diffstat:

 sysutils/u-boot-bananapi-r2/Makefile                    |   6 +-
 sysutils/u-boot-bananapi-r2/PLIST                       |   3 +-
 sysutils/u-boot-bananapi-r2/files/installboot.plist     |  65 +++++++++++++++++
 sysutils/u-boot-beagleboard/Makefile                    |   6 +-
 sysutils/u-boot-beagleboard/PLIST                       |   3 +-
 sysutils/u-boot-beagleboard/files/installboot.plist     |  53 +++++++++++++
 sysutils/u-boot-beagleboneblack/Makefile                |   6 +-
 sysutils/u-boot-beagleboneblack/PLIST                   |   3 +-
 sysutils/u-boot-beagleboneblack/files/installboot.plist |  53 +++++++++++++
 sysutils/u-boot-beaglebonewhite/Makefile                |   6 +-
 sysutils/u-boot-beaglebonewhite/PLIST                   |   3 +-
 sysutils/u-boot-beaglebonewhite/files/installboot.plist |  53 +++++++++++++
 12 files changed, 248 insertions(+), 12 deletions(-)

diffs (truncated from 351 to 300 lines):

diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-bananapi-r2/Makefile
--- a/sysutils/u-boot-bananapi-r2/Makefile      Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-bananapi-r2/Makefile      Wed May 08 05:06:48 2019 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2019/04/25 13:22:12 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/08 05:06:48 thorpej Exp $
 
 UBOOT_TARGET=          bananapi-r2
 UBOOT_CONFIG=          mt7623n_bpir2_defconfig
 UBOOT_BIN=             bpi-r2-sdmmc.img u-boot.bin
 
-PKGREVISION=           2
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=           3
 
 UBOOT_VERSION=         2019.04-rc4
 
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-bananapi-r2/PLIST
--- a/sysutils/u-boot-bananapi-r2/PLIST Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-bananapi-r2/PLIST Wed May 08 05:06:48 2019 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2019/04/25 13:22:12 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/05/08 05:06:48 thorpej Exp $
 share/u-boot/bananapi-r2/BPI-R2-HEAD440-0k.img
 share/u-boot/bananapi-r2/BPI-R2-HEAD1-512b.img
 share/u-boot/bananapi-r2/bpi-r2-sdmmc.img
+share/u-boot/bananapi-r2/installboot.plist
 share/u-boot/bananapi-r2/preloader_iotg7623Np1_sd_1600M.bin
 share/u-boot/bananapi-r2/u-boot.bin
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-bananapi-r2/files/installboot.plist
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-bananapi-r2/files/installboot.plist       Wed May 08 05:06:48 2019 +0000
@@ -0,0 +1,65 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:06:48 thorpej Exp $ -->
+<!--
+  Copyright (c) 2019 The NetBSD Foundation, Inc.
+  All rights reserved.
+ 
+  This code is derived from software contributed to The NetBSD Foundation
+  by Jason R. Thorpe.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+-->
+<plist>
+<dict>
+       <key>bananapi,bpi-r2</key>
+       <dict>
+               <key>description</key>
+               <string>Bananapi BPI-R2</string>
+               <key>u-boot-install</key>
+               <array>
+                       <dict>
+                               <key>file-name</key>
+                               <string>BPI-R2-HEAD440-0k.img</string>
+                               <key>preserve</key>
+                               <true/>
+                       </dict>
+                       <dict>
+                               <key>file-name</key>
+                               <string>BPI-R2-HEAD1-512b.img</string>
+                               <key>image-offset</key>
+                               <integer>512</integer>
+                       </dict>
+                       <dict>
+                               <key>file-name</key>
+                               <string>preloader_iotg7623Np1_sd_1600M.bin</string>
+                               <key>image-offset</key>
+                               <integer>2048</integer>
+                       </dict>
+                       <dict>
+                               <key>file-name</key>
+                               <string>u-boot.bin</string>
+                               <key>image-offset</key>
+                               <integer>327680</integer>
+                       </dict>
+               </array>
+       </dict>
+</dict>
+</plist>
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beagleboard/Makefile
--- a/sysutils/u-boot-beagleboard/Makefile      Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-beagleboard/Makefile      Wed May 08 05:06:48 2019 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/08 05:14:19 thorpej Exp $
 
 UBOOT_TARGET=          beagleboard
 UBOOT_CONFIG=          omap3_beagle_defconfig
 UBOOT_BIN=             u-boot.img
 UBOOT_BIN+=            MLO
 
-PKGREVISION=           3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=           4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beagleboard/PLIST
--- a/sysutils/u-boot-beagleboard/PLIST Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-beagleboard/PLIST Wed May 08 05:06:48 2019 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 19:56:36 sevan Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/08 05:14:19 thorpej Exp $
 share/u-boot/beagleboard/MLO
+share/u-boot/beagleboard/installboot.plist
 share/u-boot/beagleboard/u-boot.img
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beagleboard/files/installboot.plist
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-beagleboard/files/installboot.plist       Wed May 08 05:06:48 2019 +0000
@@ -0,0 +1,53 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:14:19 thorpej Exp $ -->
+<!--
+  Copyright (c) 2019 The NetBSD Foundation, Inc.
+  All rights reserved.
+ 
+  This code is derived from software contributed to The NetBSD Foundation
+  by Jason R. Thorpe.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+-->
+<plist>
+<dict>
+       <key>ti,omap3-beagle</key>
+       <dict>
+               <key>description</key>
+               <string>TI OMAP3 BeagleBoard</string>
+               <key>u-boot-install</key>
+               <array>
+                       <dict>
+                               <key>file-name</key>
+                               <string>MLO</string>
+                               <key>image-offset</key>
+                               <integer>131072</integer>
+                       </dict>
+                       <dict>
+                               <key>file-name</key>
+                               <string>u-boot.img</string>
+                               <key>image-offset</key>
+                               <integer>393216</integer>
+                       </dict>
+               </array>
+       </dict>
+</dict>
+</plist>
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beagleboneblack/Makefile
--- a/sysutils/u-boot-beagleboneblack/Makefile  Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-beagleboneblack/Makefile  Wed May 08 05:06:48 2019 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2019/05/08 05:14:20 thorpej Exp $
 
 UBOOT_TARGET=          beagleboneblack
 UBOOT_CONFIG=          am335x_boneblack_defconfig
 UBOOT_BIN=             u-boot.img
 UBOOT_BIN+=            MLO
 
-PKGREVISION=           3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=           4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beagleboneblack/PLIST
--- a/sysutils/u-boot-beagleboneblack/PLIST     Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-beagleboneblack/PLIST     Wed May 08 05:06:48 2019 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2017/08/26 18:46:07 sevan Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/05/08 05:14:20 thorpej Exp $
 share/u-boot/beagleboneblack/MLO
+share/u-boot/beagleboneblack/installboot.plist
 share/u-boot/beagleboneblack/u-boot.img
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beagleboneblack/files/installboot.plist
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-beagleboneblack/files/installboot.plist   Wed May 08 05:06:48 2019 +0000
@@ -0,0 +1,53 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:14:20 thorpej Exp $ -->
+<!--
+  Copyright (c) 2019 The NetBSD Foundation, Inc.
+  All rights reserved.
+ 
+  This code is derived from software contributed to The NetBSD Foundation
+  by Jason R. Thorpe.
+ 
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions
+  are met:
+  1. Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ 
+  THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+  TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
+-->
+<plist>
+<dict>
+       <key>ti,am335x-bone-black</key>
+       <dict>
+               <key>description</key>
+               <string>TI AM335x BeagleBone Black</string>
+               <key>u-boot-install</key>
+               <array>
+                       <dict>
+                               <key>file-name</key>
+                               <string>MLO</string>
+                               <key>image-offset</key>
+                               <integer>131072</integer>
+                       </dict>
+                       <dict>
+                               <key>file-name</key>
+                               <string>u-boot.img</string>
+                               <key>image-offset</key>
+                               <integer>393216</integer>
+                       </dict>
+               </array>
+       </dict>
+</dict>
+</plist>
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beaglebonewhite/Makefile
--- a/sysutils/u-boot-beaglebonewhite/Makefile  Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-beaglebonewhite/Makefile  Wed May 08 05:06:48 2019 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2019/04/26 08:32:28 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/08 05:14:20 thorpej Exp $
 
 UBOOT_TARGET=          beaglebonewhite
 UBOOT_CONFIG=          am335x_evm_defconfig
 UBOOT_BIN=             u-boot.img
 UBOOT_BIN+=            MLO
 
-PKGREVISION=           3
+UBOOT_INSTALLBOOT_PLIST=installboot.plist
+
+PKGREVISION=           4
 
 .include "../../sysutils/u-boot/u-boot-arm.mk"
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beaglebonewhite/PLIST
--- a/sysutils/u-boot-beaglebonewhite/PLIST     Wed May 08 05:02:35 2019 +0000
+++ b/sysutils/u-boot-beaglebonewhite/PLIST     Wed May 08 05:06:48 2019 +0000
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2017/08/26 18:35:33 sevan Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/05/08 05:14:20 thorpej Exp $
 share/u-boot/beaglebonewhite/MLO
+share/u-boot/beaglebonewhite/installboot.plist
 share/u-boot/beaglebonewhite/u-boot.img
diff -r 3b9bba5219c3 -r 6045947e67fa sysutils/u-boot-beaglebonewhite/files/installboot.plist
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/u-boot-beaglebonewhite/files/installboot.plist   Wed May 08 05:06:48 2019 +0000
@@ -0,0 +1,53 @@
+<!-- $NetBSD: installboot.plist,v 1.1 2019/05/08 05:14:20 thorpej Exp $ -->
+<!--



Home | Main Index | Thread Index | Old Index