From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 25 09:00:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 99317E2A for ; Thu, 25 Apr 2013 09:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 7BE9816BC for ; Thu, 25 Apr 2013 09:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r3P900p3049180 for ; Thu, 25 Apr 2013 09:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r3P900s0049179; Thu, 25 Apr 2013 09:00:00 GMT (envelope-from gnats) Resent-Date: Thu, 25 Apr 2013 09:00:00 GMT Resent-Message-Id: <201304250900.r3P900s0049179@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kubilay Kocak Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 02683A32 for ; Thu, 25 Apr 2013 08:51:57 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id E72F41671 for ; Thu, 25 Apr 2013 08:51:56 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r3P8puum009963 for ; Thu, 25 Apr 2013 08:51:56 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r3P8pubB009962; Thu, 25 Apr 2013 08:51:56 GMT (envelope-from nobody) Message-Id: <201304250851.r3P8pubB009962@red.freebsd.org> Date: Thu, 25 Apr 2013 08:51:56 GMT From: Kubilay Kocak To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/178137: [PATCH] devel/u-boot: Move to devel/uboot-mkimage and update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Apr 2013 09:00:00 -0000 >Number: 178137 >Category: ports >Synopsis: [PATCH] devel/u-boot: Move to devel/uboot-mkimage and update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Apr 25 09:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Kubilay Kocak >Release: FreeBSD 9.1-STABLE amd64 >Organization: >Environment: FreeBSD freebsd-RELENG_9-amd64.elysium 9.1-STABLE FreeBSD 9.1-STABLE #0 r249542: Sun Apr 21 21:01:52 EST >Description: This change was requested by ray@ with the following rationale: 1. Currently, the distribution contains the source code of U-Boot loader, but devel/u-boot only makes a single utility which is used to build kernel/ramfs image for U-Boot. 2. devel/uboot or devel/u-boot can be freed up and used for a port that builds the U-Boot loader itself. Changes: - Rename devel/u-boot to devel/uboot-mkimage - Accordingly, update MOVED and add SUBDIR in devel/Makefile While I'm here: - Update to 2010.12 - Update PORTNAME and MAINTAINER - Remove custom do-patch and do-build targets - Use BUILD_WRKSRC and MAKEFILE instead - Update BSDmakefile - Add patch-include__compiler.h - Trim Makefile header Obtained from: ray Discussed with: ray portlint: looks fine. porttest: OK testport: OK (Poudriere, all versions & archs) Additional (MOVED): - make checksubdirs - OK - make index - OK - Run MOVEDlint.awk - OK - MOVED: YYYY-MM-DD format - OK - grep -Ri 'u-boot' * >How-To-Repeat: >Fix: Patch attached with submission follows: Index: MOVED =================================================================== --- MOVED (revision 314363) +++ MOVED (working copy) @@ -4168,3 +4168,4 @@ net-mgmt/zabbix-frontend|net-mgmt/zabbix2-frontend|2013-03-15|Has expired: no longer supported by upstream net-mgmt/zabbix-proxy|net-mgmt/zabbix2-proxy|2013-03-15|Has expired: no longer supported by upstream net-mgmt/zabbix-server|net-mgmt/zabbix2-server|2013-03-15|Has expired: no longer supported by upstream +devel/u-boot|devel/uboot-mkimage|2013-03-17|Port doesn't build main target of distribution Index: devel/Makefile =================================================================== --- devel/Makefile (revision 314363) +++ devel/Makefile (working copy) @@ -4304,8 +4304,8 @@ SUBDIR += trac-bitten SUBDIR += trio SUBDIR += truc - SUBDIR += u-boot SUBDIR += uatraits + SUBDIR += uboot-mkimage SUBDIR += uclmmbase SUBDIR += ucommon SUBDIR += ucpp Index: devel/u-boot/Makefile (deleted) =================================================================== Index: devel/u-boot/distinfo (deleted) =================================================================== Index: devel/u-boot/files/BSDmakefile (deleted) =================================================================== Index: devel/u-boot/pkg-descr (deleted) =================================================================== Index: devel/uboot-mkimage/Makefile =================================================================== --- devel/uboot-mkimage/Makefile (working copy) +++ devel/uboot-mkimage/Makefile (working copy) @@ -1,30 +1,26 @@ -# New ports collection makefile for: u-boot-mkimage -# Date created: 18 September 2007 -# Whom: Marius Nuennerich -# +# Created by: Marius Nuennerich # $FreeBSD$ -# -PORTNAME= u-boot -PORTVERSION= 1.2.0 +PORTNAME= uboot +DISTVERSION= 2010.12 CATEGORIES= devel MASTER_SITES= ftp://ftp.denx.de/pub/u-boot/ \ http://people.bsdgroup.de/~as/freebsd/distfiles/ PKGNAMESUFFIX= -mkimage +DISTNAME= u-boot-${PORTVERSION} -MAINTAINER= mn@bsdgroup.de +MAINTAINER= ray@FreeBSD.org COMMENT= The mkimage utility of the u-boot bootloader USE_BZIP2= yes +BUILD_WRKSRC= ${WRKSRC}/tools +MAKEFILE= BSDmakefile PLIST_FILES= bin/mkimage -do-patch: - @${CP} ${PATCHDIR}/BSDmakefile ${WRKSRC}/tools +post-extract: + ${CP} ${PATCHDIR}/BSDmakefile ${WRKSRC}/tools -do-build: - @cd ${WRKSRC}/tools && make - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tools/mkimage ${PREFIX}/bin Index: devel/uboot-mkimage/distinfo =================================================================== --- devel/uboot-mkimage/distinfo (working copy) +++ devel/uboot-mkimage/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (u-boot-1.2.0.tar.bz2) = 62192ddf019c5d24f6538b33c9e69b6e5792bf5b0f464c0149061e2f0871108b -SIZE (u-boot-1.2.0.tar.bz2) = 6929112 +SHA256 (u-boot-2010.12.tar.bz2) = 1705772db7a18635693676abb8818542167cb131921c456a1edd0ed47e6b77fe +SIZE (u-boot-2010.12.tar.bz2) = 8238700 Index: devel/uboot-mkimage/files/BSDmakefile =================================================================== --- devel/uboot-mkimage/files/BSDmakefile (working copy) +++ devel/uboot-mkimage/files/BSDmakefile (working copy) @@ -1,11 +1,28 @@ -CFLAGS+= -I../include -DUSE_HOSTCC +CFLAGS+= -I. -I../include -DUSE_HOSTCC all: mkimage -mkimage: mkimage.o crc32.o +mkimage: mkimage.o crc32.o default_image.o fit_image.o image.o imximage.o \ + kwbimage.o md5.o os_support.o sha1.o fdt.o fdt_ro.o fdt_rw.o \ + fdt_strerror.o fdt_wip.o $(CC) $(CFLAGS) -o $(.TARGET) $(.ALLSRC) -crc32.o: ../lib_generic/crc32.c ../include/zlib.h +crc32.o: ../lib/crc32.c ../include/u-boot/zlib.h +default_image.o: default_image.c +fit_image.o: fit_image.c +image.o: ../common/image.c +imximage.o: imximage.c +kwbimage.o: kwbimage.c +md5.o: ../lib/md5.c +os_support.o: os_support.c +sha1.o: ../lib/sha1.c +fdt.o: ../lib/libfdt/fdt.c +fdt_ro.o: ../lib/libfdt/fdt_ro.c +fdt_rw.o: ../lib/libfdt/fdt_rw.c +fdt_strerror.o: ../lib/libfdt/fdt_strerror.c +fdt_wip.o: ../lib/libfdt/fdt_wip.c + + clean: rm -f mkimage mkimage.o crc32.o Index: devel/uboot-mkimage/files/patch-include__compiler.h =================================================================== --- devel/uboot-mkimage/files/patch-include__compiler.h (revision 0) +++ devel/uboot-mkimage/files/patch-include__compiler.h (working copy) @@ -0,0 +1,11 @@ +--- ./include/compiler.h.orig 2010-12-22 21:22:14.000000000 +0200 ++++ ./include/compiler.h 2011-01-13 13:50:35.000000000 +0200 +@@ -44,7 +44,7 @@ + #ifdef __linux__ + # include + # include +-#elif defined(__MACH__) ++#elif defined(__MACH__) || defined(__FreeBSD__) + # include + typedef unsigned long ulong; + #endif Property changes on: devel/uboot-mkimage/files/patch-include__compiler.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property >Release-Note: >Audit-Trail: >Unformatted: