From owner-svn-src-user@freebsd.org Mon Mar 20 08:56:38 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84352D0C2DF for ; Mon, 20 Mar 2017 08:56:38 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 51C971121; Mon, 20 Mar 2017 08:56:38 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2K8ubQ4021178; Mon, 20 Mar 2017 08:56:37 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2K8ubQU021177; Mon, 20 Mar 2017 08:56:37 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703200856.v2K8ubQU021177@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 08:56:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315626 - user/pho/stress2/testcases/badcode X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 08:56:38 -0000 Author: pho Date: Mon Mar 20 08:56:37 2017 New Revision: 315626 URL: https://svnweb.freebsd.org/changeset/base/315626 Log: CFLAGS is already defined in Makefile.inc Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/testcases/badcode/Makefile Modified: user/pho/stress2/testcases/badcode/Makefile ============================================================================== --- user/pho/stress2/testcases/badcode/Makefile Mon Mar 20 08:16:05 2017 (r315625) +++ user/pho/stress2/testcases/badcode/Makefile Mon Mar 20 08:56:37 2017 (r315626) @@ -3,4 +3,3 @@ PROG= badcode .include -CFLAGS =-g -Wall -Wextra -I../../include -I../include From owner-svn-src-user@freebsd.org Mon Mar 20 08:57:26 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7D9BD0C30D for ; Mon, 20 Mar 2017 08:57:26 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 957E21210; Mon, 20 Mar 2017 08:57:26 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2K8vPlR021267; Mon, 20 Mar 2017 08:57:25 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2K8vPwk021266; Mon, 20 Mar 2017 08:57:25 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703200857.v2K8vPwk021266@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 08:57:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315627 - user/pho/stress2/testcases/run X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 08:57:26 -0000 Author: pho Date: Mon Mar 20 08:57:25 2017 New Revision: 315627 URL: https://svnweb.freebsd.org/changeset/base/315627 Log: Cleanup is handled by tools/cleanup.sh Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/testcases/run/run.c Modified: user/pho/stress2/testcases/run/run.c ============================================================================== --- user/pho/stress2/testcases/run/run.c Mon Mar 20 08:56:37 2017 (r315626) +++ user/pho/stress2/testcases/run/run.c Mon Mar 20 08:57:25 2017 (r315627) @@ -70,16 +70,6 @@ clean(void) { char buf[132]; - /* cleanup after the syscall test */ - snprintf(buf, sizeof(buf), - "cd %s; find . -type d -mtime -1 -exec chmod 777 {} \\;", op->wd); - (void)system(buf); - snprintf(buf, sizeof(buf), - "cd %s; find . -type f -mtime -1 -exec chmod 666 {} \\;", op->wd); - (void)system(buf); - snprintf(buf, sizeof(buf), - "cd %s; chflags \"nouappnd nouchg nouunlnk\" .", op->wd); - (void)system(buf); snprintf(buf, sizeof(buf), "cd %s; rm -rf syscall.[0-9]* fifo.[0-9]* creat.[0-9]* " "p[0-9]*.d1 df lock", op->cd); From owner-svn-src-user@freebsd.org Mon Mar 20 08:58:23 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A899DD0C33B for ; Mon, 20 Mar 2017 08:58:23 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 761051305; Mon, 20 Mar 2017 08:58:23 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2K8wMx3021362; Mon, 20 Mar 2017 08:58:22 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2K8wM0w021361; Mon, 20 Mar 2017 08:58:22 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703200858.v2K8wM0w021361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 08:58:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315628 - user/pho/stress2/testcases/tcp X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 08:58:23 -0000 Author: pho Date: Mon Mar 20 08:58:22 2017 New Revision: 315628 URL: https://svnweb.freebsd.org/changeset/base/315628 Log: Added missing waitpid() and cleanup code while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/testcases/tcp/tcp.c Modified: user/pho/stress2/testcases/tcp/tcp.c ============================================================================== --- user/pho/stress2/testcases/tcp/tcp.c Mon Mar 20 08:57:25 2017 (r315627) +++ user/pho/stress2/testcases/tcp/tcp.c Mon Mar 20 08:58:22 2017 (r315628) @@ -30,7 +30,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include + #include #include #include @@ -143,8 +146,10 @@ writer(void) { if (write(tcpsock, buf, bufsize) < 0) { if (errno == EPIPE) return; - err(1, "write(%d), %s:%d", tcpsock, + if (errno != ECONNRESET) + err(1, "write(%d), %s:%d", tcpsock, __FILE__, __LINE__); + _exit(EXIT_SUCCESS); } } } @@ -171,11 +176,13 @@ test(void) if ((pid = fork()) == 0) { writer(); - exit(EXIT_SUCCESS); + _exit(EXIT_SUCCESS); } else if (pid > 0) { reader(); kill(pid, SIGINT); + if (waitpid(pid, NULL, 0) != pid) + err(1, "waitpid(%d)", pid); } else err(1, "fork(), %s:%d", __FILE__, __LINE__); From owner-svn-src-user@freebsd.org Mon Mar 20 08:59:14 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E6CDD0C37A for ; Mon, 20 Mar 2017 08:59:14 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id D27AA1437; Mon, 20 Mar 2017 08:59:13 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2K8xCPM021449; Mon, 20 Mar 2017 08:59:12 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2K8xCwX021448; Mon, 20 Mar 2017 08:59:12 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703200859.v2K8xCwX021448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 08:59:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315629 - user/pho/stress2/testcases/openat X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 08:59:14 -0000 Author: pho Date: Mon Mar 20 08:59:12 2017 New Revision: 315629 URL: https://svnweb.freebsd.org/changeset/base/315629 Log: Fix copy/paste error. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/testcases/openat/openat.c Modified: user/pho/stress2/testcases/openat/openat.c ============================================================================== --- user/pho/stress2/testcases/openat/openat.c Mon Mar 20 08:58:22 2017 (r315628) +++ user/pho/stress2/testcases/openat/openat.c Mon Mar 20 08:59:12 2017 (r315629) @@ -83,7 +83,7 @@ setup(int nb) if (mkdir(path1, 0770) < 0) err(1, "mkdir(%s), %s:%d", path1, __FILE__, __LINE__); if (chdir(path1) == -1) - err(1, "chdir(%s), %s:%d", path2, __FILE__, __LINE__); + err(1, "chdir(%s), %s:%d", path1, __FILE__, __LINE__); if (mkdir(path2, 0770) < 0) err(1, "mkdir(%s), %s:%d", path2, __FILE__, __LINE__); From owner-svn-src-user@freebsd.org Mon Mar 20 09:00:21 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6EF2D0C5D4 for ; Mon, 20 Mar 2017 09:00:21 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 7A9EC1562; Mon, 20 Mar 2017 09:00:21 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2K90Kaf021603; Mon, 20 Mar 2017 09:00:20 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2K90KEX021602; Mon, 20 Mar 2017 09:00:20 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703200900.v2K90KEX021602@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 09:00:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315630 - user/pho/stress2/testcases/lockf X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 09:00:21 -0000 Author: pho Date: Mon Mar 20 09:00:20 2017 New Revision: 315630 URL: https://svnweb.freebsd.org/changeset/base/315630 Log: Use quotes for local include file. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/testcases/lockf/lockf.c Modified: user/pho/stress2/testcases/lockf/lockf.c ============================================================================== --- user/pho/stress2/testcases/lockf/lockf.c Mon Mar 20 08:59:12 2017 (r315629) +++ user/pho/stress2/testcases/lockf/lockf.c Mon Mar 20 09:00:20 2017 (r315630) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include "stress.h" pid_t pid; int fd; @@ -54,11 +54,18 @@ get(void) { do { r = lockf(fd, F_LOCK, 0); - } while (r == -1 && errno == EINTR); + } while (r == -1 && errno == EINTR && done_testing == 0); if (r == -1) err(1, "lockf(%s, F_LOCK)", file); - if (read(fd, &sem, sizeof(sem)) != sizeof(sem)) + if (lseek(fd, 0, SEEK_SET) == -1) // XXX + err(1, "lseek"); // XXX + r = read(fd, &sem, sizeof(sem)); + if (r == -1) err(1, "get: read(%d)", fd); + if (r == 0) + errx(1, "get() read 0 bytes"); + if (r != sizeof(sem)) + errx(1, "get() size error: %d", r); if (lseek(fd, 0, SEEK_SET) == -1) err(1, "lseek"); if (lockf(fd, F_ULOCK, 0) == -1) @@ -72,7 +79,7 @@ incr(void) { do { r = lockf(fd, F_LOCK, 0); - } while (r == -1 && errno == EINTR); + } while (r == -1 && errno == EINTR && done_testing == 0); if (r == -1) err(1, "lockf(%s, F_LOCK)", file); if (read(fd, &sem, sizeof(sem)) != sizeof(sem)) @@ -132,8 +139,12 @@ test(void) int sem = 0; sprintf(file, "lockf.0.%d", getpid()); - if ((fd = open(file,O_CREAT | O_TRUNC | O_RDWR, 0600)) == -1) - err(1, "creat(%s)", file); + if ((fd = open(file,O_CREAT | O_TRUNC | O_RDWR, 0600)) == -1) { + if (errno == ENOENT) + return (0); + else + err(1, "creat(%s) %s:%d", file, __FILE__, __LINE__); + } if (write(fd, &sem, sizeof(sem)) != sizeof(sem)) err(1, "write"); if (lseek(fd, 0, SEEK_SET) == -1) @@ -146,18 +157,19 @@ test(void) } if (pid == 0) { /* child */ - for (i = 0; i < 100; i++) { - while ((get() & 1) == 0) + alarm(60); + for (i = 0; i < 100 && done_testing == 0; i++) { + while ((get() & 1) == 0 && done_testing == 0) ; if (op->verbose > 3) printf("Child %d, sem = %d\n", i, get()), fflush(stdout); incr(); } - exit(0); + _exit(0); } else { /* parent */ - for (i = 0; i < 100; i++) { - while ((get() & 1) == 1) + for (i = 0; i < 100 && done_testing == 0; i++) { + while ((get() & 1) == 1 && done_testing == 0) ; if (op->verbose > 3) printf("Parent %d, sem = %d\n", i, get()), @@ -166,6 +178,8 @@ test(void) } } close(fd); + if (done_testing == 1) + kill(pid, SIGHUP); waitpid(pid, &i, 0); unlink(file); From owner-svn-src-user@freebsd.org Mon Mar 20 09:01:31 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE60ED0C759 for ; Mon, 20 Mar 2017 09:01:31 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 7E8231861; Mon, 20 Mar 2017 09:01:31 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2K91UiI025194; Mon, 20 Mar 2017 09:01:30 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2K91UHw025193; Mon, 20 Mar 2017 09:01:30 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703200901.v2K91UHw025193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 09:01:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315631 - user/pho/stress2/testcases/lockf2 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 09:01:31 -0000 Author: pho Date: Mon Mar 20 09:01:30 2017 New Revision: 315631 URL: https://svnweb.freebsd.org/changeset/base/315631 Log: Using local include file. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/testcases/lockf2/lockf2.c Modified: user/pho/stress2/testcases/lockf2/lockf2.c ============================================================================== --- user/pho/stress2/testcases/lockf2/lockf2.c Mon Mar 20 09:00:20 2017 (r315630) +++ user/pho/stress2/testcases/lockf2/lockf2.c Mon Mar 20 09:01:30 2017 (r315631) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include "stress.h" char file[128]; int fd; From owner-svn-src-user@freebsd.org Mon Mar 20 10:48:12 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 266C3D1325B for ; Mon, 20 Mar 2017 10:48:12 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id EACF81C48; Mon, 20 Mar 2017 10:48:11 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2KAmB7I066739; Mon, 20 Mar 2017 10:48:11 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2KAmB6k066738; Mon, 20 Mar 2017 10:48:11 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703201048.v2KAmB6k066738@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 10:48:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315632 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 10:48:12 -0000 Author: pho Date: Mon Mar 20 10:48:10 2017 New Revision: 315632 URL: https://svnweb.freebsd.org/changeset/base/315632 Log: Make sure pty.ko is loaded. While here, cleanup code. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/vnodes.sh Modified: user/pho/stress2/misc/vnodes.sh ============================================================================== --- user/pho/stress2/misc/vnodes.sh Mon Mar 20 09:01:30 2017 (r315631) +++ user/pho/stress2/misc/vnodes.sh Mon Mar 20 10:48:10 2017 (r315632) @@ -34,21 +34,26 @@ . ../default.cfg +kldstat -v | grep -q pty || { kldload pty || exit 0; } here=`pwd` cd /tmp sed '1,/^EOF/d' < $here/$0 > vnodes.c -mycc -o vnodes -Wall -O2 vnodes.c +mycc -o vnodes -Wall -Wextra -O2 vnodes.c || exit 1 rm -f vnodes.c -old=`sysctl vfs.numvnodes | tail -1 | sed 's/.*: //'` +s=0 +old=`sysctl -n vfs.numvnodes` /tmp/vnodes -new=`sysctl vfs.numvnodes | tail -1 | sed 's/.*: //'` -[ $((new - old)) -gt 100 ] && echo "FAIL vnode leak" +new=`sysctl -n vfs.numvnodes` +[ $((new - old)) -gt 100 ] && { s=1; echo "FAIL vnode leak"; } rm -f /tmp/vnodes -exit 0 +exit $s EOF #include + +#include +#include #include #include #include @@ -66,18 +71,21 @@ void leak(void) for (i = '0'; i < '9'; i ++) { dname[9] = i; fd = open(dname, O_RDWR); + if (fd == -1) + if (errno != EBUSY && errno != ENXIO) + err(1, "open(%s)", dname); } - exit(0); + _exit(0); } wait(NULL); } -int main() +int main(void) { int i; for (i = 0 ;i < 100000; i++) { leak(); } - return 0; + return (0); } From owner-svn-src-user@freebsd.org Mon Mar 20 11:29:42 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 07082D14094 for ; Mon, 20 Mar 2017 11:29:42 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id CB1FA129D; Mon, 20 Mar 2017 11:29:41 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2KBTeKF083020; Mon, 20 Mar 2017 11:29:40 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2KBTeva083019; Mon, 20 Mar 2017 11:29:40 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703201129.v2KBTeva083019@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 11:29:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315634 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 11:29:42 -0000 Author: pho Date: Mon Mar 20 11:29:40 2017 New Revision: 315634 URL: https://svnweb.freebsd.org/changeset/base/315634 Log: Don't loop forever on umount(1). Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/trim.sh Modified: user/pho/stress2/misc/trim.sh ============================================================================== --- user/pho/stress2/misc/trim.sh Mon Mar 20 11:12:31 2017 (r315633) +++ user/pho/stress2/misc/trim.sh Mon Mar 20 11:29:40 2017 (r315634) @@ -42,7 +42,7 @@ mdconfig -l | grep -q md$mdstart && mdc size="128m" [ `uname -m` = "amd64" ] && size="1g" [ $# -eq 0 ] && trim=-t -n=0 +s=0 opt="" [ "$newfs_flags" = "-U" ] && opt="-U -j" for flag in ' ' $opt; do @@ -52,7 +52,7 @@ for flag in ' ' $opt; do echo "newfs $trim $flag md${mdstart}$part" newfs $trim $flag md${mdstart}$part > /dev/null - mount /dev/md${mdstart}$part $mntpoint + mount /dev/md${mdstart}$part $mntpoint || exit 1 chmod 777 $mntpoint export runRUNTIME=10m @@ -60,11 +60,13 @@ for flag in ' ' $opt; do su $testuser -c 'cd ..; ./run.sh marcus.cfg' > /dev/null 2>&1 - while mount | grep $mntpoint | grep -q /dev/md; do - umount $mntpoint || sleep 1 + for i in `jot 6`; do + umount $mntpoint && break || sleep 10 done + [ $i -eq 6 ] && { s=1; break; } checkfs /dev/md${mdstart}$part mdconfig -d -u $mdstart done rm -f /tmp/fsck.log [ $malloc_wait != 1 ] && sysctl vm.md_malloc_wait=$malloc_wait +exit $s From owner-svn-src-user@freebsd.org Mon Mar 20 13:11:32 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31349D13822 for ; Mon, 20 Mar 2017 13:11:32 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id D4542C8B; Mon, 20 Mar 2017 13:11:31 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2KDBUgn027419; Mon, 20 Mar 2017 13:11:30 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2KDBUVr027418; Mon, 20 Mar 2017 13:11:30 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703201311.v2KDBUVr027418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 13:11:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315637 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 13:11:32 -0000 Author: pho Date: Mon Mar 20 13:11:30 2017 New Revision: 315637 URL: https://svnweb.freebsd.org/changeset/base/315637 Log: Added a regression test. Submitted by: Steven Hartland Sponsored by: Dell EMC Isilon Added: user/pho/stress2/misc/sigaltstack.sh (contents, props changed) Added: user/pho/stress2/misc/sigaltstack.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sigaltstack.sh Mon Mar 20 13:11:30 2017 (r315637) @@ -0,0 +1,129 @@ +#!/bin/sh + +# sigaltstack(2) regression test by Steven Hartland +# Wrong altsigstack clearing on exec +# https://github.com/golang/go/issues/15658#issuecomment-287276856 + +# Fixed by r315453 + +cd /tmp +cat > test-sigs.c < +#include +#include +#include +#include +#include +#include +#include + +extern char **environ; + +static void +die(const char *s) +{ + perror(s); + exit(EXIT_FAILURE); +} + +static void +setstack(void *arg __unused) +{ + stack_t ss; + + ss.ss_sp = malloc(SIGSTKSZ); + if (ss.ss_sp == NULL) + die("malloc"); + + ss.ss_size = SIGSTKSZ; + ss.ss_flags = 0; + if (sigaltstack(&ss, NULL) < 0) + die("sigaltstack set"); +} + +static void * +thread_exec(void *arg) +{ + struct timespec ts = {0, 1000}; + char *argv[] = {"./test-sigs", "no-more", 0}; + + setstack(arg); + nanosleep(&ts, NULL); + + execve(argv[0], &argv[0], environ); + die("exec failed"); + + return NULL; +} + +static void * +thread_sleep(void *arg __unused) +{ + sleep(10); + + return NULL; +} + + +int +main(int argc, char** argv __unused) +{ + int j; + pthread_t tid1, tid2; + + if (argc != 1) { + stack_t ss; + + if (sigaltstack(NULL, &ss) < 0) + die("sigaltstack get"); + + if (ss.ss_sp != NULL || ss.ss_flags != SS_DISABLE || + ss.ss_size != 0) { + fprintf(stderr, "invalid signal stack after execve: " + "ss_sp=%p ss_size=%lu ss_flags=0x%x\n", ss.ss_sp, + (unsigned long)ss.ss_size, + (unsigned int)ss.ss_flags); + return 1; + } + + printf("valid signal stack is valid after execve\n"); + + return 0; + } + + // We have to use two threads to ensure that can detect the + // issue when new threads are added to the head (pre 269095) + // and the tail of the process thread list. + j = pthread_create(&tid1, NULL, thread_exec, NULL); + if (j != 0) { + errno = j; + die("pthread_create"); + } + + j = pthread_create(&tid2, NULL, thread_sleep, NULL); + if (j != 0) { + errno = j; + die("pthread_create"); + } + + j = pthread_join(tid1, NULL); + if (j != 0) { + errno = j; + die("pthread_join"); + } + + j = pthread_join(tid2, NULL); + if (j != 0) { + errno = j; + } + + return 0; +} +EOF + +cc -o test-sigs -Wall -Wextra -O2 -g test-sigs.c -lpthread || exit 1 +./test-sigs +s=$? + +rm -f test-sigs test-sigs.c +exit $s From owner-svn-src-user@freebsd.org Mon Mar 20 14:17:02 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 718A4D13886 for ; Mon, 20 Mar 2017 14:17:02 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 4958111DC; Mon, 20 Mar 2017 14:17:02 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2KEH1hw052762; Mon, 20 Mar 2017 14:17:01 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2KEH17x052758; Mon, 20 Mar 2017 14:17:01 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703201417.v2KEH17x052758@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Mon, 20 Mar 2017 14:17:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315638 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Mar 2017 14:17:02 -0000 Author: pho Date: Mon Mar 20 14:17:00 2017 New Revision: 315638 URL: https://svnweb.freebsd.org/changeset/base/315638 Log: Cast st_ino and st_nlink to uintmax_t for 64 bit inode changes. Modified: user/pho/stress2/misc/rename6.sh user/pho/stress2/misc/rename8.sh user/pho/stress2/misc/rename9.sh user/pho/stress2/misc/tmpfs8.sh Modified: user/pho/stress2/misc/rename6.sh ============================================================================== --- user/pho/stress2/misc/rename6.sh Mon Mar 20 13:11:30 2017 (r315637) +++ user/pho/stress2/misc/rename6.sh Mon Mar 20 14:17:00 2017 (r315638) @@ -133,10 +133,12 @@ main(void) if (stat(logfile, &sb1) == 0 && stat(new, &sb2) == 0 && bcmp(&sb1, &sb2, sizeof(sb1)) == 0) { fprintf(stderr, "At loop #%d\n", i); - fprintf(stderr, "%-15s: ino = %d, nlink = %d, size = %jd\n", - logfile, sb1.st_ino, sb1.st_nlink, sb1.st_blocks); - fprintf(stderr, "%-15s: ino = %d, nlink = %d, size = %jd\n", - new , sb2.st_ino, sb2.st_nlink, sb2.st_blocks); + fprintf(stderr, "%-15s: ino = %ju, nlink = %ju," + " size = %jd\n", logfile, (uintmax_t)sb1.st_ino, + (uintmax_t)sb1.st_nlink, sb1.st_blocks); + fprintf(stderr, "%-15s: ino = %ju, nlink = %ju, " + "size = %jd\n", new , (uintmax_t)sb2.st_ino, + (uintmax_t)sb2.st_nlink, sb2.st_blocks); } unlink(new); } Modified: user/pho/stress2/misc/rename8.sh ============================================================================== --- user/pho/stress2/misc/rename8.sh Mon Mar 20 13:11:30 2017 (r315637) +++ user/pho/stress2/misc/rename8.sh Mon Mar 20 14:17:00 2017 (r315638) @@ -157,8 +157,9 @@ main(int ac, char **av) err(1, "stat(%s)", file1); if (sb.st_ino != sb2.st_ino || sb.st_ino == always_ino) { - printf("FAIL. Bad stat: always: %d file1: %d (should be %d)\n", - always_ino, sb.st_ino, sb2.st_ino); + printf("FAIL. Bad stat: always: %ju file1: %ju (should be %ju)\n", + (uintmax_t)always_ino, (uintmax_t)sb.st_ino, + (uintmax_t)sb2.st_ino); r = EXIT_FAILURE; break; } Modified: user/pho/stress2/misc/rename9.sh ============================================================================== --- user/pho/stress2/misc/rename9.sh Mon Mar 20 13:11:30 2017 (r315637) +++ user/pho/stress2/misc/rename9.sh Mon Mar 20 14:17:00 2017 (r315638) @@ -116,12 +116,14 @@ main(void) bzero(&fa, sizeof(fa)); bzero(&ta, sizeof(ta)); - if ((fd = open(fromFile, O_RDWR | O_CREAT | O_TRUNC, 0644)) == -1) + if ((fd = open(fromFile, O_RDWR | O_CREAT | O_TRUNC, 0644)) + == -1) err(1, "creat(%s)", fromFile); close(fd); sprintf(toFile, "toFile.log.%05d", i); - if ((fd = open(toFile, O_RDWR | O_CREAT | O_TRUNC, 0644)) == -1) + if ((fd = open(toFile, O_RDWR | O_CREAT | O_TRUNC, 0644)) + == -1) err(1, "creat(%s)", toFile); write(fd, "xxx", 3); close(fd); @@ -135,22 +137,27 @@ main(void) err(1, "stat(%s)", toFile); if (tb.st_ino == ta.st_ino) { - fprintf(stderr, "FAIL: old and new \"To\" inode number is identical\n"); + fprintf(stderr, "FAIL: old and new \"To\" inode " + "number is identical\n"); fprintf(stderr, "stat() before the rename():\n"); fprintf(stderr, - "%-16s: ino = %4d, nlink = %d, size = %jd\n", - fromFile, fb.st_ino, fb.st_nlink, fb.st_blocks); + "%-16s: ino = %4ju, nlink = %ju, size = %jd\n", + fromFile, (uintmax_t)fb.st_ino, (uintmax_t)fb.st_nlink, + fb.st_blocks); fprintf(stderr, - "%-16s: ino = %4d, nlink = %d, size = %jd\n", - toFile, tb.st_ino, tb.st_nlink, tb.st_blocks); + "%-16s: ino = %4ju, nlink = %ju, size = %jd\n", + toFile, (uintmax_t)tb.st_ino, (uintmax_t)tb.st_nlink, + tb.st_blocks); fprintf(stderr, "\nstat() after the rename():\n"); if (fa.st_ino != 0) fprintf(stderr, - "%-16s: ino = %4d, nlink = %d, size = %jd\n", - fromFile, fa.st_ino, fa.st_nlink, fa.st_blocks); + "%-16s: ino = %4ju, nlink = %ju, size = " + "%jd\n", fromFile, (uintmax_t)fa.st_ino, + (uintmax_t)fa.st_nlink, fa.st_blocks); fprintf(stderr, - "%-16s: ino = %4d, nlink = %d, size = %jd\n", - toFile, ta.st_ino, ta.st_nlink, ta.st_blocks); + "%-16s: ino = %4ju, nlink = %ju, size = %jd\n", + toFile, (uintmax_t)ta.st_ino, (uintmax_t)ta.st_nlink, + ta.st_blocks); kill(spid, SIGINT); exit(1); } Modified: user/pho/stress2/misc/tmpfs8.sh ============================================================================== --- user/pho/stress2/misc/tmpfs8.sh Mon Mar 20 13:11:30 2017 (r315637) +++ user/pho/stress2/misc/tmpfs8.sh Mon Mar 20 14:17:00 2017 (r315638) @@ -140,10 +140,12 @@ main(void) if (r1 == 0 && r2 == 0 && bcmp(&sb1, &sb2, sizeof(sb1)) == 0) { fprintf(stderr, "FAIL 1\n"); - fprintf(stderr, "%-15s: ino = %4d, nlink = %d, size = %jd\n", - logfile, sb1.st_ino, sb1.st_nlink, sb1.st_blocks); - fprintf(stderr, "%-15s: ino = %4d, nlink = %d, size = %jd\n", - new , sb2.st_ino, sb2.st_nlink, sb2.st_blocks); + fprintf(stderr, "%-15s: ino = %4ju, nlink = %ju, " + "size = %jd\n", logfile, (uintmax_t)sb1.st_ino, + (uintmax_t)sb1.st_nlink, sb1.st_blocks); + fprintf(stderr, "%-15s: ino = %4ju, nlink = %ju, " + "size = %jd\n", new , (uintmax_t)sb2.st_ino, + (uintmax_t)sb2.st_nlink, sb2.st_blocks); } if (bcmp(&sb2, &sb3, sizeof(sb2)) == 0) { fprintf(stderr, "Old to file is lingering\n"); @@ -152,16 +154,20 @@ main(void) fprintf(stderr, "FAIL 2\n"); if (r1 == 0) fprintf(stderr, - "sb1: %-15s: ino = %4d, nlink = %d, size = %jd\n", - logfile, sb1.st_ino, sb1.st_nlink, sb1.st_blocks); + "sb1: %-15s: ino = %4ju, nlink = %ju, " + "size = %jd\n", logfile, + (uintmax_t)sb1.st_ino, + (uintmax_t)sb1.st_nlink, sb1.st_blocks); if (r2 == 0) fprintf(stderr, - "sb2: %-15s: ino = %4d, nlink = %d, size = %jd\n", - new, sb2.st_ino, sb2.st_nlink, sb2.st_blocks); + "sb2: %-15s: ino = %4ju, nlink = %ju, " + "size = %jd\n", new, (uintmax_t)sb2.st_ino, + (uintmax_t)sb2.st_nlink, sb2.st_blocks); if (r3 == 0) fprintf(stderr, - "sb3: %-15s: ino = %4d, nlink = %d, size = %jd\n", - new , sb3.st_ino, sb3.st_nlink, sb3.st_blocks); + "sb3: %-15s: ino = %4ju, nlink = %ju, " + "size = %jd\n", new, (uintmax_t)sb3.st_ino, + (uintmax_t)sb3.st_nlink, sb3.st_blocks); exit(1); } unlink(new); From owner-svn-src-user@freebsd.org Tue Mar 21 08:23:46 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3E335D16947 for ; Tue, 21 Mar 2017 08:23:46 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id F19771A2E; Tue, 21 Mar 2017 08:23:45 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2L8Njmj001020; Tue, 21 Mar 2017 08:23:45 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2L8NjMN001019; Tue, 21 Mar 2017 08:23:45 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703210823.v2L8NjMN001019@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 21 Mar 2017 08:23:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315663 - user/pho/stress2/lib X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2017 08:23:46 -0000 Author: pho Date: Tue Mar 21 08:23:44 2017 New Revision: 315663 URL: https://svnweb.freebsd.org/changeset/base/315663 Log: Change exit status to indicate test program failures. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/lib/main.c Modified: user/pho/stress2/lib/main.c ============================================================================== --- user/pho/stress2/lib/main.c Tue Mar 21 06:39:49 2017 (r315662) +++ user/pho/stress2/lib/main.c Tue Mar 21 08:23:44 2017 (r315663) @@ -30,6 +30,9 @@ #include __FBSDID("$FreeBSD$"); +#include +#include + #include #include #include @@ -38,8 +41,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include "stress.h" @@ -50,9 +51,9 @@ volatile int done_testing; static int cleanupcalled = 0; char *home; -static pid_t *r; +static pid_t *r; -void +static void handler(int i __unused) { int j; @@ -77,21 +78,21 @@ handler(int i __unused) } } -void +static void run_test_handler(int i __unused) { done_testing = 1; } -void +static void exit_handler(int i __unused) { - exit(1); + _exit(1); } -void +static void callcleanup(void) { if (cleanupcalled == 0) @@ -103,6 +104,7 @@ static void run_tests(int i) { time_t start; + int e; signal(SIGHUP, run_test_handler); signal(SIGINT, exit_handler); @@ -111,21 +113,22 @@ run_tests(int i) setup(i); if ((strcmp(getprogname(), "run") != 0) && (op->nodelay == 0)) sleep(random_int(1,10)); + e = 0; start = time(NULL); - while (done_testing == 0 && + while (done_testing == 0 && e == 0 && (time(NULL) - start) < op->run_time) { - test(); + e = test(); } callcleanup(); - exit(EXIT_SUCCESS); + exit(e); } static void run_incarnations(void) { - int i; - int s; + int e, i, s; + e = 0; signal(SIGHUP, handler); for (i = 0; i < op->incarnations && done_testing == 0; i++) { if ((r[i] = fork()) == 0) { @@ -137,11 +140,14 @@ run_incarnations(void) break; } } - for (i = 0; i < op->incarnations; i++) + for (i = 0; i < op->incarnations; i++) { if (r[i] != 0 && waitpid(r[i], &s, 0) == -1) warn("waitpid(%d), %s:%d", r[i], __FILE__, __LINE__); + if (s != 0) + e = 1; + } - exit(EXIT_SUCCESS); + exit(e); } static int @@ -169,7 +175,7 @@ run_test(void) (time(NULL) - start) < op->run_time) { sleep(1); if (waitpid(p, &status, WNOHANG) == p) - return (status); + return (status != 0); } if (kill(p, SIGHUP) == -1) warn("kill(%d, SIGHUP), %s:%d", p, __FILE__, __LINE__); @@ -177,7 +183,7 @@ run_test(void) if (waitpid(p, &status, 0) == -1) err(1, "waitpid(%d), %s:%d", p, __FILE__, __LINE__); - return (status); + return (status != 0); } int From owner-svn-src-user@freebsd.org Tue Mar 21 08:24:42 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E0C0D169F9 for ; Tue, 21 Mar 2017 08:24:42 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id EFCDB1C40; Tue, 21 Mar 2017 08:24:41 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2L8OflK001492; Tue, 21 Mar 2017 08:24:41 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2L8Ofwj001491; Tue, 21 Mar 2017 08:24:41 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703210824.v2L8Ofwj001491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 21 Mar 2017 08:24:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315664 - user/pho/stress2/lib X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2017 08:24:42 -0000 Author: pho Date: Tue Mar 21 08:24:40 2017 New Revision: 315664 URL: https://svnweb.freebsd.org/changeset/base/315664 Log: Limit number of retries. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/lib/resources.c Modified: user/pho/stress2/lib/resources.c ============================================================================== --- user/pho/stress2/lib/resources.c Tue Mar 21 08:23:44 2017 (r315663) +++ user/pho/stress2/lib/resources.c Tue Mar 21 08:24:40 2017 (r315664) @@ -157,25 +157,23 @@ void cleanupdf() void getdf(int64_t *block, int64_t *inode) { - int i, j; + int i; char buf[128]; snprintf(lockpath, sizeof(lockpath), "%s/lock", op->cd); - for (j = 0; j < 10; j++) { - for (i = 0; i < 10000; i++) { - if ((lockfd = open(lockpath, - O_CREAT | O_TRUNC | O_WRONLY | O_EXCL, 0644)) != -1) - break; - usleep(10000); /* sleep 1/100 sec */ - if (i > 0 && i % 1000 == 0) - fprintf(stderr, "%s is waiting for lock file %s\n", - getprogname(), lockpath); - } - if (lockfd != -1) + for (i = 0; i < 10000; i++) { + if ((lockfd = open(lockpath, + O_CREAT | O_TRUNC | O_WRONLY | O_EXCL, 0644)) != -1) break; - fprintf(stderr, "%s. Removing stale %s\n", getprogname(), lockpath); - unlink(lockpath); + usleep(10000); /* sleep 1/100 sec */ + if (i > 0 && i % 1000 == 0) + fprintf(stderr, "%s is waiting for lock file %s\n", + getprogname(), lockpath); } + if (lockfd != -1) + break; + fprintf(stderr, "%s. Removing stale %s\n", getprogname(), lockpath); + unlink(lockpath); if (lockfd == -1) errx(1, "%s. Can not create %s\n", getprogname(), lockpath); snprintf(dfpath, sizeof(dfpath), "%s/df", op->cd); From owner-svn-src-user@freebsd.org Tue Mar 21 08:39:37 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96B5FD16ED1 for ; Tue, 21 Mar 2017 08:39:37 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 6698C1B04; Tue, 21 Mar 2017 08:39:37 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2L8daix006393; Tue, 21 Mar 2017 08:39:36 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2L8daS5006392; Tue, 21 Mar 2017 08:39:36 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703210839.v2L8daS5006392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Tue, 21 Mar 2017 08:39:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315669 - user/pho/stress2/lib X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2017 08:39:37 -0000 Author: pho Date: Tue Mar 21 08:39:36 2017 New Revision: 315669 URL: https://svnweb.freebsd.org/changeset/base/315669 Log: Missed to remove a break from the loop. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/lib/resources.c Modified: user/pho/stress2/lib/resources.c ============================================================================== --- user/pho/stress2/lib/resources.c Tue Mar 21 08:38:12 2017 (r315668) +++ user/pho/stress2/lib/resources.c Tue Mar 21 08:39:36 2017 (r315669) @@ -170,8 +170,6 @@ getdf(int64_t *block, int64_t *inode) fprintf(stderr, "%s is waiting for lock file %s\n", getprogname(), lockpath); } - if (lockfd != -1) - break; fprintf(stderr, "%s. Removing stale %s\n", getprogname(), lockpath); unlink(lockpath); if (lockfd == -1) From owner-svn-src-user@freebsd.org Tue Mar 21 11:56:22 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84B2FD1537A for ; Tue, 21 Mar 2017 11:56:22 +0000 (UTC) (envelope-from des@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 mx1.freebsd.org (Postfix) with ESMTPS id 47B6213DF; Tue, 21 Mar 2017 11:56:22 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2LBuLeW089381; Tue, 21 Mar 2017 11:56:21 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2LBuLxr089379; Tue, 21 Mar 2017 11:56:21 GMT (envelope-from des@FreeBSD.org) Message-Id: <201703211156.v2LBuLxr089379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Tue, 21 Mar 2017 11:56:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315679 - user/des/sizes X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2017 11:56:22 -0000 Author: des Date: Tue Mar 21 11:56:21 2017 New Revision: 315679 URL: https://svnweb.freebsd.org/changeset/base/315679 Log: Add max_align_t if available. Add intN_t just for s & g. Use . Modified: user/des/sizes/Makefile user/des/sizes/sizes.c Modified: user/des/sizes/Makefile ============================================================================== --- user/des/sizes/Makefile Tue Mar 21 11:26:31 2017 (r315678) +++ user/des/sizes/Makefile Tue Mar 21 11:56:21 2017 (r315679) @@ -1,12 +1,6 @@ # $FreeBSD$ -.POSIX: - PROG = sizes -CC = c99 -CFLAGS = # none - -all: ${PROG} +MAN1 = # none -clean: - -rm ${PROG} +.include Modified: user/des/sizes/sizes.c ============================================================================== --- user/des/sizes/sizes.c Tue Mar 21 11:26:31 2017 (r315678) +++ user/des/sizes/sizes.c Tue Mar 21 11:56:21 2017 (r315679) @@ -79,7 +79,7 @@ typedef void (*func_ptr)(void); printf("%-12s %12zd %12zd\n", #type, \ sizeof(type) * 8, \ offsetof(struct s_##t, t) * 8); \ - } while (0) + } while (0) static void sizes(void) @@ -87,10 +87,15 @@ sizes(void) printf("type size alignment\n"); printf("--------------------------------------\n"); describe(char); + describe(wchar_t); describe(short); describe(int); describe(long); describe(long long); + describe(int8_t); + describe(int16_t); + describe(int32_t); + describe(int64_t); describe(intmax_t); describe(float); describe(double); @@ -100,7 +105,9 @@ sizes(void) describe(time_t); describe(void_ptr); describe(func_ptr); - describe(wchar_t); +#if __STDC_VERSION__ >= 201112L + describe(max_align_t); +#endif describe(sig_atomic_t); } From owner-svn-src-user@freebsd.org Wed Mar 22 08:54:04 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 099B3D16AF2 for ; Wed, 22 Mar 2017 08:54:04 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id CB4A91D74; Wed, 22 Mar 2017 08:54:03 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2M8s2X9010901; Wed, 22 Mar 2017 08:54:02 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2M8s2ll010899; Wed, 22 Mar 2017 08:54:02 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703220854.v2M8s2ll010899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 22 Mar 2017 08:54:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315706 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 08:54:04 -0000 Author: pho Date: Wed Mar 22 08:54:02 2017 New Revision: 315706 URL: https://svnweb.freebsd.org/changeset/base/315706 Log: Just ignore test if "kldload pty" fails. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/pty.sh user/pho/stress2/misc/pty2.sh Modified: user/pho/stress2/misc/pty.sh ============================================================================== --- user/pho/stress2/misc/pty.sh Wed Mar 22 07:54:29 2017 (r315705) +++ user/pho/stress2/misc/pty.sh Wed Mar 22 08:54:02 2017 (r315706) @@ -40,7 +40,7 @@ . ../default.cfg -kldstat -v | grep -q pty || { kldload pty || exit 1; } +kldstat -v | grep -q pty || { kldload pty || exit 0; } here=`pwd` cd /tmp Modified: user/pho/stress2/misc/pty2.sh ============================================================================== --- user/pho/stress2/misc/pty2.sh Wed Mar 22 07:54:29 2017 (r315705) +++ user/pho/stress2/misc/pty2.sh Wed Mar 22 08:54:02 2017 (r315706) @@ -39,7 +39,7 @@ . ../default.cfg -kldstat -v | grep -q pty || { kldload pty || exit 1; } +kldstat -v | grep -q pty || { kldload pty || exit 0; } here=`pwd` cd /tmp From owner-svn-src-user@freebsd.org Wed Mar 22 08:55:33 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E3F77D16B15 for ; Wed, 22 Mar 2017 08:55:33 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id B431C1E6E; Wed, 22 Mar 2017 08:55:33 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2M8tWvd011016; Wed, 22 Mar 2017 08:55:32 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2M8tWBH011015; Wed, 22 Mar 2017 08:55:32 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703220855.v2M8tWBH011015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Wed, 22 Mar 2017 08:55:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315707 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 08:55:34 -0000 Author: pho Date: Wed Mar 22 08:55:32 2017 New Revision: 315707 URL: https://svnweb.freebsd.org/changeset/base/315707 Log: Just ignore this test if /dev/sndstat is not found. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/sndstat.sh Modified: user/pho/stress2/misc/sndstat.sh ============================================================================== --- user/pho/stress2/misc/sndstat.sh Wed Mar 22 08:54:02 2017 (r315706) +++ user/pho/stress2/misc/sndstat.sh Wed Mar 22 08:55:32 2017 (r315707) @@ -36,7 +36,7 @@ . ../default.cfg -[ -r /dev/sndstat ] || exit 1 +[ -r /dev/sndstat ] || exit 0 here=`pwd` cd /tmp From owner-svn-src-user@freebsd.org Wed Mar 22 22:01:54 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7327ED187BB for ; Wed, 22 Mar 2017 22:01:54 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id 3C126852; Wed, 22 Mar 2017 22:01:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MM1rNa040316; Wed, 22 Mar 2017 22:01:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MM1rfN040315; Wed, 22 Mar 2017 22:01:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703222201.v2MM1rfN040315@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Mar 2017 22:01:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315748 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 22:01:54 -0000 Author: gjb Date: Wed Mar 22 22:01:53 2017 New Revision: 315748 URL: https://svnweb.freebsd.org/changeset/base/315748 Log: Update the send_completed_email() output. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Wed Mar 22 21:59:04 2017 (r315747) +++ user/gjb/thermite/thermite.sh Wed Mar 22 22:01:53 2017 (r315748) @@ -250,8 +250,8 @@ send_completed_email() { [ -z "${emailsentfrom}" ] && return 0 local _body local _subject - _subject="Snapshot builds completed" - _body="Weeee!" + _subject="$(hostname -s) snapshot builds completed" + _body="$(uname -r)" printf "From: ${emailsentfrom}\nTo: ${emailgoesto}\nSubject: ${_subject}\n\n${_body}\n\n" \ | /usr/sbin/sendmail -oi -f ${emailsentfrom} ${emailgoesto} From owner-svn-src-user@freebsd.org Wed Mar 22 22:16:13 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72D86D18AF4 for ; Wed, 22 Mar 2017 22:16:13 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id 4060BFB9; Wed, 22 Mar 2017 22:16:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MMGC4n044453; Wed, 22 Mar 2017 22:16:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MMGC5J044452; Wed, 22 Mar 2017 22:16:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703222216.v2MMGC5J044452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Mar 2017 22:16:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315750 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 22:16:13 -0000 Author: gjb Date: Wed Mar 22 22:16:12 2017 New Revision: 315750 URL: https://svnweb.freebsd.org/changeset/base/315750 Log: Bump the copyright year, forgotten in r315748. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Wed Mar 22 22:06:48 2017 (r315749) +++ user/gjb/thermite/thermite.sh Wed Mar 22 22:16:12 2017 (r315750) @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2013-2015 The FreeBSD Foundation +# Copyright (c) 2013-2017 The FreeBSD Foundation # Copyright (c) 2012, 2013 Glen Barber # All rights reserved. # From owner-svn-src-user@freebsd.org Wed Mar 22 22:19:15 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9079AD18B50 for ; Wed, 22 Mar 2017 22:19:15 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id 4752610D3; Wed, 22 Mar 2017 22:19:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MMJE8L044596; Wed, 22 Mar 2017 22:19:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MMJETx044595; Wed, 22 Mar 2017 22:19:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703222219.v2MMJETx044595@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Mar 2017 22:19:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315751 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 22:19:15 -0000 Author: gjb Date: Wed Mar 22 22:19:14 2017 New Revision: 315751 URL: https://svnweb.freebsd.org/changeset/base/315751 Log: Remove the mk-vmimage.sh script, deprecated by release/Makefile.mirrors. Sponsored by: The FreeBSD Foundation Deleted: user/gjb/thermite/mk-vmimage.sh From owner-svn-src-user@freebsd.org Wed Mar 22 22:20:48 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C4A5D18B9B for ; Wed, 22 Mar 2017 22:20:48 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id 3432411F9; Wed, 22 Mar 2017 22:20:48 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MMKlxG044711; Wed, 22 Mar 2017 22:20:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MMKlnm044710; Wed, 22 Mar 2017 22:20:47 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703222220.v2MMKlnm044710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Mar 2017 22:20:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315752 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 22:20:48 -0000 Author: gjb Date: Wed Mar 22 22:20:47 2017 New Revision: 315752 URL: https://svnweb.freebsd.org/changeset/base/315752 Log: Remove a configuration file that will be pulled in with a following commit. Sponsored by: The FreeBSD Foundation Deleted: user/gjb/thermite/master.conf From owner-svn-src-user@freebsd.org Wed Mar 22 22:46:07 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 346FDD1844E for ; Wed, 22 Mar 2017 22:46:07 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id F0CC17EF; Wed, 22 Mar 2017 22:46:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MMk6DT056922; Wed, 22 Mar 2017 22:46:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MMk45E056899; Wed, 22 Mar 2017 22:46:04 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703222246.v2MMk45E056899@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Mar 2017 22:46:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315756 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 22:46:07 -0000 Author: gjb Date: Wed Mar 22 22:46:03 2017 New Revision: 315756 URL: https://svnweb.freebsd.org/changeset/base/315756 Log: Make the version of the snapshot configuration files public, based on several inquiries to do so. These cover the head, stable/11, and stable/10 branches, and all architectures snapshots are produced therein. Sponsored by: The FreeBSD Foundation Added: user/gjb/thermite/10-amd64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/10-armv6-BEAGLEBONE-snap.conf (contents, props changed) user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf (contents, props changed) user/gjb/thermite/10-armv6-GUMSTIX-snap.conf (contents, props changed) user/gjb/thermite/10-armv6-PANDABOARD-snap.conf (contents, props changed) user/gjb/thermite/10-armv6-RPI-B-snap.conf (contents, props changed) user/gjb/thermite/10-armv6-WANDBOARD-snap.conf (contents, props changed) user/gjb/thermite/10-i386-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/10-ia64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/10-powerpc-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf (contents, props changed) user/gjb/thermite/10-sparc64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/11-aarch64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-BANANAPI-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-BEAGLEBONE-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-CUBIEBOARD-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-CUBIEBOARD2-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-GUMSTIX-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-PANDABOARD-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-RPI-B-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-RPI2-snap.conf (contents, props changed) user/gjb/thermite/11-armv6-WANDBOARD-snap.conf (contents, props changed) user/gjb/thermite/11-i386-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/11-powerpc-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/11-powerpc64-GENERIC64-snap.conf (contents, props changed) user/gjb/thermite/11-sparc64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/12-aarch64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/12-amd64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-BANANAPI-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-BEAGLEBONE-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-CUBIEBOARD-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-CUBIEBOARD2-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-CUBOX-HUMMINGBOARD-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-GUMSTIX-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-PANDABOARD-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-RPI-B-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-RPI2-snap.conf (contents, props changed) user/gjb/thermite/12-armv6-WANDBOARD-snap.conf (contents, props changed) user/gjb/thermite/12-i386-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/12-powerpc-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/12-powerpc64-GENERIC64-snap.conf (contents, props changed) user/gjb/thermite/12-powerpcspe-MPC85XXSPE-snap.conf (contents, props changed) user/gjb/thermite/12-sparc64-GENERIC-snap.conf (contents, props changed) user/gjb/thermite/builds-10.conf (contents, props changed) user/gjb/thermite/builds-11.conf (contents, props changed) user/gjb/thermite/builds-12.conf (contents, props changed) user/gjb/thermite/defaults-10.conf (contents, props changed) user/gjb/thermite/defaults-11.conf (contents, props changed) user/gjb/thermite/defaults-12.conf (contents, props changed) user/gjb/thermite/main.conf (contents, props changed) Modified: user/gjb/thermite/11-amd64-GENERIC-snap.conf Added: user/gjb/thermite/10-amd64-GENERIC-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-amd64-GENERIC-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,18 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +TARGET="amd64" +TARGET_ARCH="amd64" + +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +WITH_VMIMAGES=1 +WITH_COMPRESSED_VMIMAGES=1 +WITH_CLOUDWARE=1 Added: user/gjb/thermite/10-armv6-BEAGLEBONE-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-armv6-BEAGLEBONE-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-beaglebone" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL_FLAGS="-j6" +KERNEL="BEAGLEBONE" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-armv6-CUBOX-HUMMINGBOARD-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard" +FAT_SIZE="50m -b 16384" +FAT_TYPE="16" +IMAGE_SIZE="495M" +KERNEL_FLAGS="-j6" +KERNEL="IMX6" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" +export BOARDNAME="CUBOX-HUMMINGBOARD" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard" + UBOOT_FILES="u-boot.imx" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ + of=/dev/${mddev} bs=512 seek=2 + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/10-armv6-GUMSTIX-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-armv6-GUMSTIX-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-duovero" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL_FLAGS="-j6" +KERNEL="GUMSTIX" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/10-armv6-PANDABOARD-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-armv6-PANDABOARD-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-pandaboard" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="480M" +KERNEL_FLAGS="-j6" +KERNEL="PANDABOARD" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/10-armv6-RPI-B-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-armv6-RPI-B-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,66 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-rpi" +FAT_SIZE="17m" +FAT_TYPE="16" +IMAGE_SIZE="480M" +KERNEL_FLAGS="-j6" +KERNEL="RPI-B" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi" + UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \ + start.elf start_cd.elf u-boot.img" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + for _UF in ${UBOOT_FILES}; do + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ + ${FATMOUNT}/${_UF} + done + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/dtb/rpi.dtb \ + ${FATMOUNT}/rpi.dtb + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/10-armv6-WANDBOARD-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-armv6-WANDBOARD-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-wandboard" +FAT_SIZE="50m -b 16384" +FAT_TYPE="16" +IMAGE_SIZE="495M" +KERNEL_FLAGS="-j6" +KERNEL="IMX6" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" +export BOARDNAME="WANDBOARD" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard" + UBOOT_FILES="u-boot.imx" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ + of=/dev/${mddev} bs=512 seek=2 + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/10-i386-GENERIC-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-i386-GENERIC-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +TARGET="i386" +TARGET_ARCH="i386" +CHROOT_MAKEENV="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" + +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +WITH_VMIMAGES=1 +WITH_COMPRESSED_VMIMAGES=1 +XZ_THREADS="10" +WITH_CLOUDWARE= Added: user/gjb/thermite/10-ia64-GENERIC-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-ia64-GENERIC-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,14 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +TARGET="ia64" +TARGET_ARCH="ia64" + +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" Added: user/gjb/thermite/10-powerpc-GENERIC-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-powerpc-GENERIC-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +TARGET="powerpc" +TARGET_ARCH="powerpc" +WORLD_FLAGS="-j10" + +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" Added: user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-powerpc64-GENERIC64-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,16 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +KERNEL="GENERIC64" +TARGET="powerpc" +TARGET_ARCH="powerpc64" +WORLD_FLAGS="-j10" + +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" Added: user/gjb/thermite/10-sparc64-GENERIC-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/10-sparc64-GENERIC-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,14 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="10" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +TARGET="sparc64" +TARGET_ARCH="sparc64" + +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" Added: user/gjb/thermite/11-aarch64-GENERIC-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-aarch64-GENERIC-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,33 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +TARGET="arm64" +TARGET_ARCH="aarch64" + +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +NOPORTS= +WITH_VMIMAGES=1 +WITH_COMPRESSED_VMIMAGES=1 + +buildenv_setup() { + if [ ! -d ${CHROOTDIR}/usr/ports/devel/aarch64-binutils ]; then + chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg bootstrap -y + chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \ + /usr/sbin/pkg install -y devel/aarch64-binutils + else + chroot ${CHROOTDIR} env BATCH=1 \ + make -C /usr/ports/devel/aarch64-binutils \ + all install clean + fi + return 0 +} + Modified: user/gjb/thermite/11-amd64-GENERIC-snap.conf ============================================================================== --- user/gjb/thermite/11-amd64-GENERIC-snap.conf Wed Mar 22 22:29:14 2017 (r315755) +++ user/gjb/thermite/11-amd64-GENERIC-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -3,25 +3,16 @@ # $FreeBSD$ # -# Sample configuration file for building a head/ snapshot using -# thermite.sh. +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" -CHROOTDIR="/scratch/11-amd64-GENERIC-snap" -CHROOTBUILD_SKIP=1 -SVNROOT="svn://svn.FreeBSD.org/" -SRCBRANCH="base/head@${_SVNREV}" -DOCBRANCH="doc/head@rHEAD" -PORTBRANCH="ports/head@rHEAD" -WORLD_FLAGS="-j10" -KERNEL_FLAGS="-j8" -KERNEL="GENERIC" TARGET="amd64" TARGET_ARCH="amd64" -NODOC=1 -NOPORTS=1 -# svn revision to build. Do not include leading 'r'. -_SVNREV="262657" -# Date the build was started. -DATE="20140301" +__CONFIG_NAME="${BUILDBRANCH}-${TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" +WITH_VMIMAGES=1 +WITH_COMPRESSED_VMIMAGES=1 +WITH_CLOUDWARE=1 Added: user/gjb/thermite/11-armv6-BANANAPI-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-armv6-BANANAPI-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-bananapi" +FAT_SIZE="32m -b 1m" +FAT_TYPE="16" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="ALLWINNER" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" +export BOARDNAME="BANANAPI" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-bananapi" + UBOOT_FILES="u-boot-sunxi-with-spl.bin" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ + of=/dev/${mddev} bs=1k seek=8 conv=sync + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/11-armv6-BEAGLEBONE-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-armv6-BEAGLEBONE-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-beaglebone" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="BEAGLEBONE" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/11-armv6-CUBIEBOARD-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-armv6-CUBIEBOARD-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-cubieboard" +FAT_SIZE="32m -b 1m" +FAT_TYPE="16" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="ALLWINNER_UP" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" +export BOARDNAME="CUBIEBOARD" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard" + UBOOT_FILES="u-boot-sunxi-with-spl.bin" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ + of=/dev/${mddev} bs=1k seek=8 conv=sync + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/11-armv6-CUBIEBOARD2-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-armv6-CUBIEBOARD2-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-cubieboard2" +FAT_SIZE="32m -b 1m" +FAT_TYPE="16" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="ALLWINNER" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" +export BOARDNAME="CUBIEBOARD2" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard2" + UBOOT_FILES="u-boot-sunxi-with-spl.bin" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ + of=/dev/${mddev} bs=1k seek=8 conv=sync + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-armv6-CUBOX-HUMMINGBOARD-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,62 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard" +FAT_SIZE="50m -b 16384" +FAT_TYPE="16" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="IMX6" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000" +export BOARDNAME="CUBOX-HUMMINGBOARD" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubox-hummingboard" + UBOOT_FILES="u-boot.imx" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \ + of=/dev/${mddev} bs=512 seek=2 + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/11-armv6-GUMSTIX-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-armv6-GUMSTIX-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-duovero" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="GUMSTIX" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then + load_stage_env +fi + +arm_install_uboot() { + UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero" + FATMOUNT="${DESTDIR%${KERNEL}}/fat" + UFSMOUNT="${DESTDIR%${KERNEL}}/ufs" + chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}" + chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} + chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT} + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO + chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr + chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \ + ${FATMOUNT}/ubldr.bin + chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot + sync + umount_loop ${CHROOTDIR}/${FATMOUNT} + umount_loop ${CHROOTDIR}/${UFSMOUNT} + chroot ${CHROOTDIR} rmdir ${FATMOUNT} + chroot ${CHROOTDIR} rmdir ${UFSMOUNT} + + return 0 +} Added: user/gjb/thermite/11-armv6-PANDABOARD-snap.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/11-armv6-PANDABOARD-snap.conf Wed Mar 22 22:46:03 2017 (r315756) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +BUILDBRANCH="11" + +. "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" + +export RELENGDIR="$(realpath $(dirname $(basename ${0})))/../release" + +EMBEDDED_TARGET_ARCH="armv6" +EMBEDDED_TARGET="arm" +EMBEDDEDBUILD=1 +EMBEDDEDPORTS="sysutils/u-boot-pandaboard" +FAT_SIZE="2m" +FAT_TYPE="12" +IMAGE_SIZE="1G" +KERNEL_FLAGS="-j6" +KERNEL="PANDABOARD" +MD_ARGS="-x 63 -y 255" +NODOC=1 +NOPORTS= +PART_SCHEME="MBR" +WORLD_FLAGS="-j10" +WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000" + +export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${KERNEL}-${BUILDTYPE}" +export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" + +load_stage_env() { + TARGET=${EMBEDDED_TARGET} + TARGET_ARCH=${EMBEDDED_TARGET_ARCH} +} + +if [ ! -z ${FTP_STAGING} ]; then *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-user@freebsd.org Wed Mar 22 22:48:17 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A865BD18498 for ; Wed, 22 Mar 2017 22:48:17 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id 759868FF; Wed, 22 Mar 2017 22:48:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MMmGEH057040; Wed, 22 Mar 2017 22:48:16 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MMmGCS057036; Wed, 22 Mar 2017 22:48:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703222248.v2MMmGCS057036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Mar 2017 22:48:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315757 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 22:48:17 -0000 Author: gjb Date: Wed Mar 22 22:48:16 2017 New Revision: 315757 URL: https://svnweb.freebsd.org/changeset/base/315757 Log: Add extra helper scripts for thermite.sh. Sponsored by: The FreeBSD Foundation Added: user/gjb/thermite/generate-email.pl (contents, props changed) user/gjb/thermite/get-checksums.sh (contents, props changed) user/gjb/thermite/setrev.sh (contents, props changed) user/gjb/thermite/zfs-setup.sh (contents, props changed) Added: user/gjb/thermite/generate-email.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/generate-email.pl Wed Mar 22 22:48:16 2017 (r315757) @@ -0,0 +1,266 @@ +#!/usr/bin/env perl +# +# $FreeBSD$ +# + +use strict; +use warnings; +use locale; + +use Getopt::Std; +use File::Basename; + +my $prog = basename($0); + +our $opt_h; +our $builddate; +our $svnrev; +our $junk = ""; +our $arch = ""; +our $kernel = ""; +our $branch = ""; +our $revision = 0; +our $branchname = ""; +our $version = 0; +our $hasarmv6 = 0; +our $hasarm64 = 0; +our $hasbranch = 0; + +sub usage() { + print("Usage: ./get-checksums.sh -c ./builds-NN.conf | $prog > outfile\n"); + exit(0); +} + +sub main() { + getopts('h'); + my @lines = (); + my @builds = (); + my @amis = (); + my @vmimages = (); + my $endisos = 0; + $builddate = 0; + $svnrev = 0; + $junk = ""; + $arch = ""; + $kernel = ""; + $branch = ""; + $branchname = ""; + $revision = 0; + $version = 0; + $hasbranch = 0; + + if ($opt_h) { + &usage(); + } + + while() { + chomp($_); + push(@lines, $_); + if ($_ =~ m/^== VM IMAGE CHECKSUMS ==/) { + $endisos = 1; + } + if ($_ =~ m/^BUILDDATE/) { + $builddate = $_; + $builddate =~ s/^BUILDDATE=//; + pop(@lines); + next; + } + if ($_ =~ m/^SVNREV/) { + $svnrev = $_; + $svnrev =~ s/^SVNREV=//; + pop(@lines); + next; + } + if ($_ =~ m/^o /) { + $_ =~ s/:$//; + if ($_ =~ m/^o .* armv6 .*/) { + $hasarmv6 = 1; + } + if ($_ =~ m/^o .* aarch64 .*/) { + $hasarm64 = 1; + } + if ($hasbranch eq 0) { + ($junk, $branch, $arch, $kernel) = split(" ", $_); + $revision = $branch; + $revision =~ s/-\w+.*//; + $version = $revision; + $version =~ s/\.\d.*//; + $branchname = $branch; + $branchname =~ s/\d+\.\d-//; + $branchname =~ s/ .*$//; + if ($branchname =~ m/(ALPHA|CURRENT)/) { + $branch = "head"; + } elsif ($branchname =~ m/(BETA|PRERELEASE|RC|STABLE)/) { + $branch = "stable/$version"; + } else { + $branch = "unknown"; + } + $hasbranch = 1; + } + if ($endisos == 0) { + push(@builds, $_); + } else { + push(@vmimages, $_); + } + } + if ($_ =~ m/^Created AMI in /) { + $_ =~ s/^Created AMI in //; + # Exclude ca-central-1 eu-west-2 for now + #if ($_ !~ m/(ca-central-1|eu-west-2)/) { + push(@amis, $_); + pop(@lines); + #} + } + } + + print <" + exit 1 +} + +get_build_rev() { + if [ -e "${svnfile}" -a ! -f "${svnfile}" ]; then + echo "SVN file is not a regular file." + echo "Renaming file." + mv ${svnfile} ${svnfile}.bak.${today} + fi + svnrev=$(svn info ${svnhost}/${branch} | \ + awk -F ': ' '/^Last Changed Rev/ {print $2}') + svnrev=$(echo ${svnrev} | tr -d '[a-z]') + echo ${svnrev} > ${svnfile} +} + +get_build_date() { + if [ -e "${datefile}" -a ! -f "${datefile}" ]; then + echo "SVN file is not a regular file." + echo "Renaming file." + mv ${svnfile} ${svnfile}.bak.${today} + fi + echo ${today} > ${datefile} +} + +main() { + export PATH="/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin" + export TZ='UTC' + export __BUILDCONFDIR="$(dirname $(realpath ${0}))" + svnhost="svn://svn.FreeBSD.org/base" + svnfile="${__BUILDCONFDIR}/svnrev_src" + datefile="${__BUILDCONFDIR}/builddate" + today="$(date +%Y%m%d)" + + while getopts "b:" opt; do + case ${opt} in + b) + branch="${OPTARG}" + ;; + *) + ;; + esac + done + + if [ -z "${branch}" ]; then + echo "Branch not specified." + usage + fi + + get_build_rev + get_build_date +} + +main "$@" Added: user/gjb/thermite/zfs-setup.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/zfs-setup.sh Wed Mar 22 22:48:16 2017 (r315757) @@ -0,0 +1,161 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +usage() { + echo "$(basename ${0}) [-d] -c /path/to/configuration/file" + exit 1 +} + +zfs_teardown() { + for r in ${revs}; do + for a in ${archs}; do + for k in ${kernels}; do + for t in ${types}; do + s="${r}-${a}-${k}-${t}" + c="${r}-${a}-${t}" + if [ -e ${scriptdir}/${s}.conf ]; + then + zfs list ${zfs_parent}/${s}-src >/dev/null 2>&1 + rc=$? + if [ ${rc} -eq 0 ]; then + echo -n "${pfx} Destroying " \ + >/dev/stdout + echo " ${zfs_parent}/${s}-src" \ + >/dev/stdout + zfs destroy -f ${zfs_parent}/${s}-src + fi + zfs list ${zfs_parent}/${s}-ports >/dev/null 2>&1 + rc=$? + if [ ${rc} -eq 0 ]; then + echo -n "${pfx} Destroying " \ + >/dev/stdout + echo " ${zfs_parent}/${s}-ports" \ + >/dev/stdout + zfs destroy -f ${zfs_parent}/${s}-ports + fi + zfs list ${zfs_parent}/${s}-doc >/dev/null 2>&1 + rc=$? + if [ ${rc} -eq 0 ]; then + echo -n "${pfx} Destroying " \ + >/dev/stdout + echo " ${zfs_parent}/${s}-doc" \ + >/dev/stdout + zfs destroy -f ${zfs_parent}/${s}-doc + fi + zfs list ${zfs_parent}/${c}-chroot >/dev/null 2>&1 + rc=$? + if [ ${rc} -eq 0 ]; then + echo -n "${pfx} Destroying " \ + >/dev/stdout + echo " ${zfs_parent}/${c}-chroot" \ + >/dev/stdout + zfs destroy -f ${zfs_parent}/${c}-chroot + fi + zfs list ${zfs_parent}/${s} >/dev/null 2>&1 + rc=$? + if [ ${rc} -eq 0 ]; then + echo -n "${pfx} Destroying " \ + >/dev/stdout + echo " ${zfs_parent}/${s}" \ + >/dev/stdout + zfs destroy -f ${zfs_parent}/${s} + fi + fi + done + done + done + done + + for r in ${revs}; do + for t in ${types}; do + for i in src doc ports; do + zfs list ${zfs_parent}/${r}-${i}-${t}@clone >/dev/null 2>&1 + rc=$? + if [ ${rc} -eq 0 ]; then + echo -n "${pfx} Destroying " \ + >/dev/stdout + echo " ${zfs_parent}/${r}-${i}-${t}@clone" \ + >/dev/stdout + zfs destroy -f ${zfs_parent}/${r}-${i}-${t}@clone + fi + zfs list ${zfs_parent}/${r}-${i}-${t} >/dev/null 2>&1 + rc=$? + if [ ${rc} -eq 0 ]; then + echo -n "${pfx} Destroying " \ + >/dev/stdout + echo " ${zfs_parent}/${r}-${i}-${t}" \ + >/dev/stdout + zfs destroy -f ${zfs_parent}/${r}-${i}-${t} + fi + done + done + done + return 0 +} + +zfs_setup() { + [ ! -z ${delete_only} ] && return 0 + for r in ${revs}; do + for a in ${archs}; do + for k in ${kernels}; do + for t in ${types}; do + s="${r}-${a}-${k}-${t}" + if [ -e ${scriptdir}/${s}.conf ]; + then + echo "${pfx} Creating ${zfs_parent}/${s}" \ + >/dev/stdout + zfs create -o atime=off ${zfs_parent}/${s} + fi + done + done + done + done + return 0 +} + +main() { + export __BUILDCONFDIR="$(dirname $(realpath ${0}))" + CSCONF= + + while getopts "c:d" opt; do + case ${opt} in + c) + CSCONF="${OPTARG}" + ;; + d) + delete_only=1 + ;; + *) + ;; + esac + done + shift $(( ${OPTIND} - 1 )) + + if [ -z "${CSCONF}" ]; then + echo "Build configuration file is required." + usage + fi + + CSCONF="$(realpath ${CSCONF})" + + if [ ! -f "${CSCONF}" ]; then + echo "Build configuration is not a regular file." + exit 1 + fi + + . "${CSCONF}" + + if [ ${use_zfs} -eq 0 ]; then + echo "== use_zfs is set to '0'; skipping." >/dev/stdout + exit 0 + fi + + pfx="===" + + zfs_teardown + zfs_setup +} + +main "$@" From owner-svn-src-user@freebsd.org Wed Mar 22 22:49:12 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9D48D184B3 for ; Wed, 22 Mar 2017 22:49:12 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id 91F919EE; Wed, 22 Mar 2017 22:49:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2MMnBJk057119; Wed, 22 Mar 2017 22:49:11 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2MMnBd7057118; Wed, 22 Mar 2017 22:49:11 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201703222249.v2MMnBd7057118@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 22 Mar 2017 22:49:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315758 - user/gjb/thermite X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 22:49:12 -0000 Author: gjb Date: Wed Mar 22 22:49:11 2017 New Revision: 315758 URL: https://svnweb.freebsd.org/changeset/base/315758 Log: Add a README.txt explaining the high-level overview of how thermite.sh and related bits work. Sponsored by: The FreeBSD Foundation Added: user/gjb/thermite/README.txt (contents, props changed) Added: user/gjb/thermite/README.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/gjb/thermite/README.txt Wed Mar 22 22:49:11 2017 (r315758) @@ -0,0 +1,88 @@ +# +# $FreeBSD$ +# + +1) Configuration Files: + + - Each architecture and individual kernel have their own configuration file + used by release.sh. Each branch has its own defaults-X.conf file which + contains entries common throughout each architecture, where overrides or + special variables are set and/or overridden in the per-build files. + + The per-build configuration file naming scheme is in the form of: + + ${revision}-${TARGET_ARCH}-${KERNCONF}-${type}.conf + + where the uppercase variables are equivalent to what make(1) uses in the + build system, and lowercase variables are set within the configuration + files, mapping to the major version of the respective branch. + + - Each branch also has its own builds-X.conf file, which is used by + thermite.sh. The thermite.sh script iterates through each ${revision}, + ${TARGET_ARCH}, ${KERNCONF}, and ${type} value, creating a master list + of what to build. However, a given combination from the list will only + be built if the respective configuration file exists, which is where the + naming convention above is relevant. + + - There are two paths of file sourcing: + + - builds-X.conf -> main.conf: + This controls thermite.sh behavior. + + - X-arch-KERNCONF-type.conf -> defaults-X.conf -> main.conf + This controls release/release.sh behavior. + +2) Filesystem Layout: + + - The official release build machines have a specific filesystem layout, + which using ZFS, thermite.sh takes heavy advantage of with clones, + snapshots, etc., ensuring a pristine build environment. + + - The build scripts reside in /releng/scripts-snapshot/scripts or + /releng/scripts-release/scripts respectfully, to avoid collisions between + an RC build from a releng branch versus a STABLE snapshot from the + respective stable branch. + + - A separate dataset exists for the final build images, /snap/ftp. This + directory contains both snapshots and releases directories. They are + only used if the EVERYTHINGISFINE variable is defined in main.conf. + + - As thermite.sh iterates through the master list of combinations and + locates the per-build configuration file, a zfs dataset is created under + the /releng directory, such as /releng/12-amd64-GENERIC-snap. The src, + ports, and doc trees are checked out to separate zfs datasets, such as + /releng/12-src-snap, which are then cloned into the respective build + datasets. This is done to avoid checking out a given tree more than + once. + +3) Helper Scripts: + + - To avoid repetition and possible human error, a few scripts were written + to help keep things as automated as possible: + + - zfs-setup.sh: + Destroys and creates pristine zfs datasets for each build. + + - setrev.sh: + Retrieves the 'Last Changed Revision' from the target branch and writes + the version to a 'svnrev_src' file, and outputs the date in YYYYMMDD + format to a builddate file. + + - get-checksums.sh: + When all builds have completed, this script will iterate through and + generate a list of sha512 and sha256 checksums for all builds. + + - generate-email.pl: + This script generates the snapshot announcement email text. + +4) Example Usage: + + root@builder:~ # mkdir -p /releng/scripts-snapshot/scripts + root@builder:~ # cd /releng/scripts-snapshot/scripts + root@builder:~ # svn co svn://svn.freebsd.org/base/user/gjb/thermite . + root@builder:~ # ./zfs-setup.sh -c ./builds-12.conf + root@builder:~ # ./setrev.sh -b head + root@builder:~ # ./thermite.sh -c ./builds-12.conf + root@builder:~ # ./get-checksums.sh -c ./builds-12.conf | ./generate-email.pl \ + > 12-snap-mail + From owner-svn-src-user@freebsd.org Fri Mar 24 10:24:07 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 967EFCA2A13 for ; Fri, 24 Mar 2017 10:24:07 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 7123E1696; Fri, 24 Mar 2017 10:24:07 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OAO6K1038594; Fri, 24 Mar 2017 10:24:06 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OAO6Eq038593; Fri, 24 Mar 2017 10:24:06 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703241024.v2OAO6Eq038593@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Fri, 24 Mar 2017 10:24:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315897 - user/pho/stress2/lib X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2017 10:24:07 -0000 Author: pho Date: Fri Mar 24 10:24:06 2017 New Revision: 315897 URL: https://svnweb.freebsd.org/changeset/base/315897 Log: Try harder to open lock file. Fix code style while here. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/lib/resources.c Modified: user/pho/stress2/lib/resources.c ============================================================================== --- user/pho/stress2/lib/resources.c Fri Mar 24 09:37:00 2017 (r315896) +++ user/pho/stress2/lib/resources.c Fri Mar 24 10:24:06 2017 (r315897) @@ -72,7 +72,8 @@ inodes(void) buf.f_ffree = 9999; flags = buf.f_flags & MNT_VISFLAGMASK; if (op->verbose > 2) - printf("Free inodes on %s (%s): %jd\n", path, buf.f_mntonname, buf.f_ffree); + printf("Free inodes on %s (%s): %jd\n", path, + buf.f_mntonname, buf.f_ffree); return (buf.f_ffree); } @@ -91,11 +92,13 @@ df(void) if (statfs(path, &buf) < 0) err(1, "statfs(%s)", path); if (buf.f_bavail > (int64_t)buf.f_blocks || buf.f_bavail < 0) { - warnx("Corrupt statfs(%s). f_bavail = %jd!", path, buf.f_bavail); + warnx("Corrupt statfs(%s). f_bavail = %jd!", path, + buf.f_bavail); buf.f_bavail = 100; } if (op->verbose > 2) - printf("Free space on %s: %jd Mb\n", path, buf.f_bavail * buf.f_bsize / 1024 / 1024); + printf("Free space on %s: %jd Mb\n", path, buf.f_bavail * + buf.f_bsize / 1024 / 1024); return (buf.f_bavail * buf.f_bsize); } @@ -157,36 +160,45 @@ void cleanupdf() void getdf(int64_t *block, int64_t *inode) { - int i; + int i, j; char buf[128]; snprintf(lockpath, sizeof(lockpath), "%s/lock", op->cd); - for (i = 0; i < 10000; i++) { - if ((lockfd = open(lockpath, - O_CREAT | O_TRUNC | O_WRONLY | O_EXCL, 0644)) != -1) + for (j = 0; j < 2; j++) { + for (i = 0; i < 10000; i++) { + if ((lockfd = open(lockpath, + O_CREAT | O_TRUNC | O_WRONLY | + O_EXCL, 0644)) != -1) + break; + usleep(10000); /* sleep 1/100 sec */ + if (i > 0 && i % 1000 == 0) + fprintf(stderr, "%s is waiting for lock file" + " %s\n", + getprogname(), lockpath); + } + if (lockfd != -1) break; - usleep(10000); /* sleep 1/100 sec */ - if (i > 0 && i % 1000 == 0) - fprintf(stderr, "%s is waiting for lock file %s\n", - getprogname(), lockpath); + fprintf(stderr, "%s. Removing stale %s\n", getprogname(), + lockpath); + unlink(lockpath); } - fprintf(stderr, "%s. Removing stale %s\n", getprogname(), lockpath); - unlink(lockpath); if (lockfd == -1) - errx(1, "%s. Can not create %s\n", getprogname(), lockpath); + errx(1, "%s. Can not create %s\n", getprogname(), lockpath); snprintf(dfpath, sizeof(dfpath), "%s/df", op->cd); if ((dffd = open(dfpath, O_RDWR, 0644)) == -1) { if ((dffd = open(dfpath, O_CREAT | O_TRUNC | O_WRONLY, 0644)) == -1) { unlink(lockpath); - err(1, "creat(%s) %s:%d", dfpath, __FILE__, __LINE__); + err(1, "creat(%s) %s:%d", dfpath, __FILE__, + __LINE__); } atexit(cleanupdf); *block = df(); *inode = inodes(); snprintf(buf, sizeof(buf), "%jd %jd", *block, *inode); - if (write(dffd, buf, strlen(buf) + 1) != (ssize_t)strlen(buf) +1) + if (write(dffd, buf, strlen(buf) + 1) != + (ssize_t)strlen(buf) +1) err(1, "write df. %s:%d", __FILE__, __LINE__); } else { if (read(dffd, buf, sizeof(buf)) < 1) { @@ -207,7 +219,8 @@ reservedf(int64_t blks, int64_t inos) int64_t blocks, inodes; if ((dffd = open(dfpath, O_RDWR, 0644)) == -1) { - warn("open(%s) %s:%d. %s", dfpath, __FILE__, __LINE__, getprogname()); + warn("open(%s) %s:%d. %s", dfpath, __FILE__, __LINE__, + getprogname()); goto err; } if (read(dffd, buf, sizeof(buf)) < 1) { @@ -218,13 +231,15 @@ reservedf(int64_t blks, int64_t inos) if (op->verbose > 2) printf("%-8s: reservefd(%9jdK, %6jd) out of (%9jdK, %6jd)\n", - getprogname(), blks/1024, inos, blocks/1024, inodes); + getprogname(), blks/1024, inos, blocks/1024, + inodes); blocks -= blks; inodes -= inos; snprintf(buf, sizeof(buf), "%jd %jd", blocks, inodes); if (blocks < 0 || inodes < 0) - printf("******************************** %s: %s\n", getprogname(), buf); + printf("******************************** %s: %s\n", + getprogname(), buf); if (lseek(dffd, 0, 0) == -1) err(1, "lseek. %s:%d", __FILE__, __LINE__); if (write(dffd, buf, strlen(buf) + 1) != (ssize_t)strlen(buf) +1) From owner-svn-src-user@freebsd.org Fri Mar 24 10:25:26 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B99DCA2A32 for ; Fri, 24 Mar 2017 10:25:26 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id 393A017A1; Fri, 24 Mar 2017 10:25:26 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OAPPjS038694; Fri, 24 Mar 2017 10:25:25 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OAPPcH038693; Fri, 24 Mar 2017 10:25:25 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703241025.v2OAPPcH038693@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Fri, 24 Mar 2017 10:25:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315898 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2017 10:25:26 -0000 Author: pho Date: Fri Mar 24 10:25:25 2017 New Revision: 315898 URL: https://svnweb.freebsd.org/changeset/base/315898 Log: Wait longer before timeout. Removed debug print. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/sem_timedwait.sh Modified: user/pho/stress2/misc/sem_timedwait.sh ============================================================================== --- user/pho/stress2/misc/sem_timedwait.sh Fri Mar 24 10:24:06 2017 (r315897) +++ user/pho/stress2/misc/sem_timedwait.sh Fri Mar 24 10:25:25 2017 (r315898) @@ -46,7 +46,6 @@ cd $odir for i in `jot 900`; do date -f %s $((`date +%s` + `jot -r 1 -5 5`)) > /dev/null sleep .`jot -r 1 1 9` - [ $i -eq 900 ] && echo XXX done & pid=$! @@ -77,7 +76,7 @@ main(void) int result; struct timespec ts; - alarm(120); + alarm(600); result = sem_init(&sem, 0, 0); if (result) err(1, "sem_init"); From owner-svn-src-user@freebsd.org Fri Mar 24 10:27:06 2017 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4724CA2A57 for ; Fri, 24 Mar 2017 10:27:06 +0000 (UTC) (envelope-from pho@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 mx1.freebsd.org (Postfix) with ESMTPS id B4AE618AE; Fri, 24 Mar 2017 10:27:06 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OAR5UF038795; Fri, 24 Mar 2017 10:27:05 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OAR5Gr038794; Fri, 24 Mar 2017 10:27:05 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201703241027.v2OAR5Gr038794@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Fri, 24 Mar 2017 10:27:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r315899 - user/pho/stress2/misc X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2017 10:27:07 -0000 Author: pho Date: Fri Mar 24 10:27:05 2017 New Revision: 315899 URL: https://svnweb.freebsd.org/changeset/base/315899 Log: kldload pty if available. Sponsored by: Dell EMC Isilon Modified: user/pho/stress2/misc/full.sh Modified: user/pho/stress2/misc/full.sh ============================================================================== --- user/pho/stress2/misc/full.sh Fri Mar 24 10:25:25 2017 (r315898) +++ user/pho/stress2/misc/full.sh Fri Mar 24 10:27:05 2017 (r315899) @@ -37,6 +37,7 @@ # Fixed by r310547. . ../default.cfg +kldstat -v | grep -q pty || kldload pty # ignore any load failure mount | grep "on $mntpoint " | grep -q /dev/md && umount -f $mntpoint [ -c /dev/md$mdstart ] && mdconfig -d -u $mdstart