CVS commit: pkgsrc/sysutils

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Fri Jun 25 08:40:54 UTC 2021

Modified Files:
        pkgsrc/sysutils/u-boot-roc-rk3328-cc: Makefile
Added Files:
        pkgsrc/sysutils/u-boot: distinfo-2020.07-rc4
        pkgsrc/sysutils/u-boot/patches-2020.07-rc4: patch-include_image.h
Removed Files:
        pkgsrc/sysutils/u-boot-roc-rk3328-cc: distinfo
        pkgsrc/sysutils/u-boot-roc-rk3328-cc/patches: patch-include_image.h

Log Message:
catch up the u-boot-roc-rk3328-cc package with u-boot distinfo/patches
clean up from a few months ago.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/u-boot/distinfo-2020.07-rc4
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/u-boot-roc-rk3328-cc/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/sysutils/u-boot-roc-rk3328-cc/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/u-boot-roc-rk3328-cc/patches/patch-include_image.h
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/u-boot/patches-2020.07-rc4/patch-include_image.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/u-boot-roc-rk3328-cc/Makefile
diff -u pkgsrc/sysutils/u-boot-roc-rk3328-cc/Makefile:1.1 pkgsrc/sysutils/u-boot-roc-rk3328-cc/Makefile:1.2
--- pkgsrc/sysutils/u-boot-roc-rk3328-cc/Makefile:1.1   Tue Jun 30 14:40:05 2020
+++ pkgsrc/sysutils/u-boot-roc-rk3328-cc/Makefile       Fri Jun 25 08:40:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/06/30 14:40:05 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 2021/06/25 08:40:54 mrg Exp $
 
 UBOOT_TARGET=          roc-rk3328-cc
 UBOOT_CONFIG=          roc-cc-rk3328_defconfig
@@ -8,10 +8,6 @@ UBOOT_INSTALLBOOT_PLIST=       installboot.pli
 
 UBOOT_VERSION=         2020.07-rc4
 
-DISTINFO_FILE=         ${.CURDIR}/../../sysutils/u-boot-roc-rk3328-cc/distinfo
-PATCHDIR=              ${.CURDIR}/../../sysutils/u-boot-roc-rk3328-cc/patches
-DISTFILES=             ${DEFAULT_DISTFILES}
-
 # This could be moved to u-boot.mk as long as we don't have support for
 # any imx8 boards.
 CHECK_PORTABILITY_SKIP+=       tools/imx8m_image.sh

Added files:

Index: pkgsrc/sysutils/u-boot/distinfo-2020.07-rc4
diff -u /dev/null pkgsrc/sysutils/u-boot/distinfo-2020.07-rc4:1.1
--- /dev/null   Fri Jun 25 08:40:54 2021
+++ pkgsrc/sysutils/u-boot/distinfo-2020.07-rc4 Fri Jun 25 08:40:53 2021
@@ -0,0 +1,7 @@
+$NetBSD: distinfo-2020.07-rc4,v 1.1 2021/06/25 08:40:53 mrg Exp $
+
+SHA1 (u-boot-2020.07-rc4.tar.bz2) = 6bd6aaf18c580e0e24221b45de45958b94580df0
+RMD160 (u-boot-2020.07-rc4.tar.bz2) = 21df7e0cff66843e963d07d22c508d81305af35a
+SHA512 (u-boot-2020.07-rc4.tar.bz2) = 81fb2cfaabe2e20addc174798fa7f6506d51bd32aafac6698758417575bd85bb95d476b619e8d78480c0ccef6424f8b6de59c76bc48a555b7b4105acf194f3f8
+Size (u-boot-2020.07-rc4.tar.bz2) = 15333666 bytes
+SHA1 (patch-include_image.h) = 46f9efc0b9bbeea407e18f2b7e02b265dc0b58e1

Index: pkgsrc/sysutils/u-boot/patches-2020.07-rc4/patch-include_image.h
diff -u /dev/null pkgsrc/sysutils/u-boot/patches-2020.07-rc4/patch-include_image.h:1.1
--- /dev/null   Fri Jun 25 08:40:54 2021
+++ pkgsrc/sysutils/u-boot/patches-2020.07-rc4/patch-include_image.h    Fri Jun 25 08:40:53 2021
@@ -0,0 +1,37 @@
+$NetBSD: patch-include_image.h,v 1.1 2021/06/25 08:40:53 mrg Exp $
+
+Ensure the correct byte order macros are used when image.h is included
+in a host tool.
+
+--- include/image.h.orig       2020-06-20 13:48:00.000000000 +0000
++++ include/image.h    2020-06-20 13:51:12.000000000 +0000
+@@ -16,7 +16,6 @@
+ #define __IMAGE_H__
+ 
+ #include "compiler.h"
+-#include <asm/byteorder.h>
+ #include <stdbool.h>
+ 
+ /* Define this to avoid #ifdefs later on */
+@@ -26,6 +25,13 @@ struct fdt_region;
+ #ifdef USE_HOSTCC
+ #include <sys/types.h>
+ 
++#include <endian.h>
++#if _BYTE_ORDER == _BIG_ENDIAN
++#  include <linux/byteorder/big_endian.h>
++#else
++#  include <linux/byteorder/little_endian.h>
++#endif
++
+ /* new uImage format support enabled on host */
+ #define IMAGE_ENABLE_FIT      1
+ #define IMAGE_ENABLE_OF_LIBFDT        1
+@@ -40,6 +46,7 @@ struct fdt_region;
+ 
+ #else
+ 
++#include <asm/byteorder.h>
+ #include <lmb.h>
+ #include <asm/u-boot.h>
+ #include <command.h>