From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 14:28:45 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id A19DB2CC;
Sun, 8 Feb 2015 14:28:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 823CAF1F;
Sun, 8 Feb 2015 14:28:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18ESjSQ012782;
Sun, 8 Feb 2015 14:28:45 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18ESi5j012778;
Sun, 8 Feb 2015 14:28:44 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201502081428.t18ESi5j012778@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 8 Feb 2015 14:28:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278380 - in
projects/clang360-import/contrib/llvm/tools/lldb/source: Expression Symbol
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 14:28:45 -0000
Author: emaste
Date: Sun Feb 8 14:28:43 2015
New Revision: 278380
URL: https://svnweb.freebsd.org/changeset/base/278380
Log:
Revert LLDB compatibility changes for Clang 3.5 API
This reverts FreeBSD SVN r275134 and r275127, restoring the following
upstream revisions:
SVN git
214335 59a1f270
214340 42f16b1e
214501 26d6f063
215969 a083c0db
216603 ee9cd340
216810 f534f503
Sponsored by: DARPA, AFRL
Modified:
projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp
projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp
projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
Directory Properties:
projects/clang360-import/ (props changed)
projects/clang360-import/contrib/llvm/ (props changed)
projects/clang360-import/contrib/llvm/tools/lldb/ (props changed)
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Sun Feb 8 11:55:29 2015 (r278379)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp Sun Feb 8 14:28:43 2015 (r278380)
@@ -387,8 +387,8 @@ ClangExpressionParser::Parse (Stream &st
if (!created_main_file)
{
- MemoryBuffer *memory_buffer = MemoryBuffer::getMemBufferCopy(expr_text, __FUNCTION__);
- SourceMgr.setMainFileID(SourceMgr.createFileID(memory_buffer));
+ std::unique_ptr<MemoryBuffer> memory_buffer = MemoryBuffer::getMemBufferCopy(expr_text, __FUNCTION__);
+ SourceMgr.setMainFileID(SourceMgr.createFileID(std::move(memory_buffer)));
}
diag_buf->BeginSourceFile(m_compiler->getLangOpts(), &m_compiler->getPreprocessor());
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Sun Feb 8 11:55:29 2015 (r278379)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp Sun Feb 8 14:28:43 2015 (r278380)
@@ -304,7 +304,7 @@ IRExecutionUnit::GetRunnableInfo(Error &
m_module_ap->getContext().setInlineAsmDiagnosticHandler(ReportInlineAsmError, &error);
- llvm::EngineBuilder builder(m_module_ap.get());
+ llvm::EngineBuilder builder(std::move(m_module_ap));
builder.setEngineKind(llvm::EngineKind::JIT)
.setErrorStr(&error_string)
@@ -333,10 +333,6 @@ IRExecutionUnit::GetRunnableInfo(Error &
error.SetErrorStringWithFormat("Couldn't JIT the function: %s", error_string.c_str());
return;
}
- else
- {
- m_module_ap.release(); // ownership was transferred
- }
// Make sure we see all sections, including ones that don't have relocations...
m_execution_engine_ap->setProcessAllSections(true);
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Sun Feb 8 11:55:29 2015 (r278379)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTContext.cpp Sun Feb 8 14:28:43 2015 (r278380)
@@ -1801,12 +1801,10 @@ ClangASTContext::CreateFunctionType (AST
// TODO: Detect calling convention in DWARF?
FunctionProtoType::ExtProtoInfo proto_info;
proto_info.Variadic = is_variadic;
- proto_info.ExceptionSpecType = EST_None;
+ proto_info.ExceptionSpec = EST_None;
proto_info.TypeQuals = type_quals;
proto_info.RefQualifier = RQ_None;
- proto_info.NumExceptions = 0;
- proto_info.Exceptions = nullptr;
-
+
return ClangASTType (ast, ast->getFunctionType (result_type.GetQualType(),
qual_type_args,
proto_info).getAsOpaquePtr());
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Sun Feb 8 11:55:29 2015 (r278379)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Sun Feb 8 14:28:43 2015 (r278380)
@@ -3488,9 +3488,9 @@ ClangASTType::GetChildClangTypeAtIndex (
child_name.assign(superclass_interface_decl->getNameAsString().c_str());
- std::pair<uint64_t, unsigned> ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
+ clang::TypeInfo ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
- child_byte_size = ivar_type_info.first / 8;
+ child_byte_size = ivar_type_info.Width / 8;
child_byte_offset = 0;
child_is_base_class = true;
@@ -3520,9 +3520,9 @@ ClangASTType::GetChildClangTypeAtIndex (
child_name.assign(ivar_decl->getNameAsString().c_str());
- std::pair<uint64_t, unsigned> ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
+ clang::TypeInfo ivar_type_info = m_ast->getTypeInfo(ivar_qual_type.getTypePtr());
- child_byte_size = ivar_type_info.first / 8;
+ child_byte_size = ivar_type_info.Width / 8;
// Figure out the field offset within the current struct/union/class type
// For ObjC objects, we can't trust the bit offset we get from the Clang AST, since
@@ -6036,7 +6036,7 @@ ClangASTType::DumpValue (ExecutionContex
// Indent and print the base class type name
s->Printf("\n%*s%s ", depth + DEPTH_INCREMENT, "", base_class_type_name.c_str());
- std::pair<uint64_t, unsigned> base_class_type_info = m_ast->getTypeInfo(base_class_qual_type);
+ clang::TypeInfo base_class_type_info = m_ast->getTypeInfo(base_class_qual_type);
// Dump the value of the member
ClangASTType base_clang_type(m_ast, base_class_qual_type);
@@ -6045,7 +6045,7 @@ ClangASTType::DumpValue (ExecutionContex
base_clang_type.GetFormat(), // The format with which to display the member
data, // Data buffer containing all bytes for this type
data_byte_offset + field_byte_offset,// Offset into "data" where to grab value from
- base_class_type_info.first / 8, // Size of this type in bytes
+ base_class_type_info.Width / 8, // Size of this type in bytes
0, // Bitfield bit size
0, // Bitfield bit offset
show_types, // Boolean indicating if we should show the variable types
@@ -6075,7 +6075,7 @@ ClangASTType::DumpValue (ExecutionContex
// Print the member type if requested
// Figure out the type byte size (field_type_info.first) and
// alignment (field_type_info.second) from the AST context.
- std::pair<uint64_t, unsigned> field_type_info = m_ast->getTypeInfo(field_type);
+ clang::TypeInfo field_type_info = m_ast->getTypeInfo(field_type);
assert(field_idx < record_layout.getFieldCount());
// Figure out the field offset within the current struct/union/class type
field_bit_offset = record_layout.getFieldOffset (field_idx);
@@ -6104,7 +6104,7 @@ ClangASTType::DumpValue (ExecutionContex
field_clang_type.GetFormat(), // The format with which to display the member
data, // Data buffer containing all bytes for this type
data_byte_offset + field_byte_offset,// Offset into "data" where to grab value from
- field_type_info.first / 8, // Size of this type in bytes
+ field_type_info.Width / 8, // Size of this type in bytes
field_bitfield_bit_size, // Bitfield bit size
field_bitfield_bit_offset, // Bitfield bit offset
show_types, // Boolean indicating if we should show the variable types
@@ -6154,11 +6154,11 @@ ClangASTType::DumpValue (ExecutionContex
const uint64_t element_count = array->getSize().getLimitedValue();
- std::pair<uint64_t, unsigned> field_type_info = m_ast->getTypeInfo(element_qual_type);
+ clang::TypeInfo field_type_info = m_ast->getTypeInfo(element_qual_type);
uint32_t element_idx = 0;
uint32_t element_offset = 0;
- uint64_t element_byte_size = field_type_info.first / 8;
+ uint64_t element_byte_size = field_type_info.Width / 8;
uint32_t element_stride = element_byte_size;
if (is_array_of_characters)
@@ -6217,8 +6217,8 @@ ClangASTType::DumpValue (ExecutionContex
ClangASTType typedef_clang_type (m_ast, typedef_qual_type);
lldb::Format typedef_format = typedef_clang_type.GetFormat();
- std::pair<uint64_t, unsigned> typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
- uint64_t typedef_byte_size = typedef_type_info.first / 8;
+ clang::TypeInfo typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
+ uint64_t typedef_byte_size = typedef_type_info.Width / 8;
return typedef_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
@@ -6240,8 +6240,8 @@ ClangASTType::DumpValue (ExecutionContex
clang::QualType elaborated_qual_type = llvm::cast<clang::ElaboratedType>(qual_type)->getNamedType();
ClangASTType elaborated_clang_type (m_ast, elaborated_qual_type);
lldb::Format elaborated_format = elaborated_clang_type.GetFormat();
- std::pair<uint64_t, unsigned> elaborated_type_info = m_ast->getTypeInfo(elaborated_qual_type);
- uint64_t elaborated_byte_size = elaborated_type_info.first / 8;
+ clang::TypeInfo elaborated_type_info = m_ast->getTypeInfo(elaborated_qual_type);
+ uint64_t elaborated_byte_size = elaborated_type_info.Width / 8;
return elaborated_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
@@ -6264,8 +6264,8 @@ ClangASTType::DumpValue (ExecutionContex
ClangASTType desugar_clang_type (m_ast, desugar_qual_type);
lldb::Format desugar_format = desugar_clang_type.GetFormat();
- std::pair<uint64_t, unsigned> desugar_type_info = m_ast->getTypeInfo(desugar_qual_type);
- uint64_t desugar_byte_size = desugar_type_info.first / 8;
+ clang::TypeInfo desugar_type_info = m_ast->getTypeInfo(desugar_qual_type);
+ uint64_t desugar_byte_size = desugar_type_info.Width / 8;
return desugar_clang_type.DumpValue (exe_ctx,
s, // Stream to dump to
@@ -6332,8 +6332,8 @@ ClangASTType::DumpTypeValue (Stream *s,
ClangASTType typedef_clang_type (m_ast, typedef_qual_type);
if (format == eFormatDefault)
format = typedef_clang_type.GetFormat();
- std::pair<uint64_t, unsigned> typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
- uint64_t typedef_byte_size = typedef_type_info.first / 8;
+ clang::TypeInfo typedef_type_info = m_ast->getTypeInfo(typedef_qual_type);
+ uint64_t typedef_byte_size = typedef_type_info.Width / 8;
return typedef_clang_type.DumpTypeValue (s,
format, // The format with which to display the element
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 14:35:03 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 267A863D
for <svn-src-projects@freebsd.org>; Sun, 8 Feb 2015 14:35:03 +0000 (UTC)
Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id B0B04FE5
for <svn-src-projects@freebsd.org>; Sun, 8 Feb 2015 14:35:02 +0000 (UTC)
Received: by mail-wg0-f50.google.com with SMTP id l18so6170185wgh.9
for <svn-src-projects@freebsd.org>; Sun, 08 Feb 2015 06:34:54 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to
:subject:references:in-reply-to:content-type
:content-transfer-encoding;
bh=GVT5qAcmT+J3u8vwx/CSse2NxCju3coHN2sZrxG3SnM=;
b=lM2tD9aXWx6jddsQuCY5ipWuATqXXvF57TRmYmmTPzSbggEFdpuBMqR9FZiEzwncQh
OsrhNEFyNhhZuhvBaVoTRWueDZfzN26SprDGzhf9aIt7HgS9j+2plka2MtfDExobC5sm
Dl8NCE6hiPvzyrWbmJNq94VykvGMSjHnv/dE81WKMPqHHWxZd2GkyBE20TOFjLtpeAem
O7Q++gStwMSyYXATzddn4pahI5epmaxpJAWPfZCIlXw2ketWxEjJdjEzZTwUEcUTWxQk
Ihd3wfxZOY3O/3Ryq0BcCHI7b/br6rPb9r/yjpMZK44kl0sx66o6VewN26CLw1qYc8Sq
Dytw==
X-Gm-Message-State: ALoCoQnypTXCvNeVq5mNco8/pneh5SzzSdMY6o+PaVjS2l5A45vLKejCHvpZysEz8meOBReKqWY+
X-Received: by 10.180.78.99 with SMTP id a3mr25046834wix.2.1423406094666;
Sun, 08 Feb 2015 06:34:54 -0800 (PST)
Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk.
[82.69.141.170])
by mx.google.com with ESMTPSA id bv16sm10270988wib.0.2015.02.08.06.34.53
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Sun, 08 Feb 2015 06:34:53 -0800 (PST)
From: Steven Hartland <steven@multiplay.co.uk>
X-Google-Original-From: Steven Hartland <smh@freebsd.org>
Message-ID: <54D77408.5090700@freebsd.org>
Date: Sun, 08 Feb 2015 14:34:48 +0000
User-Agent: Mozilla/5.0 (Windows NT 5.1;
rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version: 1.0
To: Ed Maste <emaste@FreeBSD.org>, src-committers@freebsd.org,
svn-src-projects@freebsd.org
Subject: Re: svn commit: r278380 - in
projects/clang360-import/contrib/llvm/tools/lldb/source:
Expression Symbol
References: <201502081428.t18ESi5j012778@svn.freebsd.org>
In-Reply-To: <201502081428.t18ESi5j012778@svn.freebsd.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 14:35:03 -0000
Out of interest what's the reason behind reverting the compat changes?
On 08/02/2015 14:28, Ed Maste wrote:
> Author: emaste
> Date: Sun Feb 8 14:28:43 2015
> New Revision: 278380
> URL: https://svnweb.freebsd.org/changeset/base/278380
>
> Log:
> Revert LLDB compatibility changes for Clang 3.5 API
>
> This reverts FreeBSD SVN r275134 and r275127, restoring the following
> upstream revisions:
>
> SVN git
> 214335 59a1f270
> 214340 42f16b1e
> 214501 26d6f063
> 215969 a083c0db
> 216603 ee9cd340
> 216810 f534f503
>
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 15:23:46 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 07CE9D78;
Sun, 8 Feb 2015 15:23:46 +0000 (UTC)
Received: from mail-qa0-x235.google.com (mail-qa0-x235.google.com
[IPv6:2607:f8b0:400d:c00::235])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id B3E93664;
Sun, 8 Feb 2015 15:23:45 +0000 (UTC)
Received: by mail-qa0-f53.google.com with SMTP id n4so17706328qaq.12;
Sun, 08 Feb 2015 07:23:44 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:from:date:message-id
:subject:to:cc:content-type;
bh=45ifBt3E9e/mAmG5QbXpLjZm4+oEW1Jyqs5xp6W4XwQ=;
b=VEePR4QafB1xdfcqLOxEXqUgJRmh/pkDxkwLH2IVVLI5RKP3015+scvc1xMn166ZR2
TWMbCISl3Np9PNC9To7h9UCWmyLgwGSoIAfHytngSdpbIOrqGytsrv7a7CA+rKvtLr8V
o5YQaecAqbT2asK9BX0pPxPx7Np0f/C+/XKoYo4C9SpgwBQwX3lnSyhiVcq6QuQtq3Ug
hqlpNDjBu8GNbR2TdezGhSG6dGZjOcKolXDJlxGE1d/V2oUhw7b1QXI+NPSYUPtxMSOe
QO2vhfiYYtNJG7K80bPd/B0aHiAUosQzZXbOZgqpRSoUWmOtsVzSWcn69u4rwpEYzU1f
YLTw==
X-Received: by 10.140.81.208 with SMTP id f74mr29779913qgd.94.1423409024827;
Sun, 08 Feb 2015 07:23:44 -0800 (PST)
MIME-Version: 1.0
Sender: carpeddiem@gmail.com
Received: by 10.140.39.209 with HTTP; Sun, 8 Feb 2015 07:23:24 -0800 (PST)
In-Reply-To: <54D77408.5090700@freebsd.org>
References: <201502081428.t18ESi5j012778@svn.freebsd.org>
<54D77408.5090700@freebsd.org>
From: Ed Maste <emaste@freebsd.org>
Date: Sun, 8 Feb 2015 10:23:24 -0500
X-Google-Sender-Auth: w8cfzeWr8_l_pRKg9uRhObWydtE
Message-ID: <CAPyFy2B6UMqcK8aNwYG+5vW12EFL=5RMQ02Zo4zeUCaJNOg-WA@mail.gmail.com>
Subject: Re: svn commit: r278380 - in
projects/clang360-import/contrib/llvm/tools/lldb/source:
Expression Symbol
To: Steven Hartland <steven@multiplay.co.uk>
Content-Type: text/plain; charset=UTF-8
Cc: svn-src-projects@freebsd.org,
"src-committers@freebsd.org" <src-committers@freebsd.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 15:23:46 -0000
On 8 February 2015 at 09:34, Steven Hartland <steven@multiplay.co.uk> wrote:
> Out of interest what's the reason behind reverting the compat changes?
The now-reverted changes were for compatibility with Clang 3.5. Due
to inconsistent branching for LLDB 3.5 we actually ended up with a
dependency on a slightly newer Clang than 3.5. FreeBSD r275134 and
r275127 reverted the LLDB changes that tracked Clang API changes after
3.5.
This commit, r278380, restores the original post-Clang-3.5 API changes
as part of the update to 3.6.
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 15:41:46 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id C96C96E;
Sun, 8 Feb 2015 15:41:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 B0DF1833;
Sun, 8 Feb 2015 15:41:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18Ffk9I049595;
Sun, 8 Feb 2015 15:41:46 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18FfUCM049390;
Sun, 8 Feb 2015 15:41:30 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081541.t18FfUCM049390@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 15:41:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278383 - in projects/release-pkg: . bin/cp bin/expr
bin/freebsd-version bin/ln bin/mv bin/ps bin/sh
cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts
cddl/contrib/opensolaris/cmd/dt...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 15:41:46 -0000
Author: bapt
Date: Sun Feb 8 15:41:27 2015
New Revision: 278383
URL: https://svnweb.freebsd.org/changeset/base/278383
Log:
Merge from HEAD
Added:
projects/release-pkg/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
- copied unchanged from r278382, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
projects/release-pkg/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff
- copied unchanged from r278382, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff
projects/release-pkg/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff
- copied unchanged from r278382, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff
projects/release-pkg/etc/newsyslog.conf.d/
- copied from r278382, head/etc/newsyslog.conf.d/
projects/release-pkg/etc/tests/rc.d/
- copied from r278382, head/etc/tests/rc.d/
projects/release-pkg/lib/libc/sys/futimens.c
- copied unchanged from r278382, head/lib/libc/sys/futimens.c
projects/release-pkg/lib/libc/sys/utimensat.2
- copied unchanged from r278382, head/lib/libc/sys/utimensat.2
projects/release-pkg/lib/libc/sys/utimensat.c
- copied unchanged from r278382, head/lib/libc/sys/utimensat.c
projects/release-pkg/lib/libdevctl/
- copied from r278382, head/lib/libdevctl/
projects/release-pkg/lib/libthr/arch/common/
- copied from r278382, head/lib/libthr/arch/common/
projects/release-pkg/lib/libthr/thread/thr_ctrdtr.c
- copied unchanged from r278382, head/lib/libthr/thread/thr_ctrdtr.c
projects/release-pkg/release/Makefile.vm
- copied unchanged from r278382, head/release/Makefile.vm
projects/release-pkg/release/doc/share/xml/errata.xml
- copied unchanged from r278382, head/release/doc/share/xml/errata.xml
projects/release-pkg/release/doc/share/xml/security.xml
- copied unchanged from r278382, head/release/doc/share/xml/security.xml
projects/release-pkg/release/scripts/mk-vmimage.sh
- copied unchanged from r278382, head/release/scripts/mk-vmimage.sh
projects/release-pkg/release/tools/gce.conf
- copied unchanged from r278382, head/release/tools/gce.conf
projects/release-pkg/release/tools/openstack.conf
- copied unchanged from r278382, head/release/tools/openstack.conf
projects/release-pkg/release/tools/vmimage.subr
- copied unchanged from r278382, head/release/tools/vmimage.subr
projects/release-pkg/sys/amd64/include/pvclock.h
- copied unchanged from r278382, head/sys/amd64/include/pvclock.h
projects/release-pkg/sys/arm/arm/bus_space_base.c
- copied unchanged from r278382, head/sys/arm/arm/bus_space_base.c
projects/release-pkg/sys/arm/arm/pmu.c
- copied unchanged from r278382, head/sys/arm/arm/pmu.c
projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2835_audio.c
- copied unchanged from r278382, head/sys/arm/broadcom/bcm2835/bcm2835_audio.c
projects/release-pkg/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
- copied unchanged from r278382, head/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
projects/release-pkg/sys/arm/freescale/imx/imx6_audmux.c
- copied unchanged from r278382, head/sys/arm/freescale/imx/imx6_audmux.c
projects/release-pkg/sys/arm/freescale/imx/imx6_sdma.c
- copied unchanged from r278382, head/sys/arm/freescale/imx/imx6_sdma.c
projects/release-pkg/sys/arm/freescale/imx/imx6_sdma.h
- copied unchanged from r278382, head/sys/arm/freescale/imx/imx6_sdma.h
projects/release-pkg/sys/arm/freescale/imx/imx6_ssi.c
- copied unchanged from r278382, head/sys/arm/freescale/imx/imx6_ssi.c
projects/release-pkg/sys/contrib/vchiq/
- copied from r278382, head/sys/contrib/vchiq/
projects/release-pkg/sys/dev/cxgbe/if_cxl.c
- copied unchanged from r278382, head/sys/dev/cxgbe/if_cxl.c
projects/release-pkg/sys/dev/drm2/i915/i915_gem_stolen.c
- copied unchanged from r278382, head/sys/dev/drm2/i915/i915_gem_stolen.c
projects/release-pkg/sys/dev/drm2/i915/intel_ddi.c
- copied unchanged from r278382, head/sys/dev/drm2/i915/intel_ddi.c
projects/release-pkg/sys/dev/drm2/i915/intel_pm.c
- copied unchanged from r278382, head/sys/dev/drm2/i915/intel_pm.c
projects/release-pkg/sys/dev/hwpmc/hwpmc_armv7.c
- copied unchanged from r278382, head/sys/dev/hwpmc/hwpmc_armv7.c
projects/release-pkg/sys/dev/hwpmc/hwpmc_armv7.h
- copied unchanged from r278382, head/sys/dev/hwpmc/hwpmc_armv7.h
projects/release-pkg/sys/dev/iscsi/icl_conn_if.m
- copied unchanged from r278382, head/sys/dev/iscsi/icl_conn_if.m
projects/release-pkg/sys/dev/iscsi/icl_soft.c
- copied unchanged from r278382, head/sys/dev/iscsi/icl_soft.c
projects/release-pkg/sys/dev/iscsi/icl_wrappers.h
- copied unchanged from r278382, head/sys/dev/iscsi/icl_wrappers.h
projects/release-pkg/sys/dev/wpi/if_wpi_debug.h
- copied unchanged from r278382, head/sys/dev/wpi/if_wpi_debug.h
projects/release-pkg/sys/i386/include/pvclock.h
- copied unchanged from r278382, head/sys/i386/include/pvclock.h
projects/release-pkg/sys/modules/cxgbe/if_cxl/
- copied from r278382, head/sys/modules/cxgbe/if_cxl/
projects/release-pkg/sys/modules/dtb/rpi/
- copied from r278382, head/sys/modules/dtb/rpi/
projects/release-pkg/sys/x86/include/pvclock.h
- copied unchanged from r278382, head/sys/x86/include/pvclock.h
projects/release-pkg/sys/x86/x86/pvclock.c
- copied unchanged from r278382, head/sys/x86/x86/pvclock.c
projects/release-pkg/tools/build/options/WITHOUT_AUTOFS
- copied unchanged from r278382, head/tools/build/options/WITHOUT_AUTOFS
projects/release-pkg/tools/build/options/WITHOUT_BHYVE
- copied unchanged from r278382, head/tools/build/options/WITHOUT_BHYVE
projects/release-pkg/tools/build/options/WITHOUT_BOOTPARAMD
- copied unchanged from r278382, head/tools/build/options/WITHOUT_BOOTPARAMD
projects/release-pkg/tools/build/options/WITHOUT_BOOTPD
- copied unchanged from r278382, head/tools/build/options/WITHOUT_BOOTPD
projects/release-pkg/tools/build/options/WITHOUT_BSDINSTALL
- copied unchanged from r278382, head/tools/build/options/WITHOUT_BSDINSTALL
projects/release-pkg/tools/build/options/WITHOUT_CCD
- copied unchanged from r278382, head/tools/build/options/WITHOUT_CCD
projects/release-pkg/tools/build/options/WITHOUT_EE
- copied unchanged from r278382, head/tools/build/options/WITHOUT_EE
projects/release-pkg/tools/build/options/WITHOUT_FILE
- copied unchanged from r278382, head/tools/build/options/WITHOUT_FILE
projects/release-pkg/tools/build/options/WITHOUT_FINGER
- copied unchanged from r278382, head/tools/build/options/WITHOUT_FINGER
projects/release-pkg/tools/build/options/WITHOUT_FTP
- copied unchanged from r278382, head/tools/build/options/WITHOUT_FTP
projects/release-pkg/tools/build/options/WITHOUT_HAST
- copied unchanged from r278382, head/tools/build/options/WITHOUT_HAST
projects/release-pkg/tools/build/options/WITHOUT_INETD
- copied unchanged from r278382, head/tools/build/options/WITHOUT_INETD
projects/release-pkg/tools/build/options/WITHOUT_ISCSI
- copied unchanged from r278382, head/tools/build/options/WITHOUT_ISCSI
projects/release-pkg/tools/build/options/WITHOUT_RADIUS_SUPPORT
- copied unchanged from r278382, head/tools/build/options/WITHOUT_RADIUS_SUPPORT
projects/release-pkg/tools/build/options/WITHOUT_RBOOTD
- copied unchanged from r278382, head/tools/build/options/WITHOUT_RBOOTD
projects/release-pkg/tools/build/options/WITHOUT_TALK
- copied unchanged from r278382, head/tools/build/options/WITHOUT_TALK
projects/release-pkg/tools/build/options/WITHOUT_TCP_WRAPPERS
- copied unchanged from r278382, head/tools/build/options/WITHOUT_TCP_WRAPPERS
projects/release-pkg/tools/build/options/WITHOUT_TFTP
- copied unchanged from r278382, head/tools/build/options/WITHOUT_TFTP
projects/release-pkg/tools/build/options/WITHOUT_TIMED
- copied unchanged from r278382, head/tools/build/options/WITHOUT_TIMED
projects/release-pkg/tools/tools/qrndtest/
- copied from r278382, head/tools/tools/qrndtest/
projects/release-pkg/usr.sbin/devctl/
- copied from r278382, head/usr.sbin/devctl/
Replaced:
projects/release-pkg/sys/dev/iscsi/icl.c
- copied unchanged from r278382, head/sys/dev/iscsi/icl.c
Deleted:
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/Makefile
projects/release-pkg/lib/libthr/arch/amd64/amd64/pthread_md.c
projects/release-pkg/lib/libthr/arch/arm/Makefile.inc
projects/release-pkg/lib/libthr/arch/arm/arm/
projects/release-pkg/lib/libthr/arch/i386/i386/pthread_md.c
projects/release-pkg/lib/libthr/arch/mips/Makefile.inc
projects/release-pkg/lib/libthr/arch/mips/mips/
projects/release-pkg/lib/libthr/arch/powerpc/Makefile.inc
projects/release-pkg/lib/libthr/arch/powerpc/powerpc/
projects/release-pkg/lib/libthr/arch/sparc64/sparc64/pthread_md.c
projects/release-pkg/release/amd64/mk-azure.sh
projects/release-pkg/release/amd64/mk-vmimage.sh
projects/release-pkg/release/i386/mk-azure.sh
projects/release-pkg/release/i386/mk-vmimage.sh
projects/release-pkg/share/man/man9/spl.9
projects/release-pkg/sys/arm/arm/bus_space-v6.c
projects/release-pkg/sys/arm/lpc/lpc_space.c
projects/release-pkg/sys/arm/mv/bus_space.c
projects/release-pkg/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
projects/release-pkg/sys/arm/versatile/bus_space.c
projects/release-pkg/sys/arm/versatile/versatile_pci_bus_space.c
projects/release-pkg/sys/arm/versatile/versatile_pci_bus_space.h
projects/release-pkg/sys/arm/xilinx/zy7_bus_space.c
projects/release-pkg/sys/arm/xscale/i80321/obio_space.c
projects/release-pkg/sys/arm/xscale/i8134x/obio_space.c
projects/release-pkg/tools/regression/lib/libc/stdio/test-fmemopen.t
Modified:
projects/release-pkg/Makefile.inc1
projects/release-pkg/ObsoleteFiles.inc
projects/release-pkg/UPDATING
projects/release-pkg/bin/cp/utils.c
projects/release-pkg/bin/expr/expr.y
projects/release-pkg/bin/freebsd-version/Makefile
projects/release-pkg/bin/ln/symlink.7
projects/release-pkg/bin/mv/mv.c
projects/release-pkg/bin/ps/ps.c
projects/release-pkg/bin/sh/jobs.c
projects/release-pkg/bin/sh/trap.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe (contents, props changed)
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe (contents, props changed)
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.taskid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.uid.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/syscall/tst.args.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.dlclose1.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.forker.c
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
projects/release-pkg/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
projects/release-pkg/contrib/amd/amd/amfs_generic.c
projects/release-pkg/contrib/amd/amd/amfs_program.c
projects/release-pkg/contrib/amd/amd/readdir.c
projects/release-pkg/contrib/amd/hlfsd/homedir.c
projects/release-pkg/contrib/amd/hlfsd/stubs.c
projects/release-pkg/contrib/elftoolchain/common/elfdefinitions.h
projects/release-pkg/contrib/elftoolchain/elfcopy/main.c
projects/release-pkg/contrib/elftoolchain/readelf/readelf.c
projects/release-pkg/contrib/gcc/config/arm/unwind-arm.c
projects/release-pkg/contrib/gcc/config/arm/unwind-arm.h
projects/release-pkg/contrib/gdb/gdb/corelow.c
projects/release-pkg/contrib/gdb/gdb/dwarf2expr.c
projects/release-pkg/contrib/gdb/gdb/remote.c
projects/release-pkg/contrib/gdb/gdb/std-regs.c
projects/release-pkg/contrib/libcxxrt/exception.cc
projects/release-pkg/contrib/libcxxrt/stdexcept.cc
projects/release-pkg/contrib/libcxxrt/typeinfo.cc
projects/release-pkg/contrib/llvm/lib/Target/AArch64/AArch64RegisterInfo.cpp
projects/release-pkg/contrib/llvm/tools/clang/include/clang/Driver/Options.td
projects/release-pkg/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
projects/release-pkg/contrib/mdocml/lib.in
projects/release-pkg/contrib/netbsd-tests/bin/expr/t_expr.sh
projects/release-pkg/contrib/netbsd-tests/lib/libc/c063/t_utimensat.c
projects/release-pkg/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
projects/release-pkg/contrib/sendmail/cf/m4/cfhead.m4
projects/release-pkg/contrib/tcpdump/print-atm.c
projects/release-pkg/contrib/tcpdump/print-ip.c
projects/release-pkg/contrib/tcpdump/print-llc.c
projects/release-pkg/contrib/tcpdump/print-sl.c
projects/release-pkg/contrib/tcpdump/tcpdump.c
projects/release-pkg/etc/Makefile
projects/release-pkg/etc/defaults/Makefile
projects/release-pkg/etc/devd/Makefile
projects/release-pkg/etc/mtree/BSD.tests.dist
projects/release-pkg/etc/pam.d/Makefile
projects/release-pkg/etc/rc.d/Makefile
projects/release-pkg/etc/rc.d/ipfilter
projects/release-pkg/etc/rc.d/jail
projects/release-pkg/etc/rc.d/local_unbound
projects/release-pkg/etc/rc.d/routing
projects/release-pkg/etc/sendmail/Makefile
projects/release-pkg/etc/tests/Makefile
projects/release-pkg/games/fortune/fortune/fortune.6
projects/release-pkg/include/Makefile
projects/release-pkg/include/semaphore.h
projects/release-pkg/lib/Makefile
projects/release-pkg/lib/clang/clang.build.mk
projects/release-pkg/lib/csu/powerpc64/Makefile
projects/release-pkg/lib/libc/gen/disklabel.c
projects/release-pkg/lib/libc/gen/getgrent.c
projects/release-pkg/lib/libc/gen/getpwent.c
projects/release-pkg/lib/libc/gen/sem_new.c
projects/release-pkg/lib/libc/gen/sem_post.3
projects/release-pkg/lib/libc/gen/ttyname.c
projects/release-pkg/lib/libc/include/libc_private.h
projects/release-pkg/lib/libc/mips/gen/sigsetjmp.S
projects/release-pkg/lib/libc/rpc/crypt_client.c
projects/release-pkg/lib/libc/rpc/svc_vc.c
projects/release-pkg/lib/libc/stdlib/tdelete.c
projects/release-pkg/lib/libc/sys/Makefile.inc
projects/release-pkg/lib/libc/sys/Symbol.map
projects/release-pkg/lib/libc/sys/setresuid.2
projects/release-pkg/lib/libc/tests/c063/Makefile
projects/release-pkg/lib/libdevinfo/devinfo.h
projects/release-pkg/lib/libelftc/elftc_version.c
projects/release-pkg/lib/libnetgraph/debug.c
projects/release-pkg/lib/libnv/Makefile
projects/release-pkg/lib/libnv/nv.3
projects/release-pkg/lib/libnv/nv.h
projects/release-pkg/lib/libnv/nvlist.c
projects/release-pkg/lib/libnv/nvpair.c
projects/release-pkg/lib/libpam/modules/modules.inc
projects/release-pkg/lib/libpmc/libpmc.c
projects/release-pkg/lib/libproc/proc_sym.c
projects/release-pkg/lib/libproc/tests/proc_test.c
projects/release-pkg/lib/libstand/libstand.3
projects/release-pkg/lib/libstand/printf.c
projects/release-pkg/lib/libthr/Makefile
projects/release-pkg/lib/libthr/arch/amd64/Makefile.inc
projects/release-pkg/lib/libthr/arch/amd64/include/pthread_md.h
projects/release-pkg/lib/libthr/arch/arm/include/pthread_md.h
projects/release-pkg/lib/libthr/arch/i386/Makefile.inc
projects/release-pkg/lib/libthr/arch/i386/include/pthread_md.h
projects/release-pkg/lib/libthr/arch/mips/include/pthread_md.h
projects/release-pkg/lib/libthr/arch/powerpc/include/pthread_md.h
projects/release-pkg/lib/libthr/arch/sparc64/Makefile.inc
projects/release-pkg/lib/libthr/arch/sparc64/include/pthread_md.h
projects/release-pkg/lib/libthr/thread/Makefile.inc
projects/release-pkg/lib/libthr/thread/thr_barrier.c
projects/release-pkg/lib/libthr/thread/thr_private.h
projects/release-pkg/lib/libthr/thread/thr_sig.c
projects/release-pkg/lib/libthread_db/arch/i386/libpthread_md.c
projects/release-pkg/lib/libutil/gr_util.c
projects/release-pkg/lib/msun/src/s_scalbln.c
projects/release-pkg/libexec/Makefile
projects/release-pkg/libexec/rtld-elf/rtld.c
projects/release-pkg/release/Makefile
projects/release-pkg/release/doc/en_US.ISO8859-1/errata/article.xml
projects/release-pkg/release/doc/en_US.ISO8859-1/relnotes/article.xml
projects/release-pkg/release/doc/share/mk/doc.relnotes.mk
projects/release-pkg/release/doc/share/xml/release.ent
projects/release-pkg/release/picobsd/build/picobsd
projects/release-pkg/release/release.conf.sample
projects/release-pkg/release/release.sh
projects/release-pkg/release/scripts/make-manifest.sh
projects/release-pkg/release/tools/azure.conf
projects/release-pkg/rescue/rescue/Makefile
projects/release-pkg/sbin/Makefile
projects/release-pkg/sbin/geom/class/mountver/gmountver.8
projects/release-pkg/sbin/ifconfig/af_inet6.c
projects/release-pkg/sbin/ifconfig/ifconfig.c
projects/release-pkg/sbin/ipfw/ipfw2.c
projects/release-pkg/sbin/ipfw/nat.c
projects/release-pkg/sbin/ping/ping.c
projects/release-pkg/sbin/rcorder/Makefile
projects/release-pkg/sbin/rcorder/rcorder.c
projects/release-pkg/share/Makefile
projects/release-pkg/share/examples/Makefile
projects/release-pkg/share/man/man3/tree.3
projects/release-pkg/share/man/man4/Makefile
projects/release-pkg/share/man/man4/rights.4
projects/release-pkg/share/man/man4/sfxge.4
projects/release-pkg/share/man/man4/witness.4
projects/release-pkg/share/man/man5/Makefile
projects/release-pkg/share/man/man5/src.conf.5
projects/release-pkg/share/man/man7/release.7
projects/release-pkg/share/man/man9/Makefile
projects/release-pkg/share/man/man9/SYSCALL_MODULE.9
projects/release-pkg/share/man/man9/contigmalloc.9
projects/release-pkg/share/man/man9/device_get_softc.9
projects/release-pkg/share/man/man9/pmap_enter.9
projects/release-pkg/share/man/man9/printf.9
projects/release-pkg/share/man/man9/timeout.9
projects/release-pkg/share/misc/Makefile
projects/release-pkg/share/misc/committers-ports.dot
projects/release-pkg/share/misc/committers-src.dot
projects/release-pkg/share/mk/bsd.libnames.mk
projects/release-pkg/share/mk/src.libnames.mk
projects/release-pkg/share/mk/src.opts.mk
projects/release-pkg/sys/amd64/amd64/machdep.c
projects/release-pkg/sys/amd64/amd64/mp_machdep.c
projects/release-pkg/sys/amd64/conf/GENERIC
projects/release-pkg/sys/amd64/ia32/ia32_signal.c
projects/release-pkg/sys/amd64/vmm/amd/svm.c
projects/release-pkg/sys/arm/allwinner/a10_gpio.c
projects/release-pkg/sys/arm/allwinner/a20/files.a20
projects/release-pkg/sys/arm/allwinner/files.a10
projects/release-pkg/sys/arm/altera/socfpga/files.socfpga
projects/release-pkg/sys/arm/altera/socfpga/socfpga_gpio.c
projects/release-pkg/sys/arm/arm/bus_space_asm_generic.S
projects/release-pkg/sys/arm/arm/bus_space_generic.c
projects/release-pkg/sys/arm/arm/busdma_machdep-v6.c
projects/release-pkg/sys/arm/arm/intr.c
projects/release-pkg/sys/arm/arm/locore-v4.S
projects/release-pkg/sys/arm/arm/machdep.c
projects/release-pkg/sys/arm/arm/mem.c
projects/release-pkg/sys/arm/arm/physmem.c
projects/release-pkg/sys/arm/arm/trap-v6.c
projects/release-pkg/sys/arm/at91/at91.c
projects/release-pkg/sys/arm/at91/files.at91
projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
projects/release-pkg/sys/arm/broadcom/bcm2835/files.bcm2835
projects/release-pkg/sys/arm/cavium/cns11xx/econa.c
projects/release-pkg/sys/arm/cavium/cns11xx/files.econa
projects/release-pkg/sys/arm/conf/RK3188
projects/release-pkg/sys/arm/conf/RPI-B
projects/release-pkg/sys/arm/freescale/imx/files.imx51
projects/release-pkg/sys/arm/freescale/imx/files.imx53
projects/release-pkg/sys/arm/freescale/imx/files.imx6
projects/release-pkg/sys/arm/freescale/imx/imx6_anatop.c
projects/release-pkg/sys/arm/freescale/imx/imx6_anatopreg.h
projects/release-pkg/sys/arm/freescale/imx/imx6_anatopvar.h
projects/release-pkg/sys/arm/freescale/imx/imx6_ccm.c
projects/release-pkg/sys/arm/freescale/imx/imx6_ccmreg.h
projects/release-pkg/sys/arm/freescale/imx/imx_ccmvar.h
projects/release-pkg/sys/arm/freescale/imx/imx_gpio.c
projects/release-pkg/sys/arm/freescale/imx/imx_iomux.c
projects/release-pkg/sys/arm/freescale/vybrid/files.vybrid
projects/release-pkg/sys/arm/freescale/vybrid/vf_gpio.c
projects/release-pkg/sys/arm/include/bus.h
projects/release-pkg/sys/arm/include/cpu-v6.h
projects/release-pkg/sys/arm/include/md_var.h
projects/release-pkg/sys/arm/include/pmc_mdep.h
projects/release-pkg/sys/arm/include/profile.h
projects/release-pkg/sys/arm/lpc/files.lpc
projects/release-pkg/sys/arm/lpc/lpc_gpio.c
projects/release-pkg/sys/arm/mv/files.mv
projects/release-pkg/sys/arm/rockchip/files.rk30xx
projects/release-pkg/sys/arm/rockchip/rk30xx_gpio.c
projects/release-pkg/sys/arm/samsung/exynos/exynos5_pad.c
projects/release-pkg/sys/arm/samsung/exynos/files.exynos5
projects/release-pkg/sys/arm/samsung/s3c2xx0/files.s3c2xx0
projects/release-pkg/sys/arm/samsung/s3c2xx0/s3c24x0.c
projects/release-pkg/sys/arm/samsung/s3c2xx0/s3c2xx0var.h
projects/release-pkg/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c
projects/release-pkg/sys/arm/ti/am335x/am335x_lcd.c
projects/release-pkg/sys/arm/ti/am335x/am335x_prcm.c
projects/release-pkg/sys/arm/ti/am335x/files.am335x
projects/release-pkg/sys/arm/ti/files.ti
projects/release-pkg/sys/arm/ti/ti_gpio.c
projects/release-pkg/sys/arm/ti/ti_gpio.h
projects/release-pkg/sys/arm/ti/ti_i2c.c
projects/release-pkg/sys/arm/ti/ti_mbox.c
projects/release-pkg/sys/arm/ti/ti_pruss.c
projects/release-pkg/sys/arm/versatile/files.versatile
projects/release-pkg/sys/arm/versatile/versatile_pci.c
projects/release-pkg/sys/arm/xilinx/files.zynq7
projects/release-pkg/sys/arm/xilinx/zy7_gpio.c
projects/release-pkg/sys/arm/xscale/i80321/ep80219_machdep.c
projects/release-pkg/sys/arm/xscale/i80321/files.ep80219
projects/release-pkg/sys/arm/xscale/i80321/files.i80219
projects/release-pkg/sys/arm/xscale/i80321/files.i80321
projects/release-pkg/sys/arm/xscale/i80321/files.iq31244
projects/release-pkg/sys/arm/xscale/i80321/i80321_space.c
projects/release-pkg/sys/arm/xscale/i80321/iq31244_machdep.c
projects/release-pkg/sys/arm/xscale/i80321/obio.c
projects/release-pkg/sys/arm/xscale/i80321/obiovar.h
projects/release-pkg/sys/arm/xscale/i80321/uart_cpu_i80321.c
projects/release-pkg/sys/arm/xscale/i8134x/crb_machdep.c
projects/release-pkg/sys/arm/xscale/i8134x/files.i81342
projects/release-pkg/sys/arm/xscale/i8134x/i81342_space.c
projects/release-pkg/sys/arm/xscale/i8134x/obio.c
projects/release-pkg/sys/arm/xscale/i8134x/obiovar.h
projects/release-pkg/sys/arm/xscale/i8134x/uart_cpu_i81342.c
projects/release-pkg/sys/arm/xscale/ixp425/avila_ata.c
projects/release-pkg/sys/arm/xscale/ixp425/avila_gpio.c
projects/release-pkg/sys/arm/xscale/ixp425/cambria_exp_space.c
projects/release-pkg/sys/arm/xscale/ixp425/cambria_gpio.c
projects/release-pkg/sys/arm/xscale/ixp425/ixp425_a4x_space.c
projects/release-pkg/sys/arm/xscale/ixp425/ixp425_pci_space.c
projects/release-pkg/sys/arm/xscale/ixp425/ixp425_space.c
projects/release-pkg/sys/arm/xscale/pxa/pxa_space.c
projects/release-pkg/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
projects/release-pkg/sys/boot/amd64/boot1.efi/generate-fat.sh
projects/release-pkg/sys/boot/amd64/efi/main.c
projects/release-pkg/sys/boot/common/load_elf.c
projects/release-pkg/sys/boot/efi/include/efiapi.h
projects/release-pkg/sys/boot/efi/libefi/efinet.c
projects/release-pkg/sys/boot/fdt/dts/arm/am335x.dtsi
projects/release-pkg/sys/boot/fdt/dts/arm/apalis-imx6.dts
projects/release-pkg/sys/boot/fdt/dts/arm/imx6.dtsi
projects/release-pkg/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
projects/release-pkg/sys/boot/fdt/dts/arm/rk3188-radxa.dts
projects/release-pkg/sys/boot/fdt/dts/arm/rk3188.dtsi
projects/release-pkg/sys/boot/fdt/fdt_loader_cmd.c
projects/release-pkg/sys/boot/i386/libfirewire/firewire.c
projects/release-pkg/sys/boot/i386/libi386/bootinfo64.c
projects/release-pkg/sys/boot/i386/libi386/libi386.h
projects/release-pkg/sys/boot/i386/libi386/smbios.c
projects/release-pkg/sys/boot/powerpc/kboot/conf.c
projects/release-pkg/sys/boot/powerpc/kboot/host_syscall.S
projects/release-pkg/sys/boot/powerpc/kboot/host_syscall.h
projects/release-pkg/sys/boot/powerpc/kboot/hostdisk.c
projects/release-pkg/sys/boot/powerpc/kboot/kbootfdt.c
projects/release-pkg/sys/boot/powerpc/kboot/kerneltramp.S
projects/release-pkg/sys/boot/powerpc/kboot/main.c
projects/release-pkg/sys/boot/powerpc/kboot/ppc64_elf_freebsd.c
projects/release-pkg/sys/cam/cam.h
projects/release-pkg/sys/cam/cam_ccb.h
projects/release-pkg/sys/cam/cam_periph.c
projects/release-pkg/sys/cam/cam_xpt.c
projects/release-pkg/sys/cam/cam_xpt_internal.h
projects/release-pkg/sys/cam/ctl/ctl.c
projects/release-pkg/sys/cam/ctl/ctl_frontend.c
projects/release-pkg/sys/cam/ctl/ctl_frontend.h
projects/release-pkg/sys/cam/ctl/ctl_frontend_iscsi.c
projects/release-pkg/sys/cam/ctl/ctl_frontend_iscsi.h
projects/release-pkg/sys/cam/ctl/ctl_ioctl.h
projects/release-pkg/sys/cam/ctl/ctl_private.h
projects/release-pkg/sys/cam/ctl/ctl_tpc.c
projects/release-pkg/sys/cam/ctl/ctl_tpc_local.c
projects/release-pkg/sys/cam/scsi/scsi_all.h
projects/release-pkg/sys/cam/scsi/scsi_cd.c
projects/release-pkg/sys/cam/scsi/scsi_da.c
projects/release-pkg/sys/cam/scsi/scsi_xpt.c
projects/release-pkg/sys/cddl/compat/opensolaris/sys/sunddi.h
projects/release-pkg/sys/cddl/compat/opensolaris/sys/time.h
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
projects/release-pkg/sys/cddl/dev/dtrace/dtrace_load.c
projects/release-pkg/sys/cddl/dev/dtrace/dtrace_unload.c
projects/release-pkg/sys/compat/freebsd32/freebsd32_misc.c
projects/release-pkg/sys/compat/freebsd32/freebsd32_proto.h
projects/release-pkg/sys/compat/freebsd32/freebsd32_syscall.h
projects/release-pkg/sys/compat/freebsd32/freebsd32_syscalls.c
projects/release-pkg/sys/compat/freebsd32/freebsd32_sysent.c
projects/release-pkg/sys/compat/freebsd32/freebsd32_systrace_args.c
projects/release-pkg/sys/compat/freebsd32/syscalls.master
projects/release-pkg/sys/conf/Makefile.powerpc
projects/release-pkg/sys/conf/files
projects/release-pkg/sys/conf/files.amd64
projects/release-pkg/sys/conf/files.arm
projects/release-pkg/sys/conf/files.i386
projects/release-pkg/sys/conf/kern.mk
projects/release-pkg/sys/conf/kern.opts.mk
projects/release-pkg/sys/conf/kern.pre.mk
projects/release-pkg/sys/conf/options
projects/release-pkg/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
projects/release-pkg/sys/contrib/rdma/krping/krping.c
projects/release-pkg/sys/dev/acpica/acpi.c
projects/release-pkg/sys/dev/acpica/acpi_ec.c
projects/release-pkg/sys/dev/agp/agp_nvidia.c
projects/release-pkg/sys/dev/ahci/ahci.h
projects/release-pkg/sys/dev/ahci/ahci_pci.c
projects/release-pkg/sys/dev/alc/if_alc.c
projects/release-pkg/sys/dev/ath/ath_hal/ah_internal.h
projects/release-pkg/sys/dev/ath/ath_rate/sample/sample.c
projects/release-pkg/sys/dev/ath/ath_rate/sample/sample.h
projects/release-pkg/sys/dev/cx/cxddk.c
projects/release-pkg/sys/dev/cxgb/cxgb_osdep.h
projects/release-pkg/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
projects/release-pkg/sys/dev/cxgbe/adapter.h
projects/release-pkg/sys/dev/cxgbe/iw_cxgbe/device.c
projects/release-pkg/sys/dev/cxgbe/offload.h
projects/release-pkg/sys/dev/cxgbe/t4_main.c
projects/release-pkg/sys/dev/cxgbe/tom/t4_ddp.c
projects/release-pkg/sys/dev/cxgbe/tom/t4_listen.c
projects/release-pkg/sys/dev/cxgbe/tom/t4_tom.c
projects/release-pkg/sys/dev/dc/if_dc.c
projects/release-pkg/sys/dev/dcons/dcons.c
projects/release-pkg/sys/dev/dcons/dcons_crom.c
projects/release-pkg/sys/dev/dcons/dcons_os.h
projects/release-pkg/sys/dev/drm2/drm.h
projects/release-pkg/sys/dev/drm2/drmP.h
projects/release-pkg/sys/dev/drm2/drm_crtc.c
projects/release-pkg/sys/dev/drm2/drm_crtc.h
projects/release-pkg/sys/dev/drm2/drm_crtc_helper.c
projects/release-pkg/sys/dev/drm2/drm_crtc_helper.h
projects/release-pkg/sys/dev/drm2/drm_drv.c
projects/release-pkg/sys/dev/drm2/drm_edid.c
projects/release-pkg/sys/dev/drm2/drm_edid.h
projects/release-pkg/sys/dev/drm2/drm_edid_modes.h
projects/release-pkg/sys/dev/drm2/drm_fb_helper.c
projects/release-pkg/sys/dev/drm2/drm_ioctl.c
projects/release-pkg/sys/dev/drm2/drm_irq.c
projects/release-pkg/sys/dev/drm2/drm_memory.c
projects/release-pkg/sys/dev/drm2/drm_mode.h
projects/release-pkg/sys/dev/drm2/drm_pciids.h
projects/release-pkg/sys/dev/drm2/drm_stub.c
projects/release-pkg/sys/dev/drm2/i915/i915_debug.c
projects/release-pkg/sys/dev/drm2/i915/i915_dma.c
projects/release-pkg/sys/dev/drm2/i915/i915_drm.h
projects/release-pkg/sys/dev/drm2/i915/i915_drv.c
projects/release-pkg/sys/dev/drm2/i915/i915_drv.h
projects/release-pkg/sys/dev/drm2/i915/i915_gem.c
projects/release-pkg/sys/dev/drm2/i915/i915_gem_context.c
projects/release-pkg/sys/dev/drm2/i915/i915_gem_evict.c
projects/release-pkg/sys/dev/drm2/i915/i915_gem_execbuffer.c
projects/release-pkg/sys/dev/drm2/i915/i915_gem_gtt.c
projects/release-pkg/sys/dev/drm2/i915/i915_gem_tiling.c
projects/release-pkg/sys/dev/drm2/i915/i915_irq.c
projects/release-pkg/sys/dev/drm2/i915/i915_reg.h
projects/release-pkg/sys/dev/drm2/i915/i915_suspend.c
projects/release-pkg/sys/dev/drm2/i915/intel_bios.c
projects/release-pkg/sys/dev/drm2/i915/intel_crt.c
projects/release-pkg/sys/dev/drm2/i915/intel_display.c
projects/release-pkg/sys/dev/drm2/i915/intel_dp.c
projects/release-pkg/sys/dev/drm2/i915/intel_drv.h
projects/release-pkg/sys/dev/drm2/i915/intel_fb.c
projects/release-pkg/sys/dev/drm2/i915/intel_hdmi.c
projects/release-pkg/sys/dev/drm2/i915/intel_iic.c
projects/release-pkg/sys/dev/drm2/i915/intel_lvds.c
projects/release-pkg/sys/dev/drm2/i915/intel_modes.c
projects/release-pkg/sys/dev/drm2/i915/intel_overlay.c
projects/release-pkg/sys/dev/drm2/i915/intel_panel.c
projects/release-pkg/sys/dev/drm2/i915/intel_ringbuffer.c
projects/release-pkg/sys/dev/drm2/i915/intel_ringbuffer.h
projects/release-pkg/sys/dev/drm2/i915/intel_sdvo.c
projects/release-pkg/sys/dev/drm2/i915/intel_sprite.c
projects/release-pkg/sys/dev/drm2/i915/intel_tv.c
projects/release-pkg/sys/dev/drm2/radeon/atombios_encoders.c
projects/release-pkg/sys/dev/drm2/radeon/ni.c
projects/release-pkg/sys/dev/drm2/radeon/radeon_legacy_encoders.c
projects/release-pkg/sys/dev/drm2/radeon/si.c
projects/release-pkg/sys/dev/drm2/ttm/ttm_bo.c
projects/release-pkg/sys/dev/drm2/ttm/ttm_page_alloc.c
projects/release-pkg/sys/dev/ed/if_ed.c
projects/release-pkg/sys/dev/fb/fbd.c
projects/release-pkg/sys/dev/fdt/fdt_clock.c
projects/release-pkg/sys/dev/fe/if_fe_isa.c
projects/release-pkg/sys/dev/firewire/firewire.c
projects/release-pkg/sys/dev/firewire/fwmem.c
projects/release-pkg/sys/dev/firewire/fwohci.c
projects/release-pkg/sys/dev/gpio/gpio_if.m
projects/release-pkg/sys/dev/gpio/gpiobus.c
projects/release-pkg/sys/dev/gpio/gpiobusvar.h
projects/release-pkg/sys/dev/gpio/ofw_gpiobus.c
projects/release-pkg/sys/dev/hwpmc/hwpmc_arm.c
projects/release-pkg/sys/dev/hwpmc/hwpmc_core.c
projects/release-pkg/sys/dev/hwpmc/pmc_events.h
projects/release-pkg/sys/dev/ipmi/ipmi.c
projects/release-pkg/sys/dev/ipmi/ipmi_kcs.c
projects/release-pkg/sys/dev/ipmi/ipmi_smic.c
projects/release-pkg/sys/dev/ipmi/ipmi_ssif.c
projects/release-pkg/sys/dev/ipmi/ipmivars.h
projects/release-pkg/sys/dev/iscsi/icl.h
projects/release-pkg/sys/dev/iscsi/iscsi.c
projects/release-pkg/sys/dev/iscsi/iscsi_ioctl.h
projects/release-pkg/sys/dev/iscsi/iscsi_proto.h
projects/release-pkg/sys/dev/isp/isp.c
projects/release-pkg/sys/dev/isp/isp_freebsd.c
projects/release-pkg/sys/dev/mem/memdev.c
projects/release-pkg/sys/dev/mii/mii.c
projects/release-pkg/sys/dev/mmc/host/dwmmc.c
projects/release-pkg/sys/dev/mmc/host/dwmmc.h
projects/release-pkg/sys/dev/mps/mps.c
projects/release-pkg/sys/dev/mps/mps_user.c
projects/release-pkg/sys/dev/netmap/netmap.c
projects/release-pkg/sys/dev/ofw/ofw_cpu.c
projects/release-pkg/sys/dev/ofw/openfirm.c
projects/release-pkg/sys/dev/pci/pci.c
projects/release-pkg/sys/dev/pci/pci_pci.c
projects/release-pkg/sys/dev/sfxge/common/efsys.h
projects/release-pkg/sys/dev/sfxge/common/efx_ev.c
projects/release-pkg/sys/dev/sfxge/common/efx_tx.c
projects/release-pkg/sys/dev/sfxge/sfxge.c
projects/release-pkg/sys/dev/sfxge/sfxge.h
projects/release-pkg/sys/dev/sfxge/sfxge_dma.c
projects/release-pkg/sys/dev/sfxge/sfxge_ev.c
projects/release-pkg/sys/dev/sfxge/sfxge_intr.c
projects/release-pkg/sys/dev/sfxge/sfxge_mcdi.c
projects/release-pkg/sys/dev/sfxge/sfxge_port.c
projects/release-pkg/sys/dev/sfxge/sfxge_rx.c
projects/release-pkg/sys/dev/sfxge/sfxge_tx.c
projects/release-pkg/sys/dev/sfxge/sfxge_tx.h
projects/release-pkg/sys/dev/syscons/syscons.c
projects/release-pkg/sys/dev/uart/uart_bus_pci.c
projects/release-pkg/sys/dev/usb/controller/ehci_ixp4xx.c
projects/release-pkg/sys/dev/usb/controller/xhci.c
projects/release-pkg/sys/dev/usb/input/uhid.c
projects/release-pkg/sys/dev/usb/net/if_cdce.c
projects/release-pkg/sys/dev/usb/serial/u3g.c
projects/release-pkg/sys/dev/usb/usb_core.h
projects/release-pkg/sys/dev/usb/usb_generic.c
projects/release-pkg/sys/dev/usb/usb_msctest.c
projects/release-pkg/sys/dev/usb/usb_transfer.c
projects/release-pkg/sys/dev/usb/usbdevs
projects/release-pkg/sys/dev/virtio/block/virtio_blk.c
projects/release-pkg/sys/dev/vt/hw/fb/vt_fb.c
projects/release-pkg/sys/dev/vt/hw/fb/vt_fb.h
projects/release-pkg/sys/dev/vt/hw/vga/vt_vga.c
projects/release-pkg/sys/dev/vt/vt.h
projects/release-pkg/sys/dev/vt/vt_core.c
projects/release-pkg/sys/dev/wpi/if_wpi.c
projects/release-pkg/sys/dev/wpi/if_wpireg.h
projects/release-pkg/sys/dev/wpi/if_wpivar.h
projects/release-pkg/sys/dev/xen/timer/timer.c
projects/release-pkg/sys/fs/cd9660/cd9660_util.c
projects/release-pkg/sys/fs/devfs/devfs_devs.c
projects/release-pkg/sys/fs/devfs/devfs_int.h
projects/release-pkg/sys/fs/devfs/devfs_vnops.c
projects/release-pkg/sys/fs/fdescfs/fdesc_vfsops.c
projects/release-pkg/sys/fs/msdosfs/msdosfs_conv.c
projects/release-pkg/sys/fs/smbfs/smbfs_subr.c
projects/release-pkg/sys/fs/tmpfs/tmpfs.h
projects/release-pkg/sys/fs/tmpfs/tmpfs_subr.c
projects/release-pkg/sys/fs/tmpfs/tmpfs_vfsops.c
projects/release-pkg/sys/fs/tmpfs/tmpfs_vnops.c
projects/release-pkg/sys/fs/udf/udf_vnops.c
projects/release-pkg/sys/i386/i386/machdep.c
projects/release-pkg/sys/i386/i386/mem.c
projects/release-pkg/sys/i386/i386/mp_machdep.c
projects/release-pkg/sys/i386/xen/clock.c
projects/release-pkg/sys/kern/capabilities.conf
projects/release-pkg/sys/kern/init_main.c
projects/release-pkg/sys/kern/init_sysent.c
projects/release-pkg/sys/kern/kern_clock.c
projects/release-pkg/sys/kern/kern_clocksource.c
projects/release-pkg/sys/kern/kern_condvar.c
projects/release-pkg/sys/kern/kern_conf.c
projects/release-pkg/sys/kern/kern_descrip.c
projects/release-pkg/sys/kern/kern_jail.c
projects/release-pkg/sys/kern/kern_lock.c
projects/release-pkg/sys/kern/kern_switch.c
projects/release-pkg/sys/kern/kern_synch.c
projects/release-pkg/sys/kern/kern_tc.c
projects/release-pkg/sys/kern/kern_thread.c
projects/release-pkg/sys/kern/kern_timeout.c
projects/release-pkg/sys/kern/kern_umtx.c
projects/release-pkg/sys/kern/subr_bus.c
projects/release-pkg/sys/kern/subr_dummy_vdso_tc.c
projects/release-pkg/sys/kern/subr_hints.c
projects/release-pkg/sys/kern/subr_prf.c
projects/release-pkg/sys/kern/subr_sglist.c
projects/release-pkg/sys/kern/subr_sleepqueue.c
projects/release-pkg/sys/kern/sys_pipe.c
projects/release-pkg/sys/kern/syscalls.c
projects/release-pkg/sys/kern/syscalls.master
projects/release-pkg/sys/kern/systrace_args.c
projects/release-pkg/sys/kern/vfs_subr.c
projects/release-pkg/sys/kern/vfs_syscalls.c
projects/release-pkg/sys/libkern/strtol.c
projects/release-pkg/sys/libkern/strtoq.c
projects/release-pkg/sys/libkern/strtoul.c
projects/release-pkg/sys/libkern/strtouq.c
projects/release-pkg/sys/mips/atheros/ar71xx_gpio.c
projects/release-pkg/sys/mips/atheros/ar71xx_gpiovar.h
projects/release-pkg/sys/mips/atheros/if_argevar.h
projects/release-pkg/sys/mips/cavium/octeon_gpio.c
projects/release-pkg/sys/mips/cavium/octeon_gpiovar.h
projects/release-pkg/sys/mips/include/cache_mipsNN.h
projects/release-pkg/sys/mips/mips/cache.c
projects/release-pkg/sys/mips/mips/cache_mipsNN.c
projects/release-pkg/sys/mips/mips/freebsd32_machdep.c
projects/release-pkg/sys/mips/mips/mem.c
projects/release-pkg/sys/mips/mips/pm_machdep.c
projects/release-pkg/sys/mips/rt305x/rt305x_gpio.c
projects/release-pkg/sys/mips/rt305x/rt305x_gpiovar.h
projects/release-pkg/sys/modules/Makefile
projects/release-pkg/sys/modules/aesni/Makefile
projects/release-pkg/sys/modules/ctl/Makefile
projects/release-pkg/sys/modules/cxgbe/Makefile
projects/release-pkg/sys/modules/cxgbe/if_cxgbe/Makefile
projects/release-pkg/sys/modules/drm2/i915kms/Makefile
projects/release-pkg/sys/modules/geom/Makefile
projects/release-pkg/sys/modules/iscsi/Makefile
projects/release-pkg/sys/modules/wpi/Makefile
projects/release-pkg/sys/net/ieee8023ad_lacp.c
projects/release-pkg/sys/net/if_lagg.c
projects/release-pkg/sys/net/pfvar.h
projects/release-pkg/sys/netgraph/ng_parse.c
projects/release-pkg/sys/netinet/ip_carp.c
projects/release-pkg/sys/netinet/ip_output.c
projects/release-pkg/sys/netinet/sctp_input.c
projects/release-pkg/sys/netinet/sctp_sysctl.c
projects/release-pkg/sys/netinet/sctp_usrreq.c
projects/release-pkg/sys/netinet/tcp_hostcache.c
projects/release-pkg/sys/netinet/tcp_syncache.c
projects/release-pkg/sys/netinet6/in6.c
projects/release-pkg/sys/netipsec/key.c
projects/release-pkg/sys/netpfil/ipfw/ip_fw_iface.c (contents, props changed)
projects/release-pkg/sys/netpfil/ipfw/ip_fw_nat.c
projects/release-pkg/sys/netpfil/ipfw/ip_fw_private.h
projects/release-pkg/sys/netpfil/ipfw/ip_fw_table.c
projects/release-pkg/sys/netpfil/ipfw/ip_fw_table_algo.c
projects/release-pkg/sys/netpfil/pf/pf.c
projects/release-pkg/sys/netpfil/pf/pf_if.c
projects/release-pkg/sys/netpfil/pf/pf_ioctl.c
projects/release-pkg/sys/netpfil/pf/pf_norm.c
projects/release-pkg/sys/netpfil/pf/pf_table.c
projects/release-pkg/sys/ofed/drivers/infiniband/core/device.c
projects/release-pkg/sys/ofed/drivers/infiniband/hw/mlx4/main.c
projects/release-pkg/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
projects/release-pkg/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
projects/release-pkg/sys/ofed/drivers/net/mlx4/en_main.c
projects/release-pkg/sys/ofed/drivers/net/mlx4/main.c
projects/release-pkg/sys/ofed/include/linux/bitops.h
projects/release-pkg/sys/ofed/include/linux/cache.h
projects/release-pkg/sys/ofed/include/linux/completion.h
projects/release-pkg/sys/ofed/include/linux/dma-mapping.h
projects/release-pkg/sys/ofed/include/linux/etherdevice.h
projects/release-pkg/sys/ofed/include/linux/gfp.h
projects/release-pkg/sys/ofed/include/linux/io.h
projects/release-pkg/sys/ofed/include/linux/kernel.h
projects/release-pkg/sys/ofed/include/linux/ktime.h
projects/release-pkg/sys/ofed/include/linux/linux_idr.c
projects/release-pkg/sys/ofed/include/linux/module.h
projects/release-pkg/sys/ofed/include/linux/slab.h
projects/release-pkg/sys/powerpc/aim/locore64.S
projects/release-pkg/sys/powerpc/aim/machdep.c
projects/release-pkg/sys/powerpc/aim/mp_cpudep.c
projects/release-pkg/sys/powerpc/aim/trap_subr32.S
projects/release-pkg/sys/powerpc/aim/trap_subr64.S
projects/release-pkg/sys/powerpc/include/trap.h
projects/release-pkg/sys/powerpc/ofw/ofw_machdep.c
projects/release-pkg/sys/powerpc/ofw/rtas.c
projects/release-pkg/sys/powerpc/powerpc/elf64_machdep.c
projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c
projects/release-pkg/sys/powerpc/powerpc/mem.c
projects/release-pkg/sys/powerpc/pseries/plpar_iommu.c
projects/release-pkg/sys/rpc/svc_vc.c
projects/release-pkg/sys/sparc64/sparc64/machdep.c
projects/release-pkg/sys/sparc64/sparc64/mem.c
projects/release-pkg/sys/sys/_callout.h
projects/release-pkg/sys/sys/bus.h
projects/release-pkg/sys/sys/callout.h
projects/release-pkg/sys/sys/capsicum.h
projects/release-pkg/sys/sys/cdefs.h
projects/release-pkg/sys/sys/conf.h
projects/release-pkg/sys/sys/elf_common.h
projects/release-pkg/sys/sys/eventhandler.h
projects/release-pkg/sys/sys/jail.h
projects/release-pkg/sys/sys/param.h
projects/release-pkg/sys/sys/pmc.h
projects/release-pkg/sys/sys/proc.h
projects/release-pkg/sys/sys/stat.h
projects/release-pkg/sys/sys/syscall.h
projects/release-pkg/sys/sys/syscall.mk
projects/release-pkg/sys/sys/syscallsubr.h
projects/release-pkg/sys/sys/sysproto.h
projects/release-pkg/sys/sys/systm.h
projects/release-pkg/sys/sys/tree.h
projects/release-pkg/sys/sys/ucontext.h
projects/release-pkg/sys/sys/vdso.h
projects/release-pkg/sys/ufs/ffs/ffs_softdep.c
projects/release-pkg/sys/ufs/ffs/softdep.h
projects/release-pkg/sys/ufs/ufs/ufs_quota.c
projects/release-pkg/sys/ufs/ufs/ufs_vfsops.c
projects/release-pkg/sys/vm/vm_fault.c
projects/release-pkg/sys/vm/vm_map.c
projects/release-pkg/sys/vm/vm_object.c
projects/release-pkg/sys/vm/vm_object.h
projects/release-pkg/sys/vm/vm_pageout.c
projects/release-pkg/sys/x86/x86/local_apic.c
projects/release-pkg/sys/x86/x86/tsc.c
projects/release-pkg/sys/x86/xen/pv.c
projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc
projects/release-pkg/tools/regression/file/flock/flock.c
projects/release-pkg/tools/tools/makeroot/makeroot.8
projects/release-pkg/tools/tools/makeroot/makeroot.sh
projects/release-pkg/tools/tools/nanobsd/nanobsd.sh (contents, props changed)
projects/release-pkg/tools/tools/nanobsd/rescue/build.sh
projects/release-pkg/tools/tools/nanobsd/rescue/common
projects/release-pkg/usr.bin/Makefile
projects/release-pkg/usr.bin/ctlstat/ctlstat.c
projects/release-pkg/usr.bin/grep/Makefile
projects/release-pkg/usr.bin/grep/file.c
projects/release-pkg/usr.bin/iscsictl/iscsi.conf.5
projects/release-pkg/usr.bin/iscsictl/iscsictl.c
projects/release-pkg/usr.bin/iscsictl/iscsictl.h
projects/release-pkg/usr.bin/iscsictl/parse.y
projects/release-pkg/usr.bin/iscsictl/token.l
projects/release-pkg/usr.bin/kdump/kdump.c
projects/release-pkg/usr.bin/ktrdump/ktrdump.8
projects/release-pkg/usr.bin/ktrdump/ktrdump.c
projects/release-pkg/usr.bin/sed/main.c
projects/release-pkg/usr.bin/sed/process.c
projects/release-pkg/usr.bin/touch/touch.c
projects/release-pkg/usr.bin/vmstat/vmstat.c
projects/release-pkg/usr.sbin/Makefile
projects/release-pkg/usr.sbin/Makefile.amd64
projects/release-pkg/usr.sbin/autofs/autounmountd.c
projects/release-pkg/usr.sbin/binmiscctl/binmiscctl.c
projects/release-pkg/usr.sbin/bluetooth/hccontrol/hccontrol.8
projects/release-pkg/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
projects/release-pkg/usr.sbin/bsdinstall/partedit/partedit_x86.c
projects/release-pkg/usr.sbin/config/config.8
projects/release-pkg/usr.sbin/config/config.y
projects/release-pkg/usr.sbin/config/configvers.h
projects/release-pkg/usr.sbin/config/main.c
projects/release-pkg/usr.sbin/ctladm/ctladm.8
projects/release-pkg/usr.sbin/ctladm/ctladm.c
projects/release-pkg/usr.sbin/ctld/ctl.conf.5
projects/release-pkg/usr.sbin/ctld/ctld.c
projects/release-pkg/usr.sbin/ctld/ctld.h
projects/release-pkg/usr.sbin/ctld/discovery.c
projects/release-pkg/usr.sbin/ctld/kernel.c
projects/release-pkg/usr.sbin/ctld/login.c
projects/release-pkg/usr.sbin/ctld/parse.y
projects/release-pkg/usr.sbin/ctld/token.l
projects/release-pkg/usr.sbin/devinfo/devinfo.c
projects/release-pkg/usr.sbin/freebsd-update/freebsd-update.sh
projects/release-pkg/usr.sbin/iostat/iostat.c
projects/release-pkg/usr.sbin/iscsid/iscsid.c
projects/release-pkg/usr.sbin/iscsid/iscsid.h
projects/release-pkg/usr.sbin/iscsid/login.c
projects/release-pkg/usr.sbin/jail/command.c
projects/release-pkg/usr.sbin/jail/config.c
projects/release-pkg/usr.sbin/jail/jail.8
projects/release-pkg/usr.sbin/jail/jail.c
projects/release-pkg/usr.sbin/jail/jailp.h
projects/release-pkg/usr.sbin/pciconf/pciconf.c
projects/release-pkg/usr.sbin/pkg/pkg.c
projects/release-pkg/usr.sbin/pmcstudy/pmcstudy.c
projects/release-pkg/usr.sbin/ppp/Makefile
projects/release-pkg/usr.sbin/ppp/command.c
projects/release-pkg/usr.sbin/ppp/ipcp.c
projects/release-pkg/usr.sbin/ppp/ipv6cp.c
projects/release-pkg/usr.sbin/ppp/radius.c
projects/release-pkg/usr.sbin/ppp/server.c
projects/release-pkg/usr.sbin/sa/db.c
projects/release-pkg/usr.sbin/syslogd/syslogd.c
Directory Properties:
projects/release-pkg/ (props changed)
projects/release-pkg/cddl/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/lib/libzfs/ (props changed)
projects/release-pkg/contrib/amd/ (props changed)
projects/release-pkg/contrib/elftoolchain/ (props changed)
projects/release-pkg/contrib/gcc/ (props changed)
projects/release-pkg/contrib/gdb/ (props changed)
projects/release-pkg/contrib/libcxxrt/ (props changed)
projects/release-pkg/contrib/llvm/ (props changed)
projects/release-pkg/contrib/llvm/tools/clang/ (props changed)
projects/release-pkg/contrib/mdocml/ (props changed)
projects/release-pkg/contrib/sendmail/ (props changed)
projects/release-pkg/contrib/tcpdump/ (props changed)
projects/release-pkg/etc/ (props changed)
projects/release-pkg/include/ (props changed)
projects/release-pkg/lib/libc/ (props changed)
projects/release-pkg/lib/libutil/ (props changed)
projects/release-pkg/sbin/ (props changed)
projects/release-pkg/sbin/ipfw/ (props changed)
projects/release-pkg/share/ (props changed)
projects/release-pkg/share/man/man4/ (props changed)
projects/release-pkg/sys/ (props changed)
projects/release-pkg/sys/amd64/vmm/ (props changed)
projects/release-pkg/sys/boot/ (props changed)
projects/release-pkg/sys/boot/powerpc/kboot/ (props changed)
projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed)
projects/release-pkg/sys/conf/ (props changed)
projects/release-pkg/usr.sbin/jail/ (props changed)
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/Makefile.inc1 Sun Feb 8 15:41:27 2015 (r278383)
@@ -1292,12 +1292,16 @@ _clang_tblgen= \
usr.bin/clang/clang-tblgen
.endif
+# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
# dtrace tools are required for older bootstrap env and cross-build
# pre libdwarf
-.if ${MK_CDDL} != "no" && (${BOOTSTRAPPING} < 1100006 \
- || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
- lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+.if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
+ ${MACHINE_ARCH} != ${TARGET_ARCH})
+_elftoolchain_libs= lib/libelf lib/libdwarf
+.if ${MK_CDDL} != "no"
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
+ cddl/usr.bin/ctfmerge
+.endif
.endif
# Default to building the GPL DTC, but build the BSDL one if users explicitly
@@ -1324,6 +1328,7 @@ bootstrap-tools: .MAKE
.for _tool in \
${_clang_tblgen} \
${_kerberos5_bootstrap_tools} \
+ ${_elftoolchain_libs} \
${_dtrace_tools} \
${_strfile} \
${_gperf} \
@@ -1428,11 +1433,13 @@ _binutils= gnu/usr.bin/binutils
.endif
.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
_elftctools= lib/libelftc \
- usr.bin/addr2line \
usr.bin/elfcopy \
usr.bin/nm \
usr.bin/size \
usr.bin/strings
+# These are not required by the build, but can be useful for developers who
+# cross-build on a FreeBSD 10 host:
+_elftctools+= usr.bin/addr2line
.endif
.endif
@@ -1627,7 +1634,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_lib_libcapsicum} \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
- lib/libradius lib/libsbuf lib/libtacplus \
+ ${_lib_libradius} lib/libsbuf lib/libtacplus \
lib/libgeom \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
${_cddl_lib_libuutil} \
@@ -1650,6 +1657,10 @@ lib/libgeom__L: lib/libexpat__L
_lib_libthr= lib/libthr
.endif
+.if ${MK_RADIUS_SUPPORT} != "no"
+_lib_libradius= lib/libradius
+.endif
+
.if ${MK_OFED} != "no"
_ofed_lib= contrib/ofed/usr.lib/
.endif
Modified: projects/release-pkg/ObsoleteFiles.inc
==============================================================================
--- projects/release-pkg/ObsoleteFiles.inc Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/ObsoleteFiles.inc Sun Feb 8 15:41:27 2015 (r278383)
@@ -38,6 +38,20 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150124: spl.9 and friends
+OLD_FILES+=usr/share/man/man9/spl.9
+OLD_FILES+=usr/share/man/man9/spl0.9
+OLD_FILES+=usr/share/man/man9/splbio.9
+OLD_FILES+=usr/share/man/man9/splclock.9
+OLD_FILES+=usr/share/man/man9/splhigh.9
+OLD_FILES+=usr/share/man/man9/splimp.9
+OLD_FILES+=usr/share/man/man9/splnet.9
+OLD_FILES+=usr/share/man/man9/splsoftclock.9
+OLD_FILES+=usr/share/man/man9/splsofttty.9
+OLD_FILES+=usr/share/man/man9/splstatclock.9
+OLD_FILES+=usr/share/man/man9/spltty.9
+OLD_FILES+=usr/share/man/man9/splvm.9
+OLD_FILES+=usr/share/man/man9/splx.9
# 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
Modified: projects/release-pkg/UPDATING
==============================================================================
--- projects/release-pkg/UPDATING Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/UPDATING Sun Feb 8 15:41:27 2015 (r278383)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150131:
+ The powerpc64 kernel has been changed to a position-independent
+ executable. This can only be booted with a new version of loader(8),
+ so make sure to update both world and kernel before rebooting.
+
20150118:
Clang and llvm have been upgraded to 3.5.1 release. This is a bugfix
only release, no new features have been added. Please see the 20141231
Modified: projects/release-pkg/bin/cp/utils.c
==============================================================================
--- projects/release-pkg/bin/cp/utils.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/cp/utils.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -330,7 +330,7 @@ copy_special(struct stat *from_stat, int
int
setfile(struct stat *fs, int fd)
{
- static struct timeval tv[2];
+ static struct timespec tspec[2];
struct stat ts;
int rval, gotstat, islink, fdval;
@@ -340,10 +340,11 @@ setfile(struct stat *fs, int fd)
fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
S_IRWXU | S_IRWXG | S_IRWXO;
- TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
- TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
- if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
- warn("%sutimes: %s", islink ? "l" : "", to.p_path);
+ tspec[0] = fs->st_atim;
+ tspec[1] = fs->st_mtim;
+ if (utimensat(AT_FDCWD, to.p_path, tspec,
+ islink ? AT_SYMLINK_NOFOLLOW : 0)) {
+ warn("utimensat: %s", to.p_path);
rval = 1;
}
if (fdval ? fstat(fd, &ts) :
Modified: projects/release-pkg/bin/expr/expr.y
==============================================================================
--- projects/release-pkg/bin/expr/expr.y Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/expr/expr.y Sun Feb 8 15:41:27 2015 (r278383)
@@ -444,14 +444,26 @@ op_minus(struct val *a, struct val *b)
return (r);
}
+/*
+ * We depend on undefined behaviour giving a result (in r).
+ * To test this result, pass it as volatile. This prevents
+ * optimizing away of the test based on the undefined behaviour.
+ */
void
-assert_times(intmax_t a, intmax_t b, intmax_t r)
+assert_times(intmax_t a, intmax_t b, volatile intmax_t r)
{
/*
- * if first operand is 0, no overflow is possible,
- * else result of division test must match second operand
+ * If the first operand is 0, no overflow is possible,
+ * else the result of the division test must match the
+ * second operand.
+ *
+ * Be careful to avoid overflow in the overflow test, as
+ * in assert_div(). Overflow in division would kill us
+ * with a SIGFPE before getting the test wrong. In old
+ * buggy versions, optimization used to give a null test
+ * instead of a SIGFPE.
*/
- if (a != 0 && r / a != b)
+ if ((a == -1 && b == INTMAX_MIN) || (a != 0 && r / a != b))
errx(ERR_EXIT, "overflow");
}
Modified: projects/release-pkg/bin/freebsd-version/Makefile
==============================================================================
--- projects/release-pkg/bin/freebsd-version/Makefile Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/freebsd-version/Makefile Sun Feb 8 15:41:27 2015 (r278383)
@@ -11,7 +11,7 @@ freebsd-version.sh: ${.CURDIR}/freebsd-v
s/@@TYPE@@/$${TYPE}/g; \
s/@@REVISION@@/$${REVISION}/g; \
s/@@BRANCH@@/$${BRANCH}/g; \
- " ${.ALLSRC} >${.TARGET} ; then \
+ " ${.CURDIR}/freebsd-version.sh.in >${.TARGET} ; then \
rm -f ${.TARGET} ; \
exit 1 ; \
fi
Modified: projects/release-pkg/bin/ln/symlink.7
==============================================================================
--- projects/release-pkg/bin/ln/symlink.7 Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/ln/symlink.7 Sun Feb 8 15:41:27 2015 (r278383)
@@ -29,7 +29,7 @@
.\" @(#)symlink.7 8.3 (Berkeley) 3/31/94
.\" $FreeBSD$
.\"
-.Dd December 29, 2014
+.Dd January 23, 2015
.Dt SYMLINK 7
.Os
.Sh NAME
@@ -147,9 +147,10 @@ unless given the
.Dv AT_SYMLINK_NOFOLLOW
flag:
.Xr fchmodat 2 ,
-.Xr fchownat 2
+.Xr fchownat 2 ,
+.Xr fstatat 2
and
-.Xr fstatat 2 .
+.Xr utimensat 2 .
.Pp
The owner and group of an existing symbolic link can be changed by
means of the
Modified: projects/release-pkg/bin/mv/mv.c
==============================================================================
--- projects/release-pkg/bin/mv/mv.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/mv/mv.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -273,7 +273,7 @@ do_move(const char *from, const char *to
static int
fastcopy(const char *from, const char *to, struct stat *sbp)
{
- struct timeval tval[2];
+ struct timespec ts[2];
static u_int blen = MAXPHYS;
static char *bp = NULL;
mode_t oldmode;
@@ -350,10 +350,9 @@ err: if (unlink(to))
} else
warn("%s: cannot stat", to);
- tval[0].tv_sec = sbp->st_atime;
- tval[1].tv_sec = sbp->st_mtime;
- tval[0].tv_usec = tval[1].tv_usec = 0;
- if (utimes(to, tval))
+ ts[0] = sbp->st_atim;
+ ts[1] = sbp->st_mtim;
+ if (utimensat(AT_FDCWD, to, ts, 0))
warn("%s: set times", to);
if (close(to_fd)) {
Modified: projects/release-pkg/bin/ps/ps.c
==============================================================================
--- projects/release-pkg/bin/ps/ps.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/ps/ps.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -178,7 +178,7 @@ main(int argc, char *argv[])
KINFO *kinfo = NULL, *next_KINFO;
KINFO_STR *ks;
struct varent *vent;
- struct winsize ws;
+ struct winsize ws = { .ws_row = 0 };
const char *nlistf, *memf, *fmtstr, *str;
char *cols;
int all, ch, elem, flag, _fmt, i, lineno, linelen, left;
Modified: projects/release-pkg/bin/sh/jobs.c
==============================================================================
--- projects/release-pkg/bin/sh/jobs.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/sh/jobs.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -87,8 +87,8 @@ static int ttyfd = -1;
/* mode flags for dowait */
#define DOWAIT_BLOCK 0x1 /* wait until a child exits */
-#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on SIGINT/SIGQUIT */
-#define DOWAIT_SIG_ANY 0x4 /* if DOWAIT_SIG, abort on any signal */
+#define DOWAIT_SIG 0x2 /* if DOWAIT_BLOCK, abort on signal */
+#define DOWAIT_SIG_TRAP 0x4 /* if DOWAIT_SIG, abort on trapped signal only */
#if JOBS
static void restartjob(struct job *);
@@ -1028,7 +1028,7 @@ waitforjob(struct job *jp, int *origstat
TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1));
while (jp->state == 0)
if (dowait(DOWAIT_BLOCK | (Tflag ? DOWAIT_SIG |
- DOWAIT_SIG_ANY : 0), jp) == -1)
+ DOWAIT_SIG_TRAP : 0), jp) == -1)
dotrap();
#if JOBS
if (jp->jobctl) {
@@ -1120,7 +1120,7 @@ dowait(int mode, struct job *job)
TRACE(("wait returns %d, status=%d\n", (int)pid, status));
if (pid == 0 && (mode & DOWAIT_SIG) != 0) {
pid = -1;
- if (((mode & DOWAIT_SIG_ANY) != 0 ?
+ if (((mode & DOWAIT_SIG_TRAP) != 0 ?
pendingsig : pendingsig_waitcmd) != 0) {
errno = EINTR;
break;
Modified: projects/release-pkg/bin/sh/trap.c
==============================================================================
--- projects/release-pkg/bin/sh/trap.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/bin/sh/trap.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$");
static char sigmode[NSIG]; /* current value of signal */
volatile sig_atomic_t pendingsig; /* indicates some signal received */
-volatile sig_atomic_t pendingsig_waitcmd; /* indicates SIGINT/SIGQUIT received */
+volatile sig_atomic_t pendingsig_waitcmd; /* indicates wait builtin should be interrupted */
static int in_dotrap; /* do we execute in a trap handler? */
static char *volatile trap[NSIG]; /* trap handler commands */
static volatile sig_atomic_t gotsig[NSIG];
@@ -400,6 +400,7 @@ onsig(int signo)
(signo != SIGCHLD || !ignore_sigchld)) {
gotsig[signo] = 1;
pendingsig = signo;
+ pendingsig_waitcmd = signo;
}
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl Sun Feb 8 15:41:27 2015 (r278383)
@@ -273,7 +273,7 @@ sub run_tests {
}
$fullname = "$dir/$name";
- $exe = "./$base.exe";
+ $exe = "$dir/$base.exe";
$exe_pid = -1;
if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 ||
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -38,4 +38,4 @@
*
*/
-inline cyc_func_t i = "i am a cyclic function";
+inline dtrace_trap_func_t i = "i am a dtrace trap function";
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -38,4 +38,4 @@
*
*/
-inline vfs_t *invalid = xlate<psinfo_t>(curthread->t_procp);
+inline struct vnode *invalid = xlate<psinfo_t>(curthread->td_proc);
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/tst.usdt.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -14,6 +14,8 @@
*/
#include <sys/sdt.h>
+#include <stdio.h>
+#include <stdlib.h>
#include "usdt.h"
#define FMT "{" \
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -36,8 +36,10 @@
BEGIN
{
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winvalid-pp-token"
h = '
';
+#pragma clang diagnostic pop
exit(0);
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -36,7 +36,9 @@
BEGIN
{
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winvalid-pp-token"
h = '';
exit(0);
+#pragma clang diagnostic pop
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -36,9 +36,11 @@
BEGIN
{
-
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winvalid-pp-token"
h = "hello
there";
exit(0);
+#pragma clang diagnostic pop
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -31,7 +31,6 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-CC=/usr/bin/gcc
CFLAGS=
doit()
@@ -47,7 +46,7 @@ void
main()
{}
EOF
- if $CC $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then
+ if cc $CFLAGS -o $cofile $cfile >/dev/null 2>&1; then
$dtrace -xerrtags -C -s /dev/stdin \
>/dev/null 2>$errfile <<EOF
#include <sys/$file>
@@ -67,11 +66,6 @@ EOF
rm -f $cofile $cfile 2>/dev/null
}
-if [ ! -x $CC ]; then
- echo "$0: bad compiler: $CC" >& 2
- exit 1
-fi
-
concurrency=`psrinfo | wc -l`
let concurrency=concurrency*4
let i=0
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -74,13 +74,13 @@ fbt:::return
(long long)curthread, pid, tid, (int)arg1, (int)arg0);
}
-mutex_enter:adaptive-acquire
+mtx_lock:adaptive-acquire
{
printf(" %u 0x%llX %d %d lock:0x%llX", timestamp,
(long long)curthread, pid, tid, arg0);
}
-mutex_exit:adaptive-release
+mtx_unlock:adaptive-release
{
printf(" %u 0x%llX %d %d lock:0x%llX", timestamp,
(long long) curthread, pid, tid, arg0);
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -28,6 +28,7 @@
#include <strings.h>
#include <rpc/rpc.h>
+#include <stdio.h>
#include <stdlib.h>
#include <sys/param.h>
#include <rpcsvc/mount.h>
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -40,5 +40,5 @@
BEGIN
{
- trace(offsetof(vnode_t, v_no_such_member));
+ trace(offsetof(struct vnode, v_no_such_member));
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -27,6 +27,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <signal.h>
+#include <stdlib.h>
#include <unistd.h>
int
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry
proc:::create
/pid == $1/
{
- child = args[0]->pr_pid;
+ child = args[0]->p_pid;
trace(pid);
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -26,6 +26,8 @@
#pragma ident "%Z%%M% %I% %E% SMI"
+#include <sys/types.h>
+#include <sys/wait.h>
#include <spawn.h>
#include <signal.h>
#include <stdio.h>
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -27,6 +27,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <signal.h>
+#include <stdlib.h>
#include <unistd.h>
/*
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -27,6 +27,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <signal.h>
+#include <stdlib.h>
#include <unistd.h>
/*
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -44,7 +44,7 @@ pid$1:a.out:waiting:entry
proc:::create
/pid == $1/
{
- child = args[0]->pr_pid;
+ child = args[0]->p_pid;
}
pid$1:a.out:go:
@@ -54,7 +54,7 @@ pid$1:a.out:go:
exit(1);
}
-syscall::rexit:entry
+syscall::exit:entry
/pid == $1/
{
exit(0);
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -27,6 +27,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <signal.h>
+#include <stdlib.h>
#include <unistd.h>
/*
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c Sun Feb 8 15:41:27 2015 (r278383)
@@ -27,6 +27,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <signal.h>
+#include <stdlib.h>
#include <unistd.h>
/*
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe
==============================================================================
Binary file (source and/or target). No diff available.
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe
==============================================================================
Binary file (source and/or target). No diff available.
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -25,7 +25,7 @@
BEGIN
{
- print((void)`p0);
+ print((void)`proc0);
}
BEGIN
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -22,13 +22,13 @@
typedef struct pancakes {
int i;
string s;
- timespec_t t;
+ struct timespec t;
} pancakes_t;
translator pancakes_t < void *V > {
i = 2 * 10;
s = strjoin("I like ", "pancakes");
- t = *(timespec_t *)`dtrace_zero;
+ t = *(struct timespec *)`dtrace_zero;
};
BEGIN
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out Sun Feb 8 15:41:27 2015 (r278383)
@@ -1,7 +1,7 @@
pancakes_t {
int i = 0x14
string s = [ "I like pancakes" ]
- timespec_t t = {
+ struct timespec t = {
time_t tv_sec = 0
long tv_nsec = 0
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -44,7 +44,7 @@ BEGIN
i = 0;
}
-syscall::*lwp*:entry
+syscall::*wait*:entry
{
exit(0);
}
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -36,8 +36,9 @@ script()
{
$dtrace -s /dev/stdin <<EOF
proc:::signal-discard
- /args[1]->pr_pid == $child &&
- args[1]->pr_psargs == "$longsleep" && args[2] == SIGHUP/
+ /args[1]->p_pid == $child &&
+ xlate<psinfo_t *>(args[1])->pr_psargs == "$longsleep" &&
+ args[2] == SIGHUP/
{
exit(0);
}
@@ -48,7 +49,7 @@ killer()
{
while true; do
sleep 1
- /usr/bin/kill -HUP $child
+ kill -HUP $child
done
}
@@ -58,7 +59,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-longsleep="/usr/bin/sleep 10000"
+longsleep="/bin/sleep 10000"
/usr/bin/nohup $longsleep &
child=$!
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -48,7 +48,7 @@ sleeper()
{
while true; do
$longsleep &
- /usr/bin/sleep 1
+ sleep 1
kill -9 $!
done
}
@@ -59,7 +59,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-longsleep="/usr/bin/sleep 10000"
+longsleep="/bin/sleep 10000"
sleeper &
child=$!
@@ -67,9 +67,9 @@ child=$!
script
status=$?
-pstop $child
+kill -STOP $child
pkill -P $child
kill $child
-prun $child
+kill -CONT $child
exit $status
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -37,12 +37,13 @@ script()
$dtrace -s /dev/stdin <<EOF
proc:::signal-send
/execname == "kill" && curpsinfo->pr_ppid == $child &&
- args[1]->pr_psargs == "$longsleep" && args[2] == SIGUSR1/
+ xlate<psinfo_t *>(args[1])->pr_psargs == "$longsleep" &&
+ args[2] == SIGUSR1/
{
/*
* This is guaranteed to not race with signal-handle.
*/
- target = args[1]->pr_pid;
+ target = args[1]->p_pid;
}
proc:::signal-handle
@@ -58,7 +59,7 @@ sleeper()
while true; do
$longsleep &
sleep 1
- /usr/bin/kill -USR1 $!
+ kill -USR1 $!
done
}
@@ -68,7 +69,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-longsleep="/usr/bin/sleep 10000"
+longsleep="/bin/sleep 10000"
sleeper &
child=$!
@@ -76,9 +77,9 @@ child=$!
script
status=$?
-pstop $child
+kill -STOP $child
pkill -P $child
kill $child
-prun $child
+kill -CONT $child
exit $status
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -60,14 +60,14 @@ spinny &
child=$!
#
-# This is gutsy -- we're assuming that mutex_enter(9F) will show up in the
+# This is gutsy -- we're assuming that mtx_lock(9) will show up in the
# output. This is most likely _not_ to show up in the output if the
# platform does not support arbitrary resolution interval timers -- but
# the above script was stress-tested down to 100 hertz and still ran
# successfully on all platforms, so one is hopeful that this test will pass
# even in that case.
#
-script | tee /dev/fd/2 | grep mutex_enter > /dev/null
+script | tee /dev/fd/2 | grep mtx_lock > /dev/null
status=$?
kill $child
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -63,7 +63,7 @@ child=$!
# The only thing we can be sure of is that some module named "unix" (or
# "genunix") did some work -- so that's all we'll check.
#
-script | tee /dev/fd/2 | grep unix > /dev/null
+script | tee /dev/fd/2 | grep kernel > /dev/null
status=$?
kill $child
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -63,7 +63,7 @@ child=$!
# This is the same gutsy test as that found in the func() test; see that
# test for the rationale.
#
-script | tee /dev/fd/2 | grep mutex_enter > /dev/null
+script | tee /dev/fd/2 | grep mtx_lock > /dev/null
status=$?
kill $child
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scalars/tst.selfarray2.d Sun Feb 8 15:41:27 2015 (r278383)
@@ -31,8 +31,8 @@
#pragma D option dynvarsize=1m
struct bar {
- int pid;
- kthread_t *curthread;
+ pid_t pid;
+ struct thread *curthread;
};
self struct bar foo[int];
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.D_MACRO_UNUSED.overflow.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$.d
## Create .d file
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.arguments.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -42,7 +42,7 @@ fi
dtrace=$1
-bname=`/usr/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.egid.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -43,7 +43,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-bname=`/usr/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$.d
## Create .d file
@@ -77,7 +77,7 @@ fi
#Get the groupid of the calling process using ps
-groupid=`ps -o pid,pgid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+groupid=`ps -x -o pid,egid | grep "$$ " | awk '{print $2}' 2>/dev/null`
if [ $? -ne 0 ]; then
print -u2 "unable to get uid of the current process with pid = $$"
exit 1
@@ -93,5 +93,5 @@ fi
#Cleanup leftovers
-/bin/rm -f $dfilename
+rm -f $dfilename
exit 0
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.euid.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$
## Create .d file
@@ -69,7 +69,7 @@ EOF
chmod 555 $dfilename
-userid=`ps -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+userid=`ps -x -o pid,uid | grep "$$ " | awk '{print $2}' 2>/dev/null`
if [ $? -ne 0 ]; then
print -u2 "unable to get uid of the current process with pid = $$"
exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
exit 1
fi
-#/bin/rm -f $dfilename
+rm -f $dfilename
exit 0
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.gid.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$
## Create .d file
@@ -69,7 +69,7 @@ EOF
chmod 555 $dfilename
-groupid=`ps -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+groupid=`ps -x -o pid,gid | grep "$$ " | awk '{print $2}' 2>/dev/null`
if [ $? -ne 0 ]; then
print -u2 "unable to get uid of the current process with pid = $$"
exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
exit 1
fi
-#/bin/rm -f $dfilename
+rm -f $dfilename
exit 0
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.ppid.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$.d
## Create .d file
@@ -75,12 +75,12 @@ fi
#Pass current pid (I mean parent pid for .d script).
-$dfilename $$ >/dev/null 2>&1
+$dfilename $$ #>/dev/null 2>&1
if [ $? -ne 0 ]; then
print -u2 "Error in executing $dfilename"
exit 1
fi
-#/bin/rm -f $dfilename
+rm -f $dfilename
exit 0
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.projid.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$
## Create .d file
@@ -69,7 +69,7 @@ EOF
chmod 555 $dfilename
-projectid=`ps -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+projectid=`ps -x -o pid,projid | grep "$$ " | awk '{print $2}' 2>/dev/null`
if [ $? -ne 0 ]; then
print -u2 "unable to get uid of the current process with pid = $$"
exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
exit 1
fi
-#/bin/rm -f $dfilename
+rm -f $dfilename
exit 0
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.sid.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
fi
dtrace=$1
-bname=`/bin/basename $0`
+bname=`basename $0`
dfilename=/var/tmp/$bname.$$
## Create .d file
@@ -69,7 +69,7 @@ EOF
chmod 555 $dfilename
-sessionid=`ps -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null`
+sessionid=`ps -x -o pid,sid | grep "$$ " | awk '{print $2}' 2>/dev/null`
if [ $? -ne 0 ]; then
print -u2 "unable to get sid of the current process with pid = $$"
exit 1
@@ -82,5 +82,5 @@ if [ $? -ne 0 ]; then
exit 1
fi
-#/bin/rm -f $dfilename
+rm -f $dfilename
exit 0
Modified: projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh Sun Feb 8 15:14:06 2015 (r278382)
+++ projects/release-pkg/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/scripting/tst.stringmacro.ksh Sun Feb 8 15:41:27 2015 (r278383)
@@ -41,7 +41,7 @@ if [ $# != 1 ]; then
fi
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 16:00:36 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 8155B577;
Sun, 8 Feb 2015 16:00:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 6D73194D;
Sun, 8 Feb 2015 16:00:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18G0axT057632;
Sun, 8 Feb 2015 16:00:36 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18G0aMk057631;
Sun, 8 Feb 2015 16:00:36 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201502081600.t18G0aMk057631@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 8 Feb 2015 16:00:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278384 -
projects/clang360-import/contrib/llvm/tools/lldb/include/lldb
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 16:00:36 -0000
Author: emaste
Date: Sun Feb 8 16:00:35 2015
New Revision: 278384
URL: https://svnweb.freebsd.org/changeset/base/278384
Log:
Remove undesired LLDB_DISABLE_PYTHON
It was added accidentally during the merge and it causes build warnings
as it is set from the command line.
Modified:
projects/clang360-import/contrib/llvm/tools/lldb/include/lldb/lldb-python.h
Modified: projects/clang360-import/contrib/llvm/tools/lldb/include/lldb/lldb-python.h
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/include/lldb/lldb-python.h Sun Feb 8 15:41:27 2015 (r278383)
+++ projects/clang360-import/contrib/llvm/tools/lldb/include/lldb/lldb-python.h Sun Feb 8 16:00:35 2015 (r278384)
@@ -10,8 +10,6 @@
#ifndef LLDB_lldb_python_h_
#define LLDB_lldb_python_h_
-#define LLDB_DISABLE_PYTHON
-
// Python.h needs to be included before any system headers in order to avoid redefinition of macros
#ifdef LLDB_DISABLE_PYTHON
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 16:01:13 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 94FA465F;
Sun, 8 Feb 2015 16:01:13 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 81935957;
Sun, 8 Feb 2015 16:01:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18G1DZ1058845;
Sun, 8 Feb 2015 16:01:13 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18G1DLV058844;
Sun, 8 Feb 2015 16:01:13 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081601.t18G1DLV058844@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 16:01:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278385 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 16:01:13 -0000
Author: bapt
Date: Sun Feb 8 16:01:12 2015
New Revision: 278385
URL: https://svnweb.freebsd.org/changeset/base/278385
Log:
if BUILD_PKGS is set add sha256 hash into the metalogs
Modified:
projects/release-pkg/Makefile.inc1
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Sun Feb 8 16:00:35 2015 (r278384)
+++ projects/release-pkg/Makefile.inc1 Sun Feb 8 16:01:12 2015 (r278385)
@@ -466,6 +466,9 @@ IMAKE+= -DNO_ROOT METALOG=${METALOG}
INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR}
MTREEFLAGS+= -W
.endif
+.if defined(BUILD_PKGS)
+INSTALLFLAGS+= -h sha256
+.endif
.if defined(DB_FROM_SRC) || defined(NO_ROOT)
IMAKE_INSTALL= INSTALL="install ${INSTALLFLAGS}"
IMAKE_MTREE= MTREE_CMD="mtree ${MTREEFLAGS}"
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 16:18:48 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 97AAA987;
Sun, 8 Feb 2015 16:18:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 82E6DAF2;
Sun, 8 Feb 2015 16:18:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18GImb1064858;
Sun, 8 Feb 2015 16:18:48 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18GIlkj064854;
Sun, 8 Feb 2015 16:18:47 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201502081618.t18GIlkj064854@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 8 Feb 2015 16:18:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278386 -
projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 16:18:48 -0000
Author: emaste
Date: Sun Feb 8 16:18:46 2015
New Revision: 278386
URL: https://svnweb.freebsd.org/changeset/base/278386
Log:
Use FreeBSD ProcessMonitor.h on FreeBSD
There's an unfortunate layering issue between LLDB's Process/POSIX and
Process/{FreeBSD,Linux}, exposed by a refactoring in upstream revision
218568. Work around it by adding explicit #if defined(__FreeBSD__)
guards to include the correct header.
Modified:
projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp
projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp Sun Feb 8 16:01:12 2015 (r278385)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp Sun Feb 8 16:18:46 2015 (r278386)
@@ -31,7 +31,11 @@
#include "POSIXThread.h"
#include "ProcessPOSIX.h"
#include "ProcessPOSIXLog.h"
+#if defined(__FreeBSD__)
+#include "Plugins/Process/FreeBSD/ProcessMonitor.h"
+#else
#include "Plugins/Process/Linux/ProcessMonitor.h"
+#endif
#include "RegisterContextPOSIXProcessMonitor_arm64.h"
#include "RegisterContextPOSIXProcessMonitor_mips64.h"
#include "RegisterContextPOSIXProcessMonitor_powerpc.h"
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp Sun Feb 8 16:01:12 2015 (r278385)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp Sun Feb 8 16:18:46 2015 (r278386)
@@ -29,7 +29,11 @@
#include "ProcessPOSIX.h"
#include "ProcessPOSIXLog.h"
#include "Plugins/Process/Utility/InferiorCallPOSIX.h"
+#if defined(__FreeBSD__)
+#include "Plugins/Process/FreeBSD/ProcessMonitor.h"
+#else
#include "Plugins/Process/Linux/ProcessMonitor.h"
+#endif
#include "POSIXThread.h"
using namespace lldb;
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp Sun Feb 8 16:01:12 2015 (r278385)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_arm64.cpp Sun Feb 8 16:18:46 2015 (r278386)
@@ -13,7 +13,11 @@
#include "Plugins/Process/Utility/RegisterContextPOSIX_arm64.h"
#include "ProcessPOSIX.h"
#include "RegisterContextPOSIXProcessMonitor_arm64.h"
+#if defined(__FreeBSD__)
+#include "Plugins/Process/FreeBSD/ProcessMonitor.h"
+#else
#include "Plugins/Process/Linux/ProcessMonitor.h"
+#endif
#define REG_CONTEXT_SIZE (GetGPRSize())
Modified: projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp Sun Feb 8 16:01:12 2015 (r278385)
+++ projects/clang360-import/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp Sun Feb 8 16:18:46 2015 (r278386)
@@ -13,7 +13,11 @@
#include "Plugins/Process/Utility/RegisterContextPOSIX_mips64.h"
#include "ProcessPOSIX.h"
#include "RegisterContextPOSIXProcessMonitor_mips64.h"
+#if defined(__FreeBSD__)
+#include "Plugins/Process/FreeBSD/ProcessMonitor.h"
+#else
#include "Plugins/Process/Linux/ProcessMonitor.h"
+#endif
using namespace lldb_private;
using namespace lldb;
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 16:21:46 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 81DF8A94;
Sun, 8 Feb 2015 16:21:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 6E7C0BE3;
Sun, 8 Feb 2015 16:21:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18GLk4Z068685;
Sun, 8 Feb 2015 16:21:46 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18GLkrJ068684;
Sun, 8 Feb 2015 16:21:46 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081621.t18GLkrJ068684@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 16:21:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278387 - projects/release-pkg/sys/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 16:21:46 -0000
Author: bapt
Date: Sun Feb 8 16:21:45 2015
New Revision: 278387
URL: https://svnweb.freebsd.org/changeset/base/278387
Log:
Tag the mtree with the targets of the packages:
release tag will be the regular kernel
debug tag is for debug symbols
Modified:
projects/release-pkg/sys/conf/kern.post.mk
Modified: projects/release-pkg/sys/conf/kern.post.mk
==============================================================================
--- projects/release-pkg/sys/conf/kern.post.mk Sun Feb 8 16:18:46 2015 (r278386)
+++ projects/release-pkg/sys/conf/kern.post.mk Sun Feb 8 16:21:45 2015 (r278387)
@@ -262,9 +262,9 @@ kernel-install:
fi
.endif
mkdir -p ${DESTDIR}${KODIR}
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
+ ${INSTALL} -T release -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
+ ${INSTALL} -T debug -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
.if defined(KERNEL_EXTRA_INSTALL)
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
@@ -274,9 +274,9 @@ kernel-install:
kernel-reinstall:
@-chflags -R noschg ${DESTDIR}${KODIR}
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
+ ${INSTALL} -T release -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}
.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
- ${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
+ ${INSTALL} -T debug -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
config.o env.o hints.o vers.o vnode_if.o:
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 16:30:45 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 996AFBCF;
Sun, 8 Feb 2015 16:30:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 8604EC88;
Sun, 8 Feb 2015 16:30:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18GUjmD070555;
Sun, 8 Feb 2015 16:30:45 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18GUjom070554;
Sun, 8 Feb 2015 16:30:45 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081630.t18GUjom070554@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 16:30:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278388 - projects/release-pkg/sys/conf
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 16:30:45 -0000
Author: bapt
Date: Sun Feb 8 16:30:44 2015
New Revision: 278388
URL: https://svnweb.freebsd.org/changeset/base/278388
Log:
Also tag the modules
Modified:
projects/release-pkg/sys/conf/kmod.mk
Modified: projects/release-pkg/sys/conf/kmod.mk
==============================================================================
--- projects/release-pkg/sys/conf/kmod.mk Sun Feb 8 16:21:45 2015 (r278387)
+++ projects/release-pkg/sys/conf/kmod.mk Sun Feb 8 16:30:44 2015 (r278388)
@@ -282,10 +282,10 @@ _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
realinstall: _kmodinstall
.ORDER: beforeinstall _kmodinstall
_kmodinstall:
- ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
+ ${INSTALL} -T release -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
- ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
+ ${INSTALL} -T debug -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR}
.endif
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 17:26:47 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4B5B34C5;
Sun, 8 Feb 2015 17:26:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 34B13166;
Sun, 8 Feb 2015 17:26:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18HQlGo097156;
Sun, 8 Feb 2015 17:26:47 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18HQfIW097130;
Sun, 8 Feb 2015 17:26:41 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201502081726.t18HQfIW097130@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sun, 8 Feb 2015 17:26:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278390 - in projects/clang360-import: lib/clang
lib/clang/liblldbAPI lib/clang/liblldbCore lib/clang/liblldbDataFormatters
lib/clang/liblldbExpression lib/clang/liblldbHostCommon lib/c...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 17:26:47 -0000
Author: emaste
Date: Sun Feb 8 17:26:41 2015
New Revision: 278390
URL: https://svnweb.freebsd.org/changeset/base/278390
Log:
Update FreeBSD LLDB build for 3.6 update
Sponsored by: DARPA, AFRL
Added:
projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc/
projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc/Makefile
projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc64/
projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc64/Makefile
projects/clang360-import/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/
projects/clang360-import/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile
projects/clang360-import/lib/clang/liblldbPluginMemoryHistoryASan/
projects/clang360-import/lib/clang/liblldbPluginMemoryHistoryASan/Makefile
Modified:
projects/clang360-import/lib/clang/Makefile
projects/clang360-import/lib/clang/liblldbAPI/Makefile
projects/clang360-import/lib/clang/liblldbCore/Makefile
projects/clang360-import/lib/clang/liblldbDataFormatters/Makefile
projects/clang360-import/lib/clang/liblldbExpression/Makefile
projects/clang360-import/lib/clang/liblldbHostCommon/Makefile
projects/clang360-import/lib/clang/liblldbHostFreeBSD/Makefile
projects/clang360-import/lib/clang/liblldbHostPOSIX/Makefile
projects/clang360-import/lib/clang/liblldbInterpreter/Makefile
projects/clang360-import/lib/clang/liblldbPluginProcessElfCore/Makefile
projects/clang360-import/lib/clang/liblldbPluginProcessPOSIX/Makefile
projects/clang360-import/lib/clang/liblldbPluginProcessUtility/Makefile
projects/clang360-import/lib/clang/liblldbSymbol/Makefile
projects/clang360-import/lib/clang/liblldbTarget/Makefile
projects/clang360-import/lib/clang/liblldbUtility/Makefile
projects/clang360-import/usr.bin/clang/lldb/Makefile
Modified: projects/clang360-import/lib/clang/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -123,6 +123,8 @@ SUBDIR+=liblldb \
liblldbTarget \
liblldbUtility \
\
+ liblldbPluginABISysV_ppc \
+ liblldbPluginABISysV_ppc64 \
liblldbPluginABISysV_x86_64 \
liblldbPluginCXXItaniumABI \
liblldbPluginDisassemblerLLVM \
@@ -130,7 +132,9 @@ SUBDIR+=liblldb \
liblldbPluginDynamicLoaderPosixDYLD \
liblldbPluginInstructionARM \
liblldbPluginInstructionARM64 \
+ liblldbPluginInstrumentationRuntimeAddressSanitizer \
liblldbPluginJITLoaderGDB \
+ liblldbPluginMemoryHistoryASan \
liblldbPluginObjectContainerBSDArchive \
liblldbPluginObjectFileELF \
liblldbPluginObjectFileJIT \
Modified: projects/clang360-import/lib/clang/liblldbAPI/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbAPI/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbAPI/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -19,6 +19,7 @@ SRCS= SBAddress.cpp \
SBDeclaration.cpp \
SBError.cpp \
SBEvent.cpp \
+ SBExecutionContext.cpp \
SBExpressionOptions.cpp \
SBFileSpec.cpp \
SBFileSpecList.cpp \
@@ -43,6 +44,8 @@ SRCS= SBAddress.cpp \
SBSymbolContext.cpp \
SBSymbolContextList.cpp \
SBTarget.cpp \
+ SBThreadCollection.cpp \
+ SBThreadPlan.cpp \
SBThread.cpp \
SBType.cpp \
SBTypeCategory.cpp \
Modified: projects/clang360-import/lib/clang/liblldbCore/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbCore/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbCore/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -15,7 +15,6 @@ SRCS= Address.cpp \
Broadcaster.cpp \
Communication.cpp \
Connection.cpp \
- ConnectionFileDescriptor.cpp \
ConnectionMachPort.cpp \
ConnectionSharedMemory.cpp \
ConstString.cpp \
Modified: projects/clang360-import/lib/clang/liblldbDataFormatters/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbDataFormatters/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbDataFormatters/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -13,18 +13,23 @@ SRCS= CF.cpp \
FormatClasses.cpp \
FormatManager.cpp \
LibCxx.cpp \
+ LibCxxInitializerList.cpp \
LibCxxList.cpp \
LibCxxMap.cpp \
LibCxxUnorderedMap.cpp \
+ LibCxxVector.cpp \
LibStdcpp.cpp \
NSArray.cpp \
NSDictionary.cpp \
+ NSIndexPath.cpp \
NSSet.cpp \
+ StringPrinter.cpp \
TypeCategory.cpp \
TypeCategoryMap.cpp \
TypeFormat.cpp \
TypeSummary.cpp \
TypeSynthetic.cpp \
+ TypeValidator.cpp \
ValueObjectPrinter.cpp
TGHDRS= AttrList \
Modified: projects/clang360-import/lib/clang/liblldbExpression/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbExpression/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbExpression/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -13,6 +13,7 @@ SRCS= ASTDumper.cpp \
ClangExpressionParser.cpp \
ClangExpressionVariable.cpp \
ClangFunction.cpp \
+ ClangModulesDeclVendor.cpp \
ClangPersistentVariables.cpp \
ClangUserExpression.cpp \
ClangUtilityFunction.cpp \
Modified: projects/clang360-import/lib/clang/liblldbHostCommon/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbHostCommon/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbHostCommon/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -11,16 +11,22 @@ SRCS= Condition.cpp \
FileSpec.cpp \
Host.cpp \
HostInfoBase.cpp \
+ HostNativeThreadBase.cpp \
+ HostProcess.cpp \
+ HostThread.cpp \
IOObject.cpp \
+ MonitoringProcessLauncher.cpp \
Mutex.cpp \
OptionParser.cpp \
- Pipe.cpp \
+ PipeBase.cpp \
ProcessRunLock.cpp \
Socket.cpp \
SocketAddress.cpp \
SoftwareBreakpoint.cpp \
Symbols.cpp \
Terminal.cpp \
+ ThisThread.cpp \
+ ThreadLauncher.cpp \
TimeValue.cpp
TGHDRS= AttrList \
Modified: projects/clang360-import/lib/clang/liblldbHostFreeBSD/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbHostFreeBSD/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbHostFreeBSD/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -6,7 +6,9 @@ LIB= lldbHostFreeBSD
SRCDIR= tools/lldb/source/Host/freebsd
SRCS= Host.cpp \
- HostInfoFreeBSD.cpp
+ HostInfoFreeBSD.cpp \
+ HostThreadFreeBSD.cpp \
+ ThisThread.cpp
TGHDRS= DiagnosticCommonKinds \
DeclNodes \
Modified: projects/clang360-import/lib/clang/liblldbHostPOSIX/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbHostPOSIX/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbHostPOSIX/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -5,8 +5,12 @@
LIB= lldbHostPOSIX
SRCDIR= tools/lldb/source/Host/posix
-SRCS= FileSystem.cpp \
+SRCS= ConnectionFileDescriptorPosix.cpp \
+ FileSystem.cpp \
HostInfoPosix.cpp \
- HostProcessPosix.cpp
+ HostProcessPosix.cpp \
+ HostThreadPosix.cpp \
+ PipePosix.cpp \
+ ProcessLauncherPosix.cpp
.include "../lldb.lib.mk"
Modified: projects/clang360-import/lib/clang/liblldbInterpreter/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbInterpreter/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbInterpreter/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -28,6 +28,7 @@ SRCS= Args.cpp \
OptionValueArgs.cpp \
OptionValueArray.cpp \
OptionValueBoolean.cpp \
+ OptionValueChar.cpp \
OptionValueDictionary.cpp \
OptionValueEnumeration.cpp \
OptionValueFileSpec.cpp \
Added: projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= lldbPluginABISysV_ppc
+
+SRCDIR= tools/lldb/source/Plugins/ABI/SysV-ppc
+SRCS= ABISysV_ppc.cpp
+
+TGHDRS= DiagnosticCommonKinds \
+ DeclNodes \
+ StmtNodes \
+ CommentCommandList
+
+.include "../lldb.lib.mk"
Added: projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc64/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang360-import/lib/clang/liblldbPluginABISysV_ppc64/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= lldbPluginABISysV_ppc64
+
+SRCDIR= tools/lldb/source/Plugins/ABI/SysV-ppc64
+SRCS= ABISysV_ppc64.cpp
+
+TGHDRS= DiagnosticCommonKinds \
+ DeclNodes \
+ StmtNodes \
+ CommentCommandList
+
+.include "../lldb.lib.mk"
Added: projects/clang360-import/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang360-import/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= lldbPluginInstrumentationRuntimeAddressSanitizer
+
+SRCDIR= tools/lldb/source/Plugins/InstrumentationRuntime/AddressSanitizer
+SRCS= AddressSanitizerRuntime.cpp
+
+TGHDRS= Attrs \
+ DiagnosticCommonKinds \
+ DeclNodes \
+ StmtNodes \
+ CommentCommandList
+
+.include "../lldb.lib.mk"
Added: projects/clang360-import/lib/clang/liblldbPluginMemoryHistoryASan/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/clang360-import/lib/clang/liblldbPluginMemoryHistoryASan/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+LIB= lldbPluginMemoryHistoryASan
+
+SRCDIR= tools/lldb/source/Plugins/MemoryHistory/asan
+SRCS= MemoryHistoryASan.cpp
+
+TGHDRS= DiagnosticCommonKinds \
+ DeclNodes \
+ StmtNodes \
+ CommentCommandList
+
+.include "../lldb.lib.mk"
Modified: projects/clang360-import/lib/clang/liblldbPluginProcessElfCore/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbPluginProcessElfCore/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbPluginProcessElfCore/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -11,6 +11,7 @@ SRCDIR= tools/lldb/source/Plugins/Proces
SRCS= ProcessElfCore.cpp \
ThreadElfCore.cpp \
RegisterContextPOSIXCore_mips64.cpp \
+ RegisterContextPOSIXCore_powerpc.cpp \
RegisterContextPOSIXCore_x86_64.cpp
TGHDRS= DiagnosticCommonKinds \
Modified: projects/clang360-import/lib/clang/liblldbPluginProcessPOSIX/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbPluginProcessPOSIX/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbPluginProcessPOSIX/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -17,6 +17,7 @@ SRCS= POSIXStopInfo.cpp \
ProcessPOSIXLog.cpp \
RegisterContextPOSIXProcessMonitor_arm64.cpp \
RegisterContextPOSIXProcessMonitor_mips64.cpp \
+ RegisterContextPOSIXProcessMonitor_powerpc.cpp \
RegisterContextPOSIXProcessMonitor_x86.cpp
TGHDRS= AttrList \
Modified: projects/clang360-import/lib/clang/liblldbPluginProcessUtility/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbPluginProcessUtility/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbPluginProcessUtility/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -18,6 +18,7 @@ SRCS= DynamicRegisterInfo.cpp \
RegisterContextDummy.cpp \
RegisterContextFreeBSD_i386.cpp \
RegisterContextFreeBSD_mips64.cpp \
+ RegisterContextFreeBSD_powerpc.cpp \
RegisterContextFreeBSD_x86_64.cpp \
RegisterContextHistory.cpp \
RegisterContextLinux_arm64.cpp \
@@ -31,6 +32,7 @@ SRCS= DynamicRegisterInfo.cpp \
RegisterContextMemory.cpp \
RegisterContextPOSIX_arm64.cpp \
RegisterContextPOSIX_mips64.cpp \
+ RegisterContextPOSIX_powerpc.cpp \
RegisterContextPOSIX_x86.cpp \
RegisterContextThreadMemory.cpp \
StopInfoMachException.cpp \
Modified: projects/clang360-import/lib/clang/liblldbSymbol/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbSymbol/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbSymbol/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -12,6 +12,7 @@ SRCS= Block.cpp \
ClangExternalASTSourceCallbacks.cpp \
ClangExternalASTSourceCommon.cpp \
ClangNamespaceDecl.cpp \
+ CompactUnwindInfo.cpp \
CompileUnit.cpp \
Declaration.cpp \
DWARFCallFrameInfo.cpp \
Modified: projects/clang360-import/lib/clang/liblldbTarget/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbTarget/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbTarget/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -11,10 +11,13 @@ SRCS= ABI.cpp \
CPPLanguageRuntime.cpp \
ExecutionContext.cpp \
FileAction.cpp \
+ InstrumentationRuntime.cpp \
+ InstrumentationRuntimeStopInfo.cpp \
JITLoader.cpp \
JITLoaderList.cpp \
LanguageRuntime.cpp \
Memory.cpp \
+ MemoryHistory.cpp \
NativeRegisterContext.cpp \
NativeRegisterContextRegisterInfo.cpp \
ObjCLanguageRuntime.cpp \
@@ -38,11 +41,13 @@ SRCS= ABI.cpp \
Target.cpp \
TargetList.cpp \
Thread.cpp \
+ ThreadCollection.cpp \
ThreadList.cpp \
ThreadPlan.cpp \
ThreadPlanBase.cpp \
ThreadPlanCallFunction.cpp \
ThreadPlanCallUserExpression.cpp \
+ ThreadPlanPython.cpp \
ThreadPlanRunToAddress.cpp \
ThreadPlanShouldStopHere.cpp \
ThreadPlanStepInRange.cpp \
Modified: projects/clang360-import/lib/clang/liblldbUtility/Makefile
==============================================================================
--- projects/clang360-import/lib/clang/liblldbUtility/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/lib/clang/liblldbUtility/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -10,10 +10,12 @@ SRCS= ARM64_DWARF_Registers.cpp \
KQueue.cpp \
PseudoTerminal.cpp \
Range.cpp \
+ RegisterNumber.cpp \
SharingPtr.cpp \
StringExtractor.cpp \
StringExtractorGDBRemote.cpp \
StringLexer.cpp \
- TimeSpecTimeout.cpp
+ TimeSpecTimeout.cpp \
+ UriParser.cpp
.include "../lldb.lib.mk"
Modified: projects/clang360-import/usr.bin/clang/lldb/Makefile
==============================================================================
--- projects/clang360-import/usr.bin/clang/lldb/Makefile Sun Feb 8 16:50:00 2015 (r278389)
+++ projects/clang360-import/usr.bin/clang/lldb/Makefile Sun Feb 8 17:26:41 2015 (r278390)
@@ -36,16 +36,20 @@ LLDB_LIBS=\
lldbTarget \
lldbUtility \
\
+ lldbPluginABISysV_ppc \
+ lldbPluginABISysV_ppc64 \
lldbPluginABISysV_x86_64 \
lldbPluginCXXItaniumABI \
lldbPluginDisassemblerLLVM \
lldbPluginInstructionARM \
lldbPluginInstructionARM64 \
+ lldbPluginInstrumentationRuntimeAddressSanitizer \
lldbPluginJITLoaderGDB \
lldbPluginSymbolFileDWARF \
lldbPluginSymbolFileSymtab \
lldbPluginDynamicLoaderStatic \
lldbPluginDynamicLoaderPosixDYLD \
+ lldbPluginMemoryHistoryASan \
lldbPluginObjectContainerBSDArchive \
lldbPluginObjectFileELF \
lldbPluginObjectFileJIT \
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 18:06:37 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id AFDA2BB7;
Sun, 8 Feb 2015 18:06:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 9B9A3779;
Sun, 8 Feb 2015 18:06:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18I6b6W015854;
Sun, 8 Feb 2015 18:06:37 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18I6bV0015853;
Sun, 8 Feb 2015 18:06:37 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081806.t18I6bV0015853@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 18:06:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278391 - projects/release-pkg/release/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 18:06:37 -0000
Author: bapt
Date: Sun Feb 8 18:06:36 2015
New Revision: 278391
URL: https://svnweb.freebsd.org/changeset/base/278391
Log:
Add a awk script to convert the metalog output into plist
Splitting according to tags
Added:
projects/release-pkg/release/scripts/mtree-to-plist.awk (contents, props changed)
Added: projects/release-pkg/release/scripts/mtree-to-plist.awk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/release/scripts/mtree-to-plist.awk Sun Feb 8 18:06:36 2015 (r278391)
@@ -0,0 +1,15 @@
+#!/usr/bin/awk
+/^[^#]/ {
+ gsub(/^\./,"", $1)
+ tags=$NF
+ gsub(/tags=/,"", tags)
+ output=tags".plist"
+ uname=$3
+ gname=$4
+ mode=$5
+ gsub(/uname=/, "", uname);
+ gsub(/gname=/, "", gname);
+ gsub(/mode=/, "", mode);
+
+ print "@("uname","gname","mode") " $1 > output
+}
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 18:07:24 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D6C3FC9C;
Sun, 8 Feb 2015 18:07:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 C2615782;
Sun, 8 Feb 2015 18:07:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18I7ODp016000;
Sun, 8 Feb 2015 18:07:24 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18I7OWN015998;
Sun, 8 Feb 2015 18:07:24 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081807.t18I7OWN015998@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 18:07:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278392 - in projects/release-pkg/release/packages: .
kernel
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 18:07:24 -0000
Author: bapt
Date: Sun Feb 8 18:07:23 2015
New Revision: 278392
URL: https://svnweb.freebsd.org/changeset/base/278392
Log:
Add a packages/ subdirectory which will contain the metadata for packaging base
Add a first example to package the kernel
Added:
projects/release-pkg/release/packages/
projects/release-pkg/release/packages/kernel/
projects/release-pkg/release/packages/kernel/+MANIFEST
projects/release-pkg/release/packages/kernel/post-install
Added: projects/release-pkg/release/packages/kernel/+MANIFEST
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/release/packages/kernel/+MANIFEST Sun Feb 8 18:07:23 2015 (r278392)
@@ -0,0 +1,13 @@
+name = "FreeBSD-%PKGNAME%"
+origin = "base"
+version = "%VERSION%"
+comment = "%COMMENT%"
+categories = [ base ]
+maintainer = "re@FreeBSD.org"
+www = "http://www.FreeBSD.org"
+prefix = "/"
+licenselogic = "single"
+licenses = [ BSD2CLAUSE ]
+desc = <<EOD
+%DESC%
+EOD
Added: projects/release-pkg/release/packages/kernel/post-install
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/release/packages/kernel/post-install Sun Feb 8 18:07:23 2015 (r278392)
@@ -0,0 +1 @@
+/usr/sbin/kldxref /boot/kernel
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 18:12:35 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 0EC3FDCD;
Sun, 8 Feb 2015 18:12:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 EF1FB834;
Sun, 8 Feb 2015 18:12:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18ICY2C020122;
Sun, 8 Feb 2015 18:12:34 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18ICYu2020121;
Sun, 8 Feb 2015 18:12:34 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081812.t18ICYu2020121@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 18:12:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278393 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 18:12:35 -0000
Author: bapt
Date: Sun Feb 8 18:12:34 2015
New Revision: 278393
URL: https://svnweb.freebsd.org/changeset/base/278393
Log:
Add a new kernel-pkgs target to create pkg(8) packages from the kernel
The version scheme used is the following:
For stable/current branches:
${REVISION}.sYYYYMMDDhhmmss
s standing for snapshot
For releases branches:
${REVISION}_${PATCHLEVEL}
When packaging the kernel 2 different package are created per kernel
release (only contains the regular kernel and modules)
debug (contains the .symbols files)
Note that package the kernel (packaging world will follow the same rule) can
only by passing -DNO_ROOT to the build (hence can be done as a regular user)
To package the kernel:
make buildkernel
make distributekernel DESTDIR=/somewhere -DNO_ROOT
make kernel-pkgs DESTDIR=/somewhere -DNO_ROOT
The packages will be created inside the DESTDIR
Modified:
projects/release-pkg/Makefile.inc1
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Sun Feb 8 18:07:23 2015 (r278392)
+++ projects/release-pkg/Makefile.inc1 Sun Feb 8 18:12:34 2015 (r278393)
@@ -153,6 +153,21 @@ SRCRELDATE!= awk '/^\#define[[:space:]]*
VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
.endif
+.if !defined(PKG_VERSION)
+REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION
+BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH
+SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+ ${SRCDIR}/sys/sys/param.h
+.if ${BRANCH:MSTABLE*} || ${BRANCH:MCURRENT*}
+TIMENOW!= TZ=UTC date +%Y%m%d%H%M%S
+EXTRA_REVISION= .s${TIMENOW}
+.endif
+.if ${BRANCH:M*-p*}
+EXTRA_REVISION= _${BRANCH:C/.*-p([0-9]+$)/\1/}
+.endif
+PKG_VERSION= ${REVISION}${EXTRA_REVISION}
+.endif
+
KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
.if ${TARGET} == ${TARGET_ARCH}
_t= ${TARGET}
@@ -1165,6 +1180,54 @@ packagekernel:
.endfor
.endif
+kernel-pkgs:
+.if !defined(NO_ROOT)
+ @echo "ERROR: kernel-pkgs can only be done with -DNO_ROOT"; \
+ false
+.endif
+ @cd ${DESTDIR}/${DISTDIR} ; \
+ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
+ ${DESTDIR}/${DISTDIR}/kernel.meta
+.for flavor in release debug
+.if exists(${DESTDIR}/${DISTDIR}/${flavor}.plist)
+ @rm -rf ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir
+ @cp -r ${SRCDIR}/release/packages/kernel \
+ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir
+ @cd ${DESTDIR}/${DISTDIR} ; \
+ sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
+ -e "s/%PKGNAME%/kernel-${flavor}/" \
+ -e "s/%COMMENT%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
+ -e "s/%DESC%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
+ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
+ @pkg create -v -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
+ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
+ -r ${DESTDIR}/${DISTDIR}/kernel \
+ -o ${DESTDIR}
+.endif
+.endfor
+.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
+ @cd ${DESTDIR}/${DISTDIR} ; \
+ awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
+ ${DESTDIR}/${DISTDIR}/kernel${_kernel}.meta
+.for flavor in release debug
+.if exists(${DESTDIR}/${DISTDIR}/${flavor}.plist)
+ @rm -rf ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir
+ @cp -r ${SRCDIR}/release/packages/kernel \
+ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir
+ @cd ${DESTDIR}/${DISTDIR} ; \
+ sed -i '' -e "s/%VERSION%/${PKG_VERSION}/" \
+ -e "s/%PKGNAME%/kernel-${flavor}/" \
+ -e "s/%COMMENT%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
+ -e "s/%DESC%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
+ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
+ @pkg create -v -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
+ -p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
+ -r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
+ -o ${DESTDIR}
+.endif
+.endfor
+.endfor
+
#
# doxygen
#
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 18:15:29 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 09A62ED0;
Sun, 8 Feb 2015 18:15:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 EA828844;
Sun, 8 Feb 2015 18:15:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18IFSrQ020612;
Sun, 8 Feb 2015 18:15:28 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18IFSu4020611;
Sun, 8 Feb 2015 18:15:28 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081815.t18IFSu4020611@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 18:15:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278394 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 18:15:29 -0000
Author: bapt
Date: Sun Feb 8 18:15:28 2015
New Revision: 278394
URL: https://svnweb.freebsd.org/changeset/base/278394
Log:
Remove the verbose flag from pkg invocation as it is not in pkg releases yet
Modified:
projects/release-pkg/Makefile.inc1
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Sun Feb 8 18:12:34 2015 (r278393)
+++ projects/release-pkg/Makefile.inc1 Sun Feb 8 18:15:28 2015 (r278394)
@@ -1199,7 +1199,7 @@ kernel-pkgs:
-e "s/%COMMENT%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
-e "s/%DESC%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
- @pkg create -v -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
+ @pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
-r ${DESTDIR}/${DISTDIR}/kernel \
-o ${DESTDIR}
@@ -1220,7 +1220,7 @@ kernel-pkgs:
-e "s/%COMMENT%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
-e "s/%DESC%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
- @pkg create -v -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
+ @pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
-r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
-o ${DESTDIR}
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 18:16:21 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 9C8FBFBB;
Sun, 8 Feb 2015 18:16:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 89346850;
Sun, 8 Feb 2015 18:16:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18IGLMW020758;
Sun, 8 Feb 2015 18:16:21 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18IGLmS020757;
Sun, 8 Feb 2015 18:16:21 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081816.t18IGLmS020757@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 18:16:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278395 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 18:16:21 -0000
Author: bapt
Date: Sun Feb 8 18:16:20 2015
New Revision: 278395
URL: https://svnweb.freebsd.org/changeset/base/278395
Log:
Plug kernel-pkgs target to the list of valid targets
Modified:
projects/release-pkg/Makefile
Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile Sun Feb 8 18:15:28 2015 (r278394)
+++ projects/release-pkg/Makefile Sun Feb 8 18:16:20 2015 (r278395)
@@ -113,7 +113,7 @@ TGTS= all all-man buildenv buildenvvars
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
- xdev-links native-xtools \
+ xdev-links native-xtools kernel-pkgs \
TGTS+= ${SUBDIR_TARGETS}
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 19:12:39 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4C1394D7;
Sun, 8 Feb 2015 19:12:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 1EE60DE5;
Sun, 8 Feb 2015 19:12:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t18JCcUu049453;
Sun, 8 Feb 2015 19:12:38 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t18JCc12049452;
Sun, 8 Feb 2015 19:12:38 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502081912.t18JCc12049452@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 8 Feb 2015 19:12:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278396 - projects/release-pkg/release/packages/kernel
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 19:12:39 -0000
Author: bapt
Date: Sun Feb 8 19:12:38 2015
New Revision: 278396
URL: https://svnweb.freebsd.org/changeset/base/278396
Log:
Running kldxref after the kernel installation is useless given it will be done
at reboot
Deleted:
projects/release-pkg/release/packages/kernel/post-install
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 21:02:31 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id ABDE2CF6;
Sun, 8 Feb 2015 21:02:31 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3966EB1E;
Sun, 8 Feb 2015 21:02:31 +0000 (UTC)
Received: from tom.home (kostik@localhost [127.0.0.1])
by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t18L2OCS050119
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Sun, 8 Feb 2015 23:02:25 +0200 (EET)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t18L2OCS050119
Received: (from kostik@localhost)
by tom.home (8.14.9/8.14.9/Submit) id t18L2Ojv050118;
Sun, 8 Feb 2015 23:02:24 +0200 (EET)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
using -f
Date: Sun, 8 Feb 2015 23:02:24 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: svn commit: r278396 - projects/release-pkg/release/packages/kernel
Message-ID: <20150208210224.GZ42409@kib.kiev.ua>
References: <201502081912.t18JCc12049452@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201502081912.t18JCc12049452@svn.freebsd.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 21:02:31 -0000
On Sun, Feb 08, 2015 at 07:12:38PM +0000, Baptiste Daroussin wrote:
> Author: bapt
> Date: Sun Feb 8 19:12:38 2015
> New Revision: 278396
> URL: https://svnweb.freebsd.org/changeset/base/278396
>
> Log:
> Running kldxref after the kernel installation is useless given it will be done
> at reboot
It is strange. What runs kldxref on reboot ?
I suppose that kldxref should be run before packaging, and the result is
packaged together with the modules.
From owner-svn-src-projects@FreeBSD.ORG Sun Feb 8 21:09:16 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D0EB1F11;
Sun, 8 Feb 2015 21:09:16 +0000 (UTC)
Received: from mail-we0-x236.google.com (mail-we0-x236.google.com
[IPv6:2a00:1450:400c:c03::236])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 5D6E0BA8;
Sun, 8 Feb 2015 21:09:16 +0000 (UTC)
Received: by mail-we0-f182.google.com with SMTP id l61so23249278wev.13;
Sun, 08 Feb 2015 13:09:14 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:date:from:to:cc:subject:message-id:references:mime-version
:content-type:content-disposition:in-reply-to:user-agent;
bh=0a0Ioh+MqJ15SGy+VMrYqQ546kP4B5TuVdKT6HMXuVM=;
b=xKSWWQaAcV6qZvvfSA4pTWgTrpo2U8dQWmUyindcAGGxO2fpetYBPhaxYec5hYlJX0
A+tM88+5a8vzVXJ82AKsPEawo8/gKqO+xIrsVLHNQ3MJuzkSdCMvdHPeMh98GFv1sDIm
0RQqU1rNW2cioDLlYhtfqpEA9Pjod7f0iMqrNi03mXLCG++PeRgF+QktCjuHrz+hjszj
lguOUgO3OwqfQwauqiRNfHyzVTgFu0osKL9dPLr/3IzQTzIQCdIK/fa/YBfNd2QUATkq
IPPsfdsZyNfIkauot7ptrbMF22R2tOQxVXs4KUpafLhgqFuPaRo82NMQNTr6rtVCD6wn
PfNA==
X-Received: by 10.180.19.7 with SMTP id a7mr27929601wie.62.1423429754830;
Sun, 08 Feb 2015 13:09:14 -0800 (PST)
Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1])
by mx.google.com with ESMTPSA id fa3sm11511524wib.17.2015.02.08.13.09.13
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Sun, 08 Feb 2015 13:09:13 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Sun, 8 Feb 2015 22:09:11 +0100
From: Baptiste Daroussin <bapt@FreeBSD.org>
To: Konstantin Belousov <kostikbel@gmail.com>
Subject: Re: svn commit: r278396 - projects/release-pkg/release/packages/kernel
Message-ID: <20150208210911.GE29891@ivaldir.etoilebsd.net>
References: <201502081912.t18JCc12049452@svn.freebsd.org>
<20150208210224.GZ42409@kib.kiev.ua>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="Qz2CZ664xQdCRdPu"
Content-Disposition: inline
In-Reply-To: <20150208210224.GZ42409@kib.kiev.ua>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 21:09:16 -0000
--Qz2CZ664xQdCRdPu
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Sun, Feb 08, 2015 at 11:02:24PM +0200, Konstantin Belousov wrote:
> On Sun, Feb 08, 2015 at 07:12:38PM +0000, Baptiste Daroussin wrote:
> > Author: bapt
> > Date: Sun Feb 8 19:12:38 2015
> > New Revision: 278396
> > URL: https://svnweb.freebsd.org/changeset/base/278396
> >=20
> > Log:
> > Running kldxref after the kernel installation is useless given it wil=
l be done
> > at reboot
>=20
> It is strange. What runs kldxref on reboot ?
> I suppose that kldxref should be run before packaging, and the result is
> packaged together with the modules.
Except that in that case linkers.hints will be tracked by the package manag=
er
aka pkg check -s will yell about then checksum being changed.
I'll add back kldxref as post-install.
Best regards,
Bapt
--Qz2CZ664xQdCRdPu
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlTX0HcACgkQ8kTtMUmk6Ez51gCcDgxt1YtxxQa2ZDzyF93MpHpt
ebUAn1v83rOt+qXwfbS64owaMJab6TfE
=outO
-----END PGP SIGNATURE-----
--Qz2CZ664xQdCRdPu--
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 07:55:36 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 393C1FBC;
Mon, 9 Feb 2015 07:55:36 +0000 (UTC)
Received: from smtp2.wemm.org (smtp2.wemm.org [192.203.228.78])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "smtp2.wemm.org",
Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 869C68A2;
Mon, 9 Feb 2015 07:55:35 +0000 (UTC)
Received: from overcee.wemm.org (canning.wemm.org [192.203.228.65])
by smtp2.wemm.org (Postfix) with ESMTP id E51171EA;
Sun, 8 Feb 2015 23:55:28 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org;
s=m20140428; t=1423468529;
bh=Pguizi+JL4xSm8mqqRDW4CKcd905SD6Qnw+fMq0RkyM=;
h=From:To:Cc:Subject:Date:In-Reply-To:References;
b=ArR1E4kWnh6yRsnzjVzlMp0xkB7twVnGyLculHo9LG381yXwEeLSlnroKIrqOjMDH
3d06qwucQ8ENm4Wm0KJ/xg1Bo9W7pTIU/zse6HSDq102Q0x3tcPtUkjspkYrzGH50S
LhrFJTz9vTNN7/2IdykiVijMT+y7PdoY2OezbjtM=
From: Peter Wemm <peter@wemm.org>
To: svn-src-projects@freebsd.org
Subject: Re: svn commit: r278396 - projects/release-pkg/release/packages/kernel
Date: Sun, 08 Feb 2015 23:55:23 -0800
Message-ID: <1970859.CF8zmI9oz1@overcee.wemm.org>
User-Agent: KMail/4.14.2 (FreeBSD/11.0-CURRENT; KDE/4.14.2; amd64; ; )
In-Reply-To: <20150208210911.GE29891@ivaldir.etoilebsd.net>
References: <201502081912.t18JCc12049452@svn.freebsd.org>
<20150208210224.GZ42409@kib.kiev.ua>
<20150208210911.GE29891@ivaldir.etoilebsd.net>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart12321129.I5JCiHlO8N";
micalg="pgp-sha256"; protocol="application/pgp-signature"
Cc: Konstantin Belousov <kostikbel@gmail.com>,
Baptiste Daroussin <bapt@freebsd.org>, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 07:55:36 -0000
--nextPart12321129.I5JCiHlO8N
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="us-ascii"
On Sunday, February 08, 2015 10:09:11 PM Baptiste Daroussin wrote:
> On Sun, Feb 08, 2015 at 11:02:24PM +0200, Konstantin Belousov wrote:
> > On Sun, Feb 08, 2015 at 07:12:38PM +0000, Baptiste Daroussin wrote:=
> > > Author: bapt
> > > Date: Sun Feb 8 19:12:38 2015
> > > New Revision: 278396
> > > URL: https://svnweb.freebsd.org/changeset/base/278396
> > >=20
> > > Log:
> > > Running kldxref after the kernel installation is useless given =
it will
> > > be done at reboot
> >=20
> > It is strange. What runs kldxref on reboot ?
> > I suppose that kldxref should be run before packaging, and the resu=
lt is
> > packaged together with the modules.
>=20
> Except that in that case linkers.hints will be tracked by the package=
> manager aka pkg check -s will yell about then checksum being changed.=
>=20
> I'll add back kldxref as post-install.
linker.hints should be a local file and should be run for a directory a=
ny time=20
a .ko is added or removed.
> Best regards,
> Bapt
=2D-=20
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI=
6FJV
UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246
--nextPart12321129.I5JCiHlO8N
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCAAGBQJU2GfrAAoJEDXWlwnsgJ4EODQIAMbIhstxYEYLqZmOqOzWlSVO
lX8kGT4SzNklXBG86hWwaRW5GF7/TYfDb7FSYFMFYB+8RrdS3/Rrx0dtjpksREOA
pZRgudPX82/emKrA/rPTD7PM+MWiPdr+Ofh7wDb4Lcs8bVlDr2G3wvjlt6Tdptuq
BPqIwO3rZ/TPImEIuDYMGCf4QmlBs7fy1b8j3gESeuRinLSlsgjaOU/JvqVnKJOI
KUhfkVIEG4u8+o+TgAmblGn1GNcUV4O4ISZgfoHlnDND28EbnSts6JimNPK/XL8a
KXAAOOZP6R/ZltLfLKCAsVFM9GVgQe3LUkSG3FCkmO3jzgbXUXp2H0TXcrCK//c=
=hEw/
-----END PGP SIGNATURE-----
--nextPart12321129.I5JCiHlO8N--
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 08:47:12 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id A050AB2E;
Mon, 9 Feb 2015 08:47:12 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1378DE19;
Mon, 9 Feb 2015 08:47:11 +0000 (UTC)
Received: from tom.home (kostik@localhost [127.0.0.1])
by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id t198l56q007571
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Mon, 9 Feb 2015 10:47:06 +0200 (EET)
(envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua t198l56q007571
Received: (from kostik@localhost)
by tom.home (8.14.9/8.14.9/Submit) id t198l5Y7007570;
Mon, 9 Feb 2015 10:47:05 +0200 (EET)
(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
using -f
Date: Mon, 9 Feb 2015 10:47:05 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: svn commit: r278396 - projects/release-pkg/release/packages/kernel
Message-ID: <20150209084705.GA42409@kib.kiev.ua>
References: <201502081912.t18JCc12049452@svn.freebsd.org>
<20150208210224.GZ42409@kib.kiev.ua>
<20150208210911.GE29891@ivaldir.etoilebsd.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150208210911.GE29891@ivaldir.etoilebsd.net>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00,
DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no
autolearn_force=no version=3.4.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 08:47:12 -0000
On Sun, Feb 08, 2015 at 10:09:11PM +0100, Baptiste Daroussin wrote:
> On Sun, Feb 08, 2015 at 11:02:24PM +0200, Konstantin Belousov wrote:
> > On Sun, Feb 08, 2015 at 07:12:38PM +0000, Baptiste Daroussin wrote:
> > > Author: bapt
> > > Date: Sun Feb 8 19:12:38 2015
> > > New Revision: 278396
> > > URL: https://svnweb.freebsd.org/changeset/base/278396
> > >
> > > Log:
> > > Running kldxref after the kernel installation is useless given it will be done
> > > at reboot
> >
> > It is strange. What runs kldxref on reboot ?
> > I suppose that kldxref should be run before packaging, and the result is
> > packaged together with the modules.
>
> Except that in that case linkers.hints will be tracked by the package manager
> aka pkg check -s will yell about then checksum being changed.
Ok, I figured out my confusion. You are referencing the rc.d/kldxref
update, am I right. Arguably, this is too late (after the reboot, i.e.
after the loader and rc.d/kld were done).
>
> I'll add back kldxref as post-install.
This should be fine, thanks.
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 10:25:59 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id C2A0CBC3;
Mon, 9 Feb 2015 10:25:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 AE504BAF;
Mon, 9 Feb 2015 10:25:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19APxht057569;
Mon, 9 Feb 2015 10:25:59 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19APxwK057568;
Mon, 9 Feb 2015 10:25:59 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502091025.t19APxwK057568@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 Feb 2015 10:25:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278447 - projects/release-pkg/release/packages/kernel
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 10:25:59 -0000
Author: bapt
Date: Mon Feb 9 10:25:58 2015
New Revision: 278447
URL: https://svnweb.freebsd.org/changeset/base/278447
Log:
Rerunning kldxref after installing the kernel is still needed as rc.d/kldxref
will happen too late
Added:
projects/release-pkg/release/packages/kernel/post-install
- copied unchanged from r278395, projects/release-pkg/release/packages/kernel/post-install
Copied: projects/release-pkg/release/packages/kernel/post-install (from r278395, projects/release-pkg/release/packages/kernel/post-install)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-pkg/release/packages/kernel/post-install Mon Feb 9 10:25:58 2015 (r278447, copy of r278395, projects/release-pkg/release/packages/kernel/post-install)
@@ -0,0 +1 @@
+/usr/sbin/kldxref /boot/kernel
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 10:38:53 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id BAAC8DBC;
Mon, 9 Feb 2015 10:38:53 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 A63DBCAE;
Mon, 9 Feb 2015 10:38:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19AcrDv062732;
Mon, 9 Feb 2015 10:38:53 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19Acr0i062731;
Mon, 9 Feb 2015 10:38:53 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502091038.t19Acr0i062731@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 Feb 2015 10:38:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278448 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 10:38:53 -0000
Author: bapt
Date: Mon Feb 9 10:38:52 2015
New Revision: 278448
URL: https://svnweb.freebsd.org/changeset/base/278448
Log:
Add a user message to explain what package is being created
Modified:
projects/release-pkg/Makefile.inc1
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Mon Feb 9 10:25:58 2015 (r278447)
+++ projects/release-pkg/Makefile.inc1 Mon Feb 9 10:38:52 2015 (r278448)
@@ -1199,6 +1199,8 @@ kernel-pkgs:
-e "s/%COMMENT%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
-e "s/%DESC%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
+ @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
+ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
@pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
-r ${DESTDIR}/${DISTDIR}/kernel \
@@ -1220,6 +1222,8 @@ kernel-pkgs:
-e "s/%COMMENT%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
-e "s/%DESC%/FreeBSD ${KERNCONF} kernel ${flavor}/" \
${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
+ @awk -F\" '/name/ { printf("===> Creating %s-", $$2) } /version/ {print $$2 }' \
+ ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir/+MANIFEST
@pkg create -m ${DESTDIR}/${DISTDIR}/${flavor}-manifestdir \
-p ${DESTDIR}/${DISTDIR}/${flavor}.plist \
-r ${DESTDIR}/${DISTDIR}/kernel.${_kernel} \
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 11:11:18 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 5F6AE67F;
Mon, 9 Feb 2015 11:11:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 4B0F2B;
Mon, 9 Feb 2015 11:11:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19BBI4w077898;
Mon, 9 Feb 2015 11:11:18 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19BBI8V077897;
Mon, 9 Feb 2015 11:11:18 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502091111.t19BBI8V077897@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 Feb 2015 11:11:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278451 - projects/release-pkg/etc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 11:11:18 -0000
Author: bapt
Date: Mon Feb 9 11:11:17 2015
New Revision: 278451
URL: https://svnweb.freebsd.org/changeset/base/278451
Log:
Respect DESTDIR when running make distrib-dirs with -DNO_ROOT
Modified:
projects/release-pkg/etc/Makefile
Modified: projects/release-pkg/etc/Makefile
==============================================================================
--- projects/release-pkg/etc/Makefile Mon Feb 9 10:46:39 2015 (r278450)
+++ projects/release-pkg/etc/Makefile Mon Feb 9 11:11:17 2015 (r278451)
@@ -382,7 +382,7 @@ distrib-dirs: ${MTREES:N/*}
shift; \
d=$$1; \
test "$$d" == "/" && d=""; \
- d=${DISTBASE}$$d; \
+ d=${DESTDIR}/${DISTBASE}$$d; \
shift; \
test -d $$d || mkdir -p $$d; \
${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 11:42:44 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 01CC4F39;
Mon, 9 Feb 2015 11:42:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 E1001658;
Mon, 9 Feb 2015 11:42:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19BghI7095088;
Mon, 9 Feb 2015 11:42:43 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19Bghad095087;
Mon, 9 Feb 2015 11:42:43 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502091142.t19Bghad095087@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 Feb 2015 11:42:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278453 - projects/release-pkg/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 11:42:44 -0000
Author: bapt
Date: Mon Feb 9 11:42:43 2015
New Revision: 278453
URL: https://svnweb.freebsd.org/changeset/base/278453
Log:
Ensure make distribute respects DESTDIR
Modified:
projects/release-pkg/share/mk/bsd.subdir.mk
Modified: projects/release-pkg/share/mk/bsd.subdir.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.subdir.mk Mon Feb 9 11:34:45 2015 (r278452)
+++ projects/release-pkg/share/mk/bsd.subdir.mk Mon Feb 9 11:42:43 2015 (r278453)
@@ -39,7 +39,7 @@ DISTRIBUTION?= base
distribute: .MAKE
.for dist in ${DISTRIBUTION}
${_+_}cd ${.CURDIR}; \
- ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
+ ${MAKE} install -DNO_SUBDIR DESTDIR=${DESTDIR}/${DISTDIR}/${dist} SHARED=copies
.endfor
.endif
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 13:39:39 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 6C595A06;
Mon, 9 Feb 2015 13:39:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 57EEC1F9;
Mon, 9 Feb 2015 13:39:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19Ddd5D047664;
Mon, 9 Feb 2015 13:39:39 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19DddWg047663;
Mon, 9 Feb 2015 13:39:39 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502091339.t19DddWg047663@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 Feb 2015 13:39:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278454 - projects/release-pkg/etc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 13:39:39 -0000
Author: bapt
Date: Mon Feb 9 13:39:38 2015
New Revision: 278454
URL: https://svnweb.freebsd.org/changeset/base/278454
Log:
Ensure make distributeworld respects DESTDIR
Modified:
projects/release-pkg/etc/Makefile
Modified: projects/release-pkg/etc/Makefile
==============================================================================
--- projects/release-pkg/etc/Makefile Mon Feb 9 11:42:43 2015 (r278453)
+++ projects/release-pkg/etc/Makefile Mon Feb 9 13:39:38 2015 (r278454)
@@ -193,8 +193,8 @@ distribute:
# Avoid installing tests here; "make distribution" will do this and
# correctly place them in the right location.
${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
- DESTDIR=${DISTDIR}/${DISTRIBUTION}
- ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
+ DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION}
+ ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION}
.include <bsd.endian.mk>
.if ${TARGET_ENDIANNESS} == "1234"
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 13:41:30 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D49F6B20;
Mon, 9 Feb 2015 13:41:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 BFB5B2C7;
Mon, 9 Feb 2015 13:41:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19DfUTZ050759;
Mon, 9 Feb 2015 13:41:30 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19DfUXV050758;
Mon, 9 Feb 2015 13:41:30 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502091341.t19DfUXV050758@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 9 Feb 2015 13:41:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278455 - in projects/release-pkg: . share/info
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 13:41:30 -0000
Author: bapt
Date: Mon Feb 9 13:41:29 2015
New Revision: 278455
URL: https://svnweb.freebsd.org/changeset/base/278455
Log:
Remove remnants from texinfo
Deleted:
projects/release-pkg/share/info/
Modified:
projects/release-pkg/Makefile.inc1
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Mon Feb 9 13:39:38 2015 (r278454)
+++ projects/release-pkg/Makefile.inc1 Mon Feb 9 13:41:29 2015 (r278455)
@@ -50,10 +50,6 @@
.include <bsd.arch.inc.mk>
.include <bsd.compiler.mk>
-# We must do share/info early so that installation of info `dir'
-# entries works correctly. Do it first since it is less likely to
-# grow dependencies on include and lib than vice versa.
-#
# We must do lib/ and libexec/ before bin/, because if installworld
# installs a new /bin/sh, the 'make' command will *immediately*
# use that new version. And the new (dynamically-linked) /bin/sh
@@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
-SUBDIR= share/info lib libexec
+SUBDIR= lib libexec
SUBDIR+=bin
.if ${MK_GAMES} != "no"
SUBDIR+=games
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 16:09:19 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D81DD5FD;
Mon, 9 Feb 2015 16:09:19 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B1DA66E3;
Mon, 9 Feb 2015 16:09:19 +0000 (UTC)
Received: from ralph.baldwin.cx (pool-173-54-116-245.nwrknj.fios.verizon.net
[173.54.116.245])
by bigwig.baldwin.cx (Postfix) with ESMTPSA id 6B365B945;
Mon, 9 Feb 2015 11:09:17 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Baptiste Daroussin <bapt@freebsd.org>
Subject: Re: svn commit: r278447 - projects/release-pkg/release/packages/kernel
Date: Mon, 09 Feb 2015 11:07:19 -0500
Message-ID: <2379227.vPTf1TCfaA@ralph.baldwin.cx>
User-Agent: KMail/4.14.2 (FreeBSD/10.1-STABLE; KDE/4.14.2; amd64; ; )
In-Reply-To: <201502091025.t19APxwK057568@svn.freebsd.org>
References: <201502091025.t19APxwK057568@svn.freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(bigwig.baldwin.cx); Mon, 09 Feb 2015 11:09:17 -0500 (EST)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 16:09:19 -0000
On Monday, February 09, 2015 10:25:59 AM Baptiste Daroussin wrote:
> Author: bapt
> Date: Mon Feb 9 10:25:58 2015
> New Revision: 278447
> URL: https://svnweb.freebsd.org/changeset/base/278447
>
> Log:
> Rerunning kldxref after installing the kernel is still needed as
> rc.d/kldxref will happen too late
>
> Added:
> projects/release-pkg/release/packages/kernel/post-install
> - copied unchanged from r278395,
> projects/release-pkg/release/packages/kernel/post-install
>
> Copied: projects/release-pkg/release/packages/kernel/post-install (from
> r278395, projects/release-pkg/release/packages/kernel/post-install)
> ===========================================================================
> === --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> +++ projects/release-pkg/release/packages/kernel/post-install Mon Feb 9
> 10:25:58 2015 (r278447, copy of r278395,
> projects/release-pkg/release/packages/kernel/post-install) @@ -0,0 +1 @@
> +/usr/sbin/kldxref /boot/kernel
Hmm, are you hardcoding /boot/kernel as the location for kernels? I like to
keep an up-to-date GENERIC on all my boxes at /boot/kernel.GENERIC along with
/boot/kernel which runs the machine's "custom" config. I do think I like that
the packages default to /boot/kernel in general (so I can 'pkg install kernel-
<CONF>' to pick a specific conf), but it might be nice to be able to install a
fallback kernel under an alternate name.
Also, do you have a graceful way of switching configs? That is, if kernel-FOO
is installed at /boot/kernel and I want to switch to kernel-BAR, do you just
have to delete FOO and install BAR? That's fine if so, though there is a
window where you don't have a kernel if you crash / power-failure. :-P Not
sure how easy it would be to be able to move the FOO kernel to kernel.old in
that case and install BAR as /boot/kernel?
On a related note, I assume that for base packages you will keep the behavior
of preserving /boot/loader.old and /libexec/ld-elf.so.1.old each time the
respective file changes? (I think those are the only files in userland with
that kind of special magic.)
--
John Baldwin
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 16:18:38 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 6DA0E1C2;
Mon, 9 Feb 2015 16:18:38 +0000 (UTC)
Received: from mail-we0-x231.google.com (mail-we0-x231.google.com
[IPv6:2a00:1450:400c:c03::231])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id EFA72846;
Mon, 9 Feb 2015 16:18:37 +0000 (UTC)
Received: by mail-we0-f177.google.com with SMTP id l61so27847032wev.8;
Mon, 09 Feb 2015 08:18:36 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:date:from:to:cc:subject:message-id:references:mime-version
:content-type:content-disposition:in-reply-to:user-agent;
bh=l+xN5jQxKylxMi5phM8hWEDWwx77ng0GTlvAmcOGeKo=;
b=f7kqliAljwP8A0FqpsmPkhz1vitp4UyPDb7qsP9b2FNl2gbJHi8xy+QE/XzJ6eAo5K
2YVvOU4fYloFnUk+DYdk6g01D1JjyD+kFhbIYdGH4r0Fsivo041My/LgeWbmjhE9pmGq
72DKECQ9bjBBwPgvCWnlBwq8ABwoGlQ7W4reZftuaQZE/9iwcSCkmgVxKuwTT7RAkATB
0x5BUVuE/GM8MNZaPUp9UiSSXfcBxJqe2aALH0PB/rSPwMMRsZT3OUJOXx2j7RK7h7G6
SIacsDWprq5C5/sWDbSRTM5CA8yyjtMTi/hJ7SG2VW7dtdnif8UW+iG531RQipS8ociP
PSgw==
X-Received: by 10.180.20.238 with SMTP id q14mr36568351wie.51.1423498714838;
Mon, 09 Feb 2015 08:18:34 -0800 (PST)
Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1])
by mx.google.com with ESMTPSA id fw5sm16988766wjb.14.2015.02.09.08.18.33
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 09 Feb 2015 08:18:33 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Mon, 9 Feb 2015 17:18:31 +0100
From: Baptiste Daroussin <bapt@freebsd.org>
To: John Baldwin <jhb@freebsd.org>
Subject: Re: svn commit: r278447 - projects/release-pkg/release/packages/kernel
Message-ID: <20150209161830.GH29891@ivaldir.etoilebsd.net>
References: <201502091025.t19APxwK057568@svn.freebsd.org>
<2379227.vPTf1TCfaA@ralph.baldwin.cx>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="2xzXx3ruJf7hsAzo"
Content-Disposition: inline
In-Reply-To: <2379227.vPTf1TCfaA@ralph.baldwin.cx>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 16:18:38 -0000
--2xzXx3ruJf7hsAzo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Feb 09, 2015 at 11:07:19AM -0500, John Baldwin wrote:
> On Monday, February 09, 2015 10:25:59 AM Baptiste Daroussin wrote:
> > Author: bapt
> > Date: Mon Feb 9 10:25:58 2015
> > New Revision: 278447
> > URL: https://svnweb.freebsd.org/changeset/base/278447
> >=20
> > Log:
> > Rerunning kldxref after installing the kernel is still needed as
> > rc.d/kldxref will happen too late
> >=20
> > Added:
> > projects/release-pkg/release/packages/kernel/post-install
> > - copied unchanged from r278395,
> > projects/release-pkg/release/packages/kernel/post-install
> >=20
> > Copied: projects/release-pkg/release/packages/kernel/post-install (from
> > r278395, projects/release-pkg/release/packages/kernel/post-install)
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
> > =3D=3D=3D --- /dev/null 00:00:00 1970 (empty, because file is newly add=
ed)
> > +++ projects/release-pkg/release/packages/kernel/post-install Mon Feb 9
> > 10:25:58 2015 (r278447, copy of r278395,
> > projects/release-pkg/release/packages/kernel/post-install) @@ -0,0 +1 @@
> > +/usr/sbin/kldxref /boot/kernel
>=20
> Hmm, are you hardcoding /boot/kernel as the location for kernels? I like=
to=20
> keep an up-to-date GENERIC on all my boxes at /boot/kernel.GENERIC along =
with=20
> /boot/kernel which runs the machine's "custom" config. I do think I like=
that=20
> the packages default to /boot/kernel in general (so I can 'pkg install ke=
rnel-
> <CONF>' to pick a specific conf), but it might be nice to be able to inst=
all a=20
> fallback kernel under an alternate name.
We are at very early state of packaging but yes before it becomes official =
it
will allow to have custom location for the kernel (chosen at build time)
>=20
> Also, do you have a graceful way of switching configs? That is, if kerne=
l-FOO=20
> is installed at /boot/kernel and I want to switch to kernel-BAR, do you j=
ust=20
> have to delete FOO and install BAR? That's fine if so, though there is a=
=20
> window where you don't have a kernel if you crash / power-failure. :-P N=
ot=20
> sure how easy it would be to be able to move the FOO kernel to kernel.old=
in=20
> that case and install BAR as /boot/kernel?
Nothing planned for that so far, I'm open for suggestions, nothing is done =
in
pkg yet to allow to move a directory with its content before actually upgra=
ding.
IMHO that would be a bad idea to have kernel specific hacks, but it sounds a
good idea to first anyway create the kernel.old directory. Still don't know=
how
to do that.
>=20
> On a related note, I assume that for base packages you will keep the beha=
vior=20
> of preserving /boot/loader.old and /libexec/ld-elf.so.1.old each time the=
=20
> respective file changes? (I think those are the only files in userland w=
ith=20
> that kind of special magic.)
I haven't thought about those, but it is easy to make I'll modity pkg(8) to
allow such behaviour.
Best regards,
Bapt
--2xzXx3ruJf7hsAzo
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlTY3dYACgkQ8kTtMUmk6ExVYgCdEWrSxgPDoleCSZFnCSS5bOn9
9qQAoIFCEZKxBS4INWSQJ7c/mRxRIWvJ
=tS93
-----END PGP SIGNATURE-----
--2xzXx3ruJf7hsAzo--
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 16:52:26 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id EE37D4FA;
Mon, 9 Feb 2015 16:52:26 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A971DCA7;
Mon, 9 Feb 2015 16:52:26 +0000 (UTC)
Received: from new-host-2.home (pool-173-54-116-245.nwrknj.fios.verizon.net
[173.54.116.245])
by bigwig.baldwin.cx (Postfix) with ESMTPSA id AC486B91E;
Mon, 9 Feb 2015 11:52:25 -0500 (EST)
Message-ID: <54D8E5CD.8050304@FreeBSD.org>
Date: Mon, 09 Feb 2015 11:52:29 -0500
From: John Baldwin <jhb@FreeBSD.org>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9;
rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version: 1.0
To: Baptiste Daroussin <bapt@freebsd.org>
Subject: Re: svn commit: r278447 - projects/release-pkg/release/packages/kernel
References: <201502091025.t19APxwK057568@svn.freebsd.org>
<2379227.vPTf1TCfaA@ralph.baldwin.cx>
<20150209161830.GH29891@ivaldir.etoilebsd.net>
In-Reply-To: <20150209161830.GH29891@ivaldir.etoilebsd.net>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
(bigwig.baldwin.cx); Mon, 09 Feb 2015 11:52:25 -0500 (EST)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 16:52:27 -0000
On 2/9/15 11:18 AM, Baptiste Daroussin wrote:
> On Mon, Feb 09, 2015 at 11:07:19AM -0500, John Baldwin wrote:
>> On Monday, February 09, 2015 10:25:59 AM Baptiste Daroussin wrote:
>>> Author: bapt
>>> Date: Mon Feb 9 10:25:58 2015
>>> New Revision: 278447
>>> URL: https://svnweb.freebsd.org/changeset/base/278447
>>>
>>> Log:
>>> Rerunning kldxref after installing the kernel is still needed as
>>> rc.d/kldxref will happen too late
>>>
>>> Added:
>>> projects/release-pkg/release/packages/kernel/post-install
>>> - copied unchanged from r278395,
>>> projects/release-pkg/release/packages/kernel/post-install
>>>
>>> Copied: projects/release-pkg/release/packages/kernel/post-install (from
>>> r278395, projects/release-pkg/release/packages/kernel/post-install)
>>> ===========================================================================
>>> === --- /dev/null 00:00:00 1970 (empty, because file is newly added)
>>> +++ projects/release-pkg/release/packages/kernel/post-install Mon Feb 9
>>> 10:25:58 2015 (r278447, copy of r278395,
>>> projects/release-pkg/release/packages/kernel/post-install) @@ -0,0 +1 @@
>>> +/usr/sbin/kldxref /boot/kernel
>>
>> Hmm, are you hardcoding /boot/kernel as the location for kernels? I like to
>> keep an up-to-date GENERIC on all my boxes at /boot/kernel.GENERIC along with
>> /boot/kernel which runs the machine's "custom" config. I do think I like that
>> the packages default to /boot/kernel in general (so I can 'pkg install kernel-
>> <CONF>' to pick a specific conf), but it might be nice to be able to install a
>> fallback kernel under an alternate name.
>
> We are at very early state of packaging but yes before it becomes official it
> will allow to have custom location for the kernel (chosen at build time)
Hmm, it might be nice to choose it at runtime. Maybe I want to use
GENERIC as the main kernel so I want it at /boot/kernel, maybe I wnat to
install the "official" FreeBSD GENERIC kernel as /boot/kernel.GENERIC so
I'd like to be able to override the "prefix" as it were. Similarly, I
might want to install a test kernel package to /boot/test so I can use
it with nextboot without changing the machine's default kernel. In the
case of the kernel all the bits live in one directory, so if you allow
the directory to be fungible during install that should be doable. I
can't think of other things besides the kernel that have this sort of
behavior.
>> Also, do you have a graceful way of switching configs? That is, if kernel-FOO
>> is installed at /boot/kernel and I want to switch to kernel-BAR, do you just
>> have to delete FOO and install BAR? That's fine if so, though there is a
>> window where you don't have a kernel if you crash / power-failure. :-P Not
>> sure how easy it would be to be able to move the FOO kernel to kernel.old in
>> that case and install BAR as /boot/kernel?
> Nothing planned for that so far, I'm open for suggestions, nothing is done in
> pkg yet to allow to move a directory with its content before actually upgrading.
>
> IMHO that would be a bad idea to have kernel specific hacks, but it sounds a
> good idea to first anyway create the kernel.old directory. Still don't know how
> to do that.
Could you use a pre-install script to move the current /boot/kernel (or
other path if specified) to /boot/kernel.old? That would be all that is
needed. The kernel Makefiles are a bit trickier in that they only save
the previous kernel this way if it is the running kernel (by checking
the kern.bootfile sysctl). If you have a pre-install script you could
incorporate the same logic. It does mean you can't "remove" the
previous version of the kernel using pkg, but typically you just have 1
kernel.old that will keep getting updated on each upgrade.
>> On a related note, I assume that for base packages you will keep the behavior
>> of preserving /boot/loader.old and /libexec/ld-elf.so.1.old each time the
>> respective file changes? (I think those are the only files in userland with
>> that kind of special magic.)
>
> I haven't thought about those, but it is easy to make I'll modity pkg(8) to
> allow such behaviour.
They aren't often needed, but when you do need them they are nice to have.
--
John Baldwin
From owner-svn-src-projects@FreeBSD.ORG Mon Feb 9 17:02:38 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 059DC731;
Mon, 9 Feb 2015 17:02:38 +0000 (UTC)
Received: from mail-wi0-x231.google.com (mail-wi0-x231.google.com
[IPv6:2a00:1450:400c:c05::231])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 8DC3CDA5;
Mon, 9 Feb 2015 17:02:37 +0000 (UTC)
Received: by mail-wi0-f177.google.com with SMTP id bs8so5520413wib.4;
Mon, 09 Feb 2015 09:02:36 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:date:from:to:cc:subject:message-id:references:mime-version
:content-type:content-disposition:in-reply-to:user-agent;
bh=gC0v2lXO10xENYhKir29oe3LLdHAAW77KRjCXHHtanU=;
b=gOf2Hen2m4R6jisB6Av2Tt5/g2PcSuv1HfwzE/eT8fubZ4xnW7YVgzYrviYQ9G+H8o
OCO31cYDxJPmChiGs/rGDgrK/xmYJ0BBkFJv0PxDE0aY0LMXfVVQo1WB4Epwl4K8LQgH
hRNgP9KMJvo80lNtJclW4V85qTVNZY++QkgY4hSCOpEBRdZsjz+tJtWs4iFeJfW+Mm60
ry0C5mXnKuW7IMfSxYnTXqq6HZ49GVc2o7Y8hp+36y/mZXp731ZK4AdBfr7CtPmQ+DlK
R1M0AliXyC5OScSkAJATAPQxsvR2d6OLmJH+JIDKemyVLOaT7/BphhE6py81WJhmzmiq
MxDA==
X-Received: by 10.180.206.14 with SMTP id lk14mr36973696wic.71.1423501355938;
Mon, 09 Feb 2015 09:02:35 -0800 (PST)
Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1])
by mx.google.com with ESMTPSA id d10sm17105027wjn.45.2015.02.09.09.02.34
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Mon, 09 Feb 2015 09:02:34 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Mon, 9 Feb 2015 18:02:32 +0100
From: Baptiste Daroussin <bapt@freebsd.org>
To: John Baldwin <jhb@FreeBSD.org>
Subject: Re: svn commit: r278447 - projects/release-pkg/release/packages/kernel
Message-ID: <20150209170232.GI29891@ivaldir.etoilebsd.net>
References: <201502091025.t19APxwK057568@svn.freebsd.org>
<2379227.vPTf1TCfaA@ralph.baldwin.cx>
<20150209161830.GH29891@ivaldir.etoilebsd.net>
<54D8E5CD.8050304@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="AptwxgnoZDC4KQWS"
Content-Disposition: inline
In-Reply-To: <54D8E5CD.8050304@FreeBSD.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Feb 2015 17:02:38 -0000
--AptwxgnoZDC4KQWS
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Feb 09, 2015 at 11:52:29AM -0500, John Baldwin wrote:
> On 2/9/15 11:18 AM, Baptiste Daroussin wrote:
> > On Mon, Feb 09, 2015 at 11:07:19AM -0500, John Baldwin wrote:
> >> On Monday, February 09, 2015 10:25:59 AM Baptiste Daroussin wrote:
> >>> Author: bapt
> >>> Date: Mon Feb 9 10:25:58 2015
> >>> New Revision: 278447
> >>> URL: https://svnweb.freebsd.org/changeset/base/278447
> >>>
> >>> Log:
> >>> Rerunning kldxref after installing the kernel is still needed as
> >>> rc.d/kldxref will happen too late
> >>>
> >>> Added:
> >>> projects/release-pkg/release/packages/kernel/post-install
> >>> - copied unchanged from r278395,
> >>> projects/release-pkg/release/packages/kernel/post-install
> >>>
> >>> Copied: projects/release-pkg/release/packages/kernel/post-install (fr=
om
> >>> r278395, projects/release-pkg/release/packages/kernel/post-install)
> >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
> >>> =3D=3D=3D --- /dev/null 00:00:00 1970 (empty, because file is newly a=
dded)
> >>> +++ projects/release-pkg/release/packages/kernel/post-install Mon Feb=
9
> >>> 10:25:58 2015 (r278447, copy of r278395,
> >>> projects/release-pkg/release/packages/kernel/post-install) @@ -0,0 +1=
@@
> >>> +/usr/sbin/kldxref /boot/kernel
> >>
> >> Hmm, are you hardcoding /boot/kernel as the location for kernels? I l=
ike to=20
> >> keep an up-to-date GENERIC on all my boxes at /boot/kernel.GENERIC alo=
ng with=20
> >> /boot/kernel which runs the machine's "custom" config. I do think I l=
ike that=20
> >> the packages default to /boot/kernel in general (so I can 'pkg install=
kernel-
> >> <CONF>' to pick a specific conf), but it might be nice to be able to i=
nstall a=20
> >> fallback kernel under an alternate name.
> >=20
> > We are at very early state of packaging but yes before it becomes offic=
ial it
> > will allow to have custom location for the kernel (chosen at build time)
>=20
> Hmm, it might be nice to choose it at runtime. Maybe I want to use
> GENERIC as the main kernel so I want it at /boot/kernel, maybe I wnat to
> install the "official" FreeBSD GENERIC kernel as /boot/kernel.GENERIC so
> I'd like to be able to override the "prefix" as it were. Similarly, I
> might want to install a test kernel package to /boot/test so I can use
> it with nextboot without changing the machine's default kernel. In the
> case of the kernel all the bits live in one directory, so if you allow
> the directory to be fungible during install that should be doable. I
> can't think of other things besides the kernel that have this sort of
> behavior.
In theory that is doable but I hate exceptions :). that would had some
complicated code in pkg(8) just for the sake of the kernel, still I'll try =
to
think about it.
>=20
> >> Also, do you have a graceful way of switching configs? That is, if ke=
rnel-FOO=20
> >> is installed at /boot/kernel and I want to switch to kernel-BAR, do yo=
u just=20
> >> have to delete FOO and install BAR? That's fine if so, though there i=
s a=20
> >> window where you don't have a kernel if you crash / power-failure. :-P=
Not=20
> >> sure how easy it would be to be able to move the FOO kernel to kernel.=
old in=20
> >> that case and install BAR as /boot/kernel?
> > Nothing planned for that so far, I'm open for suggestions, nothing is d=
one in
> > pkg yet to allow to move a directory with its content before actually u=
pgrading.
> >=20
> > IMHO that would be a bad idea to have kernel specific hacks, but it sou=
nds a
> > good idea to first anyway create the kernel.old directory. Still don't =
know how
> > to do that.
>=20
> Could you use a pre-install script to move the current /boot/kernel (or
> other path if specified) to /boot/kernel.old? That would be all that is
> needed. The kernel Makefiles are a bit trickier in that they only save
> the previous kernel this way if it is the running kernel (by checking
> the kern.bootfile sysctl). If you have a pre-install script you could
> incorporate the same logic. It does mean you can't "remove" the
> previous version of the kernel using pkg, but typically you just have 1
> kernel.old that will keep getting updated on each upgrade.
If I do that in pre-install then during the upgrade pkg will complain becau=
se
the old files are not there. a cp would work but it will also be more expen=
sive.
Best regards,
Bapt
--AptwxgnoZDC4KQWS
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlTY6CgACgkQ8kTtMUmk6EyuWgCePjlI1CFU2iV343sGT1buULOV
PMgAnitW65t0tn8ss69TcUpUhlrSGZsK
=nFHi
-----END PGP SIGNATURE-----
--AptwxgnoZDC4KQWS--
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 02:02:25 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id B133DABB;
Tue, 10 Feb 2015 02:02:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 836EFC8B;
Tue, 10 Feb 2015 02:02:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1A22Pih081546;
Tue, 10 Feb 2015 02:02:25 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1A22PO3081545;
Tue, 10 Feb 2015 02:02:25 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502100202.t1A22PO3081545@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 10 Feb 2015 02:02:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278487 - projects/release-install-debug
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 02:02:25 -0000
Author: gjb
Date: Tue Feb 10 02:02:24 2015
New Revision: 278487
URL: https://svnweb.freebsd.org/changeset/base/278487
Log:
Copy head@r278486 to projects/release-install-debug.
This project branch is intended to be used to hook in
the necessary functionality to be able to install the
debug distributions sets (built when WITH_DEBUG_FILES
is set during buildworld/buildkernel) into bsdinstall(8).
Sponsored by: The FreeBSD Foundation
Added:
projects/release-install-debug/
- copied from r278486, head/
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 07:56:16 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id D50E4656;
Tue, 10 Feb 2015 07:56:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 BBA30224;
Tue, 10 Feb 2015 07:56:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1A7uGiF044651;
Tue, 10 Feb 2015 07:56:16 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1A7uFIA044647;
Tue, 10 Feb 2015 07:56:15 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201502100756.t1A7uFIA044647@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 10 Feb 2015 07:56:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278499 - in projects/clang360-import: . contrib/xz
contrib/xz/src/common contrib/xz/src/liblzma contrib/xz/src/liblzma/api
contrib/xz/src/liblzma/api/lzma contrib/xz/src/liblzma/check ...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 07:56:16 -0000
Author: dim
Date: Tue Feb 10 07:56:14 2015
New Revision: 278499
URL: https://svnweb.freebsd.org/changeset/base/278499
Log:
Merge ^/head r278351 through r278498.
Added:
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/lzma12.h
- copied unchanged from r278498, head/contrib/xz/src/liblzma/api/lzma/lzma12.h
projects/clang360-import/contrib/xz/src/liblzma/common/block_buffer_encoder.h
- copied unchanged from r278498, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/hardware_cputhreads.c
- copied unchanged from r278498, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c
projects/clang360-import/contrib/xz/src/liblzma/common/memcmplen.h
- copied unchanged from r278498, head/contrib/xz/src/liblzma/common/memcmplen.h
projects/clang360-import/contrib/xz/src/liblzma/common/outqueue.c
- copied unchanged from r278498, head/contrib/xz/src/liblzma/common/outqueue.c
projects/clang360-import/contrib/xz/src/liblzma/common/outqueue.h
- copied unchanged from r278498, head/contrib/xz/src/liblzma/common/outqueue.h
projects/clang360-import/contrib/xz/src/liblzma/common/stream_encoder_mt.c
- copied unchanged from r278498, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c
projects/clang360-import/contrib/xz/src/liblzma/liblzma.map
- copied unchanged from r278498, head/contrib/xz/src/liblzma/liblzma.map
projects/clang360-import/contrib/xz/src/liblzma/validate_map.sh
- copied unchanged from r278498, head/contrib/xz/src/liblzma/validate_map.sh
projects/clang360-import/contrib/xz/src/xz/mytime.c
- copied unchanged from r278498, head/contrib/xz/src/xz/mytime.c
projects/clang360-import/contrib/xz/src/xz/mytime.h
- copied unchanged from r278498, head/contrib/xz/src/xz/mytime.h
projects/clang360-import/sys/arm/broadcom/bcm2835/bcm2835_audio.c
- copied unchanged from r278498, head/sys/arm/broadcom/bcm2835/bcm2835_audio.c
projects/clang360-import/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
- copied unchanged from r278498, head/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
projects/clang360-import/sys/dev/wpi/if_wpi_debug.h
- copied unchanged from r278498, head/sys/dev/wpi/if_wpi_debug.h
projects/clang360-import/usr.sbin/pw/tests/pw_usernext.sh
- copied unchanged from r278498, head/usr.sbin/pw/tests/pw_usernext.sh
Deleted:
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/lzma.h
projects/clang360-import/contrib/xz/src/liblzma/common/stream_encoder.h
projects/clang360-import/sys/powerpc/conf/WII
projects/clang360-import/sys/powerpc/wii/
Modified:
projects/clang360-import/Makefile.inc1
projects/clang360-import/ObsoleteFiles.inc
projects/clang360-import/contrib/xz/ChangeLog
projects/clang360-import/contrib/xz/FREEBSD-upgrade
projects/clang360-import/contrib/xz/THANKS
projects/clang360-import/contrib/xz/TODO
projects/clang360-import/contrib/xz/src/common/mythread.h
projects/clang360-import/contrib/xz/src/common/sysdefs.h
projects/clang360-import/contrib/xz/src/common/tuklib_cpucores.c
projects/clang360-import/contrib/xz/src/common/tuklib_physmem.c
projects/clang360-import/contrib/xz/src/liblzma/api/lzma.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/base.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/block.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/container.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/filter.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/hardware.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/index.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/index_hash.h
projects/clang360-import/contrib/xz/src/liblzma/api/lzma/version.h
projects/clang360-import/contrib/xz/src/liblzma/check/check.h
projects/clang360-import/contrib/xz/src/liblzma/check/sha256.c
projects/clang360-import/contrib/xz/src/liblzma/common/alone_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/alone_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/alone_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/auto_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/block_buffer_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/block_buffer_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/block_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/block_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/block_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/block_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/block_header_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/block_header_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/block_util.c
projects/clang360-import/contrib/xz/src/liblzma/common/common.c
projects/clang360-import/contrib/xz/src/liblzma/common/common.h
projects/clang360-import/contrib/xz/src/liblzma/common/easy_buffer_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/easy_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/filter_buffer_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/filter_buffer_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/filter_common.c
projects/clang360-import/contrib/xz/src/liblzma/common/filter_common.h
projects/clang360-import/contrib/xz/src/liblzma/common/filter_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/filter_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/filter_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/filter_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/filter_flags_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/index.c
projects/clang360-import/contrib/xz/src/liblzma/common/index_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/index_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/index_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/index_hash.c
projects/clang360-import/contrib/xz/src/liblzma/common/stream_buffer_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/stream_buffer_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/stream_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/common/stream_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/common/stream_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/delta/delta_common.c
projects/clang360-import/contrib/xz/src/liblzma/delta/delta_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/delta/delta_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/delta/delta_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/delta/delta_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/delta/delta_private.h
projects/clang360-import/contrib/xz/src/liblzma/liblzma.pc.in
projects/clang360-import/contrib/xz/src/liblzma/lz/lz_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/lz/lz_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/lz/lz_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/lz/lz_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/lz/lz_encoder_mf.c
projects/clang360-import/contrib/xz/src/liblzma/lzma/fastpos.h
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma2_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma2_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_common.h
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_encoder.c
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_encoder.h
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
projects/clang360-import/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
projects/clang360-import/contrib/xz/src/liblzma/rangecoder/range_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/simple/arm.c
projects/clang360-import/contrib/xz/src/liblzma/simple/armthumb.c
projects/clang360-import/contrib/xz/src/liblzma/simple/ia64.c
projects/clang360-import/contrib/xz/src/liblzma/simple/powerpc.c
projects/clang360-import/contrib/xz/src/liblzma/simple/simple_coder.c
projects/clang360-import/contrib/xz/src/liblzma/simple/simple_coder.h
projects/clang360-import/contrib/xz/src/liblzma/simple/simple_decoder.c
projects/clang360-import/contrib/xz/src/liblzma/simple/simple_decoder.h
projects/clang360-import/contrib/xz/src/liblzma/simple/simple_private.h
projects/clang360-import/contrib/xz/src/liblzma/simple/sparc.c
projects/clang360-import/contrib/xz/src/liblzma/simple/x86.c
projects/clang360-import/contrib/xz/src/xz/args.c
projects/clang360-import/contrib/xz/src/xz/args.h
projects/clang360-import/contrib/xz/src/xz/coder.c
projects/clang360-import/contrib/xz/src/xz/coder.h
projects/clang360-import/contrib/xz/src/xz/file_io.c
projects/clang360-import/contrib/xz/src/xz/file_io.h
projects/clang360-import/contrib/xz/src/xz/hardware.c
projects/clang360-import/contrib/xz/src/xz/hardware.h
projects/clang360-import/contrib/xz/src/xz/list.c
projects/clang360-import/contrib/xz/src/xz/main.c
projects/clang360-import/contrib/xz/src/xz/message.c
projects/clang360-import/contrib/xz/src/xz/options.c
projects/clang360-import/contrib/xz/src/xz/private.h
projects/clang360-import/contrib/xz/src/xz/signals.c
projects/clang360-import/contrib/xz/src/xz/suffix.c
projects/clang360-import/contrib/xz/src/xz/xz.1
projects/clang360-import/etc/devd.conf
projects/clang360-import/etc/rc.d/Makefile
projects/clang360-import/etc/rc.d/jail
projects/clang360-import/lib/Makefile
projects/clang360-import/lib/libc/gen/getgrent.c
projects/clang360-import/lib/libc/gen/getpwent.c
projects/clang360-import/lib/libc/sys/setresuid.2
projects/clang360-import/lib/liblzma/Makefile
projects/clang360-import/lib/liblzma/Symbol.map
projects/clang360-import/lib/liblzma/Versions.def
projects/clang360-import/lib/liblzma/config.h
projects/clang360-import/release/Makefile
projects/clang360-import/release/Makefile.vm
projects/clang360-import/rescue/rescue/Makefile
projects/clang360-import/share/mk/bsd.mkopt.mk
projects/clang360-import/share/mk/bsd.own.mk
projects/clang360-import/share/mk/src.libnames.mk
projects/clang360-import/sys/amd64/amd64/apic_vector.S
projects/clang360-import/sys/amd64/amd64/genassym.c
projects/clang360-import/sys/amd64/amd64/mp_machdep.c
projects/clang360-import/sys/amd64/include/cpufunc.h
projects/clang360-import/sys/amd64/vmm/vmm_support.S
projects/clang360-import/sys/arm/broadcom/bcm2835/files.bcm2835
projects/clang360-import/sys/arm/conf/RPI-B
projects/clang360-import/sys/cam/ctl/ctl_frontend_iscsi.c
projects/clang360-import/sys/cam/ctl/ctl_frontend_iscsi.h
projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/clang360-import/sys/conf/dtb.mk
projects/clang360-import/sys/conf/files.powerpc
projects/clang360-import/sys/conf/kern.opts.mk
projects/clang360-import/sys/conf/kern.pre.mk
projects/clang360-import/sys/conf/options
projects/clang360-import/sys/conf/options.powerpc
projects/clang360-import/sys/contrib/dev/acpica/include/actbl2.h
projects/clang360-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
projects/clang360-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
projects/clang360-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h
projects/clang360-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c
projects/clang360-import/sys/dev/cxgb/cxgb_osdep.h
projects/clang360-import/sys/dev/cxgbe/adapter.h
projects/clang360-import/sys/dev/cxgbe/common/t4_hw.c
projects/clang360-import/sys/dev/cxgbe/iw_cxgbe/device.c
projects/clang360-import/sys/dev/cxgbe/offload.h
projects/clang360-import/sys/dev/cxgbe/t4_main.c
projects/clang360-import/sys/dev/cxgbe/tom/t4_listen.c
projects/clang360-import/sys/dev/cxgbe/tom/t4_tom.c
projects/clang360-import/sys/dev/drm2/radeon/ni.c
projects/clang360-import/sys/dev/drm2/radeon/si.c
projects/clang360-import/sys/dev/iscsi/icl.c
projects/clang360-import/sys/dev/iscsi/icl_conn_if.m
projects/clang360-import/sys/dev/iscsi/icl_soft.c
projects/clang360-import/sys/dev/iscsi/icl_wrappers.h
projects/clang360-import/sys/dev/iscsi/iscsi.c
projects/clang360-import/sys/dev/iscsi/iscsi.h
projects/clang360-import/sys/dev/usb/controller/xhci.c
projects/clang360-import/sys/dev/usb/serial/u3g.c
projects/clang360-import/sys/dev/usb/usbdevs
projects/clang360-import/sys/dev/wpi/if_wpi.c
projects/clang360-import/sys/dev/wpi/if_wpireg.h
projects/clang360-import/sys/dev/wpi/if_wpivar.h
projects/clang360-import/sys/i386/i386/apic_vector.s
projects/clang360-import/sys/i386/i386/genassym.c
projects/clang360-import/sys/i386/i386/mp_machdep.c
projects/clang360-import/sys/i386/include/cpufunc.h
projects/clang360-import/sys/kern/kern_sig.c
projects/clang360-import/sys/kern/kern_timeout.c
projects/clang360-import/sys/kern/uipc_shm.c
projects/clang360-import/sys/modules/wpi/Makefile
projects/clang360-import/sys/netinet/if_ether.c
projects/clang360-import/sys/netinet/in.c
projects/clang360-import/sys/netinet6/in6.c
projects/clang360-import/sys/netinet6/nd6.c
projects/clang360-import/sys/powerpc/aim/locore32.S
projects/clang360-import/sys/powerpc/aim/machdep.c
projects/clang360-import/sys/powerpc/aim/mmu_oea.c
projects/clang360-import/sys/powerpc/conf/NOTES
projects/clang360-import/sys/powerpc/include/cpu.h
projects/clang360-import/sys/powerpc/ofw/ofw_syscons.c
projects/clang360-import/sys/powerpc/powerpc/swtch64.S
projects/clang360-import/sys/powerpc/pseries/mmu_phyp.c
projects/clang360-import/sys/powerpc/pseries/platform_chrp.c
projects/clang360-import/sys/powerpc/pseries/xics.c
projects/clang360-import/sys/sys/bitset.h
projects/clang360-import/sys/sys/callout.h
projects/clang360-import/sys/sys/copyright.h
projects/clang360-import/sys/sys/cpuset.h
projects/clang360-import/sys/sys/param.h
projects/clang360-import/sys/x86/acpica/madt.c
projects/clang360-import/sys/x86/include/apicreg.h
projects/clang360-import/sys/x86/include/apicvar.h
projects/clang360-import/sys/x86/include/specialreg.h
projects/clang360-import/sys/x86/x86/io_apic.c
projects/clang360-import/sys/x86/x86/local_apic.c
projects/clang360-import/sys/x86/xen/xen_apic.c
projects/clang360-import/usr.bin/ctlstat/ctlstat.c
projects/clang360-import/usr.bin/xz/Makefile
projects/clang360-import/usr.sbin/bluetooth/hccontrol/hccontrol.8
projects/clang360-import/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
projects/clang360-import/usr.sbin/bsdconfig/console/INDEX
projects/clang360-import/usr.sbin/bsdconfig/includes/INDEX
projects/clang360-import/usr.sbin/bsdconfig/networking/share/device.subr
projects/clang360-import/usr.sbin/bsdconfig/share/dialog.subr
projects/clang360-import/usr.sbin/bsdconfig/share/keymap.subr
projects/clang360-import/usr.sbin/bsdconfig/timezone/share/continents.subr
projects/clang360-import/usr.sbin/bsdconfig/timezone/share/countries.subr
projects/clang360-import/usr.sbin/bsdconfig/timezone/timezone
projects/clang360-import/usr.sbin/bsdconfig/usermgmt/share/user.subr
projects/clang360-import/usr.sbin/ctld/ctl.conf.5
projects/clang360-import/usr.sbin/ctld/ctld.c
projects/clang360-import/usr.sbin/ctld/ctld.h
projects/clang360-import/usr.sbin/ctld/kernel.c
projects/clang360-import/usr.sbin/ctld/parse.y
projects/clang360-import/usr.sbin/ctld/token.l
projects/clang360-import/usr.sbin/pw/tests/Makefile
Directory Properties:
projects/clang360-import/ (props changed)
projects/clang360-import/contrib/llvm/ (props changed)
projects/clang360-import/contrib/xz/ (props changed)
projects/clang360-import/etc/ (props changed)
projects/clang360-import/lib/libc/ (props changed)
projects/clang360-import/share/ (props changed)
projects/clang360-import/sys/ (props changed)
projects/clang360-import/sys/amd64/vmm/ (props changed)
projects/clang360-import/sys/cddl/contrib/opensolaris/ (props changed)
projects/clang360-import/sys/conf/ (props changed)
projects/clang360-import/sys/contrib/dev/acpica/ (props changed)
projects/clang360-import/sys/contrib/dev/acpica/include/ (props changed)
Modified: projects/clang360-import/Makefile.inc1
==============================================================================
--- projects/clang360-import/Makefile.inc1 Tue Feb 10 07:46:25 2015 (r278498)
+++ projects/clang360-import/Makefile.inc1 Tue Feb 10 07:56:14 2015 (r278499)
@@ -823,7 +823,7 @@ EXTRA_DISTRIBUTIONS+= tests
DEBUG_DISTRIBUTIONS=
.if ${MK_DEBUG_FILES} != "no"
-DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
.endif
MTREE_MAGIC?= mtree 2.0
@@ -1671,6 +1671,7 @@ _lib_libcapsicum=lib/libcapsicum
lib/libcapsicum__L: lib/libnv__L
lib/libpjdlog__L: lib/libutil__L
+lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
.for _DIR in ${LOCAL_LIB_DIRS}
Modified: projects/clang360-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang360-import/ObsoleteFiles.inc Tue Feb 10 07:46:25 2015 (r278498)
+++ projects/clang360-import/ObsoleteFiles.inc Tue Feb 10 07:56:14 2015 (r278499)
@@ -38,7 +38,7 @@
# xargs -n1 | sort | uniq -d;
# done
-# 20150126: new clang import which bumps version from 3.5.1 to 3.6.0.
+# 20150210: new clang import which bumps version from 3.5.1 to 3.6.0.
OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h
OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h
OLD_FILES+=usr/include/clang/3.5.1/altivec.h
@@ -93,6 +93,8 @@ OLD_FILES+=usr/lib/clang/3.5.1/lib/freeb
OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
OLD_DIRS+=usr/lib/clang/3.5.1/lib
OLD_DIRS+=usr/lib/clang/3.5.1
+# 20150209: liblzma header
+OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
OLD_FILES+=usr/share/man/man9/spl.9
OLD_FILES+=usr/share/man/man9/spl0.9
Modified: projects/clang360-import/contrib/xz/ChangeLog
==============================================================================
--- projects/clang360-import/contrib/xz/ChangeLog Tue Feb 10 07:46:25 2015 (r278498)
+++ projects/clang360-import/contrib/xz/ChangeLog Tue Feb 10 07:56:14 2015 (r278499)
@@ -1,66 +1,923 @@
-commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af
+commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 20:44:32 +0300
+Date: 2014-12-21 20:48:37 +0200
- Bump version and soname for 5.0.7.
+ DOS: Update Makefile.
+
+ dos/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 19:50:38 +0200
+
+ Windows: Fix bin_i486 to bin_i686 in build.bash.
+
+ windows/build.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cbafa710918195dbba3db02c3fab4f0538235206
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:58:44 +0200
+
+ Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c.
+
+ doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 4 deletions(-)
+
+commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:56:44 +0200
+
+ Docs: Update docs/examples/00_README.txt.
+
+ doc/examples/00_README.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:11:17 +0200
+
+ Bump version and soname for 5.2.0.
+
+ I know that soname != app version, but I skip AGE=1
+ in -version-info to make the soname match the liblzma
+ version anyway. It doesn't hurt anything as long as
+ it doesn't conflict with library versioning rules.
src/liblzma/Makefile.am | 2 +-
- src/liblzma/api/lzma/version.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/liblzma/api/lzma/version.h | 6 +++---
+ src/liblzma/liblzma.map | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3e8bd1d15e417f2d588e9be50ce027ee3d48b2da
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:05:03 +0200
+
+ Avoid variable-length arrays in the debug programs.
+
+ debug/full_flush.c | 3 ++-
+ debug/sync_flush.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 72f7307cfdceb941aeb2bf30d424cc0d13621786
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:01:45 +0200
+
+ Build: Include 04_compress_easy_mt.c in the tarball.
+
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2cb82ff21c62def11f3683a8bb0aaf363102aaa0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:00:38 +0200
+
+ Fix build when --disable-threads is used.
+
+ src/common/mythread.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9b9e3536e458ef958f66b0e8982efc9d36de4d17
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:56:15 +0100
+
+ po/fr: improve wording for help for --lzma1/--lzma2.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a8b6b569e7fadbf5b5b9139d53bc764015c15027
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:55:48 +0100
+
+ po/fr: missing line in translation of --extreme.
+
+ po/fr.po | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f168a6fd1a888cf4f0caaddcafcb21dadc6ab6e9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:33 +0200
+
+ Update NEWS for 5.2.0.
+
+ NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+
+commit cec2ee863b3a88f4bf039cb00f73c4a4fc93a429
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:22 +0200
+
+ Update NEWS for 5.0.8.
+
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 42e97a32649bf53ce43be2258b902a417c6e7fa1
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:07:54 +0200
+
+ xz: Fix a comment.
+
+ src/xz/options.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 29b95d5d6665cedffa6a9d6d3d914f981e852182
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:43:14 +0200
+
+ Update INSTALL about the dependencies of the scripts.
+
+ INSTALL | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit 3af91040bb42c21afbb81f5568c3313125e61192
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:42:33 +0200
+
+ Windows: Update build instructions.
+
+ INSTALL | 15 +++++++++------
+ windows/INSTALL-Windows.txt | 44 +++++++++++++++++++++-----------------------
+ 2 files changed, 30 insertions(+), 29 deletions(-)
+
+commit 0152f72bf6289d744823dc6c849538f3a139ad70
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:41:48 +0200
+
+ Windows: Update the build script and README-Windows.txt.
+
+ The 32-bit build is now for i686 or newer because the
+ prebuilt MinGW-w64 toolchains include i686 code in the
+ executables even if one uses -march=i486.
+
+ The build script builds 32-bit SSE2 enabled version too.
+ Run-time detection of SSE2 support would be nice (on any OS)
+ but it's not implemented in XZ Utils yet.
+
+ windows/README-Windows.txt | 30 ++++++++++++++++--------------
+ windows/build.bash | 23 ++++++++++++++---------
+ 2 files changed, 30 insertions(+), 23 deletions(-)
+
+commit 4a1f6133ee5533cee8d91e06fcc22443e5f1881a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-19 15:51:50 +0200
+
+ Windows: Define TUKLIB_SYMBOL_PREFIX in config.h.
+
+ It is to keep all symbols in the lzma_ namespace.
+
+ windows/config.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 7f7d093de79eee0c7dbfd7433647e46302f19f82
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 21:00:09 +0200
+
+ xz: Update the man page about --threads.
+
+ src/xz/xz.1 | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 009823448b82aa5f465668878a544c5842885407
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 20:57:43 +0200
+
+ xz: Update the man page about --block-size.
+
+ src/xz/xz.1 | 41 +++++++++++++++++++++++++++++++++--------
+ 1 file changed, 33 insertions(+), 8 deletions(-)
+
+commit 7dddfbeb499e528940bc12047355c184644aafe9
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:26:57 +0100
+
+ po/fr: several more translation updates: reword and handle --ignore-check.
+
+ po/fr.po | 50 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+commit 6eca5be40e04ddc4b738d493e4e56835956d8b69
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:23:01 +0100
+
+ po/fr: yet another place where my email address had to be updated.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d1003673e92ba47edd6aeeb3dbea05c18269d0e7
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:22:20 +0100
+
+ po/fr: fix several typos that have been around since the beginning.
+
+ po/fr.po | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+commit 4c5aa911a0df027e46171e368debc543d2fa72b2
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:02:31 +0100
+
+ po/fr: last batch of new translations for now.
+
+ Four new error messages.
+
+ po/fr.po | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 3e3099e36d27059499e7996fb38a62e8ab01d356
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:01:32 +0100
+
+ po/fr: translations for --threads, --block-size and --block-list.
+
+ po/fr.po | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit e7d96a5933eec4e9d4a62569ee88df0ebb0f1d53
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:00:53 +0100
+
+ po/fr: remove fuzzy marker for error messages that will be kept in English.
+
+ The following is a copy of a comment inside fr.po:
+
+ Note from translator on "file status flags".
+ The following entry is kept un-translated on purpose. It is difficult to
+ translate and should only happen in exceptional circumstances which means
+ that translating would:
+ - lose some of the meaning
+ - make it more difficult to look up in search engines; it might happen one
+ in
+ a million times, if we dilute the error message in 20 languages, it will be
+ almost impossible to find an explanation and support for the error.
+
+ po/fr.po | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+commit 46cbb9033af8a21fafe543302d6919746e0d72af
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:58:25 +0100
+
+ po/fr: several minor updates and better wording.
+
+ Meaning doesn't change at all: it's only for better wording and/or
+ formatting of a few strings.
+
+ po/fr.po | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 7ce49d444f04e73145f79c832eb4d510594b074a
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:56:12 +0100
+
+ po/fr: update my email address and copyright years.
+
+ po/fr.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 214c553ebc3047cd720da1ce5c80cf7c38118d3c
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-11-26 10:08:26 +0100
+
+ fr.po: commit file after only "update-po" so actual is readable.
+
+ po/fr.po | 311 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 199 insertions(+), 112 deletions(-)
+
+commit 1190c641af09cde85f8bd0fbe5c4906f4a29431b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-02 20:04:07 +0200
+
+ liblzma: Document how lzma_mt.block_size affects memory usage.
+
+ src/liblzma/api/lzma/container.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e4fc1d2f9571fba79ce383595be2ea2a9257def0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-28 20:07:18 +0200
+
+ Update INSTALL about a "make check" failure in test_scripts.sh.
+
+ INSTALL | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+commit 34f9e40a0a0c3bd2c2730cdb9cd550bbb8a3f2fe
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:12:27 +0200
+
+ Remove LZMA_UNSTABLE macro.
+
+ src/liblzma/api/lzma/container.h | 4 ----
+ src/liblzma/common/common.h | 2 --
+ src/xz/private.h | 1 -
+ 3 files changed, 7 deletions(-)
+
+commit 6d9c0ce9f2677b159e32b224aba5b535b304a705
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:10:33 +0200
+
+ liblzma: Update lzma_stream_encoder_mt() API docs.
+
+ src/liblzma/api/lzma/container.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 2301f3f05dd9742f42cda8f0f318864f5dc39ab3
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-25 12:32:05 +0200
+
+ liblzma: Verify the filter chain in threaded encoder initialization.
+
+ This way an invalid filter chain is detected at the Stream
+ encoder initialization instead of delaying it to the first
+ call to lzma_code() which triggers the initialization of
+ the actual filter encoder(s).
+
+ src/liblzma/common/stream_encoder_mt.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 107a263d5bb63cd3593fd6a5c938706539f84523
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 19:11:49 +0200
+
+ Build: Update m4/ax_pthread.m4 from Autoconf Archive.
+
+ m4/ax_pthread.m4 | 71 +++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 47 insertions(+), 24 deletions(-)
+
+commit b13a781833399ff5726cfc997f3cb2f0acbdbf31
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:52:21 +0200
+
+ Build: Replace obsolete AC_HELP_STRING with AS_HELP_STRING.
+
+ configure.ac | 36 ++++++++++++++++++------------------
+ m4/tuklib_integer.m4 | 2 +-
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 542cac122ed3550148a2af0033af22b757491378
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:43:19 +0200
+
+ Build: Fix Autoconf warnings about escaped backquotes.
+
+ Thanks to Daniel Richard G. for pointing out that it's
+ good to sometimes run autoreconf -fi with -Wall.
+
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 7b03a15cea8cd4f19ed680b51c4bcbae3ce4142f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:54:40 +0200
+
+ xzdiff: Use mkdir if mktemp isn't available.
+
+ src/scripts/xzdiff.in | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+commit f8c13e5e3609581d5dd9f8777985ca07f2390ad7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:45:01 +0200
+
+ xzdiff: Create a temporary directory to hold a temporary file.
+
+ This avoids the possibility of "File name too long" when
+ creating a temp file when the input file name is very long.
+
+ This also means that other users on the system can no longer
+ see the input file names in /tmp (or whatever $TMPDIR is)
+ since the temporary directory will have a generic name. This
+ usually doesn't matter since on many systems one can see
+ the arguments given to all processes anyway.
+
+ The number X chars to mktemp where increased from 6 to 10.
+
+ Note that with some shells temp files or dirs won't be used at all.
+
+ src/scripts/xzdiff.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 7716dcf9df7f457500cb657314e7a9aea5fedb06
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 15:38:47 +0200
+
+ liblzma: Fix lzma_mt.preset in lzma_stream_encoder_mt_memusage().
+
+ It read the filter chain from a wrong variable. This is a similar
+ bug that was fixed in 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e.
+
+ src/liblzma/common/stream_encoder_mt.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 230fa4a605542c84b4178a57381695a0af4e779b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 14:49:55 +0200
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4e4ae08bc7c1711e399c9f2d26eb375d39d08101
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:28:25 +0200
+
+ Update .gitignore files.
+
+ .gitignore | 2 ++
+ m4/.gitignore | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit c923b140b27d1a055db6284e10fd546ad1a7fcdb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:15:35 +0200
+
+ Build: Prepare to support Automake's subdir-objects.
+
+ Due to a bug in Automake, subdir-objects won't be enabled
+ for now.
+
+ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+
+ Thanks to Daniel Richard G. for the original patches.
+
+ configure.ac | 7 ++++++-
+ src/Makefile.am | 22 +++++++++++++++++++++-
+ src/liblzma/Makefile.am | 4 ++--
+ src/lzmainfo/Makefile.am | 4 ++--
+ src/xz/Makefile.am | 10 +++++-----
+ src/xzdec/Makefile.am | 8 ++++----
+ 6 files changed, 40 insertions(+), 15 deletions(-)
+
+commit 08c2aa16bea0df82828f665d51fba2e0a5e8997f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-24 20:09:29 +0300
+
+ Translations: Update the Italian translation.
+
+ Thanks to Milo Casagrande.
+
+ po/it.po | 452 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 275 insertions(+), 177 deletions(-)
+
+commit 2f9f61aa83539c54ff6c118a2693890f0519b3dd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-18 18:51:45 +0300
+
+ Translations: Update the Polish translation.
+
+ Thanks to Jakub Bogusz.
+
+ po/pl.po | 332 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 214 insertions(+), 118 deletions(-)
+
+commit 4f9d233f67aea25e532824d11b7642cf7dee7a76
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:30 +0200
+
+ l10n: de.po: Change translator email address.
+
+ Although the old address is still working, the new one should
+ be preferred. So this commit changes all three places in de.po
+ accordingly.
+
+ Signed-off-by: Andre Noll <maan@tuebingen.mpg.de>
+
+ po/de.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 00502b2bedad43f0cc167ac17ae0608837ee196b
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:29 +0200
+
+ l10n: de.po: Update German translation
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 531 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 281 insertions(+), 250 deletions(-)
+
+commit 706b0496753fb609e69f1570ec603f11162189d1
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:28 +0200
+
+ l10n: de.po: Fix typo: Schießen -> Schließen.
+
+ That's a funny one since "schießen" means to shoot :)
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7c32e6a935c3d7ee366abad1679bd5f322f0c7d4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:42:26 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 076258cc458f1e705041ac7a729b15ffe8c5214a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:41:51 +0300
+
+ Add support for AmigaOS/AROS to tuklib_physmem().
+
+ Thanks to Fredrik Wikstrom.
+
+ m4/tuklib_physmem.m4 | 3 ++-
+ src/common/tuklib_physmem.c | 7 +++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit efa7b0a210e1baa8e128fc98c5443a944c39ad24
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 18:42:14 +0300
+
+ xzgrep: Avoid passing both -q and -l to grep.
+
+ The behavior of grep -ql varies:
+ - GNU grep behaves like grep -q.
+ - OpenBSD grep behaves like grep -l.
+
+ POSIX doesn't make it 100 % clear what behavior is expected.
+ Anyway, using both -q and -l at the same time makes no sense
+ so both options simply should never be used at the same time.
+
+ Thanks to Christian Weisgerber.
+
+ src/scripts/xzgrep.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 9c5f76098c9986b48d2fc574a0b764f4cde0c538
+Author: Trần Ngá»c Quân <vnwildman@gmail.com>
+Date: 2014-09-25 09:22:45 +0700
+
+ l10n: vi.po: Update Vietnamese translation
+
+ Signed-off-by: Trần Ngá»c Quân <vnwildman@gmail.com>
+
+ po/vi.po | 136 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 84 insertions(+), 52 deletions(-)
+
+commit c4911f2db36d811896c73c008b4218d8fa9a4730
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-25 18:38:48 +0300
+
+ Build: Detect supported compiler warning flags better.
+
+ Clang and nowadays also GCC accept any -Wfoobar option
+ but then may give a warning that an unknown warning option
+ was specified. To avoid adding unsupported warning options,
+ the options are now tested with -Werror.
+
+ Thanks to Charles Diza.
+
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 76e75522ed6f5c228d55587dee5a997893f6e474
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-20 21:01:21 +0300
+
+ Update NEWS for 5.0.7.
+
+ NEWS | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+commit d62028b4c1174fc67b6929f126f5eb24c018c700
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-20 19:42:56 +0300
+
+ liblzma: Fix a portability problem in Makefile.am.
+
+ POSIX supports $< only in inference rules (suffix rules).
+ Using it elsewhere is a GNU make extension and doesn't
+ work e.g. with OpenBSD make.
+
+ Thanks to Christian Weisgerber for the patch.
+
+ src/liblzma/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c35de31d4283edad3e57d37ffe939406542cb7bb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:54:09 +0300
+
+ Bump the version number to 5.1.4beta.
+
+ src/liblzma/api/lzma/version.h | 4 ++--
+ src/liblzma/liblzma.map | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e9e097e22cacdaa23e5414fea7913535449cb340
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:50:13 +0300
+
+ Update NEWS for 5.0.6 and 5.1.4beta.
+
+ NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 50 insertions(+)
+
+commit 642f856bb8562ab66704b1e01ac7bc08b6d0a663
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:02:41 +0300
+
+ Update TODO.
+
+ TODO | 38 ++++++++++++++++++++++++++++++++++----
+ 1 file changed, 34 insertions(+), 4 deletions(-)
+
+commit 6b5e3b9eff5b8cedb2aac5f524d4d60fc8a48124
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:32:36 +0300
+
+ xz: Add --ignore-check.
+
+ src/xz/args.c | 7 +++++++
+ src/xz/args.h | 1 +
+ src/xz/coder.c | 10 +++++++++-
+ src/xz/message.c | 2 ++
+ src/xz/xz.1 | 19 +++++++++++++++++++
+ 5 files changed, 38 insertions(+), 1 deletion(-)
+
+commit 9adbc2ff373f979c917cdfd3679ce0ebd59f1040
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:15:07 +0300
+
+ liblzma: Add support for LZMA_IGNORE_CHECK.
+
+ src/liblzma/api/lzma/container.h | 24 ++++++++++++++++++++++++
+ src/liblzma/common/common.h | 1 +
+ src/liblzma/common/stream_decoder.c | 14 ++++++++++++--
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+commit 0e0f34b8e4f1c60ecaec15c2105982381cc9c3e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:03:30 +0300
+
+ liblzma: Add support for lzma_block.ignore_check.
+
+ Note that this slightly changes how lzma_block_header_decode()
+ has been documented. Earlier it said that the .version is set
+ to the lowest required value, but now it says that the .version
+ field is kept unchanged if possible. In practice this doesn't
+ affect any old code, because before this commit the only
+ possible .version was 0.
+
+ src/liblzma/api/lzma/block.h | 50 ++++++++++++++++++++++++-------
+ src/liblzma/common/block_buffer_encoder.c | 2 +-
+ src/liblzma/common/block_decoder.c | 18 ++++++++---
+ src/liblzma/common/block_encoder.c | 2 +-
+ src/liblzma/common/block_header_decoder.c | 12 ++++++--
+ src/liblzma/common/block_header_encoder.c | 2 +-
+ src/liblzma/common/block_util.c | 2 +-
+ 7 files changed, 68 insertions(+), 20 deletions(-)
+
+commit 71e1437ab585b46f7a25f5a131557d3d1c0cbaa2
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-04 19:25:58 +0300
+
+ liblzma: Use lzma_memcmplen() in the BT3 match finder.
+
+ I had missed this when writing the commit
+ 5db75054e900fa06ef5ade5f2c21dffdd5d16141.
+
+ Thanks to Jun I Jin.
+
+ src/liblzma/lz/lz_encoder_mf.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+commit 41dc9ea06e1414ebe8ef52afc8fc15b6e3282b04
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-04 00:25:44 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5dcffdbcc23a68abc3ac3539b30be71bc9b5af84
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 21:32:25 +0300
+
+ liblzma: SHA-256: Optimize the Maj macro slightly.
+
+ The Maj macro is used where multiple things are added
+ together, so making Maj a sum of two expressions allows
+ some extra freedom for the compiler to schedule the
+ instructions.
+
+ I learned this trick from
+ <http://www.hackersdelight.org/corres.txt>.
+
+ src/liblzma/check/sha256.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a9477d1e0c6fd0e47e637d051e7b9e2a5d9af517
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 21:08:12 +0300
+
+ liblzma: SHA-256: Optimize the way rotations are done.
+
+ This looks weird because the rotations become sequential,
+ but it helps quite a bit on both 32-bit and 64-bit x86:
+
+ - It requires fewer instructions on two-operand
+ instruction sets like x86.
+
+ - It requires one register less which matters especially
+ on 32-bit x86.
+
+ I hope this doesn't hurt other archs.
+
+ I didn't invent this idea myself, but I don't remember where
+ I saw it first.
+
+ src/liblzma/check/sha256.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+commit 5a76c7c8ee9a0afbeedb1c211db9224260404347
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 20:38:13 +0300
+
+ liblzma: SHA-256: Remove the GCC #pragma that became unneeded.
+
+ The unrolling in the previous commit should avoid the
+ situation where a compiler may think that an uninitialized
+ variable might be accessed.
+
+ src/liblzma/check/sha256.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 9a096f8e57509775c331950b8351bbca77bdcfa8
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 20:33:38 +0300
+
+ liblzma: SHA-256: Unroll a little more.
+
+ This way a branch isn't needed for each operation
+ to choose between blk0 and blk2, and still the code
+ doesn't grow as much as it would with full unrolling.
+
+ src/liblzma/check/sha256.c | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+commit bc7650d87bf27f85f1a2a806dc2db1780e09e6a5
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 19:56:43 +0300
+
+ liblzma: SHA-256: Do the byteswapping without a temporary buffer.
+
+ src/liblzma/check/sha256.c | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+commit 544aaa3d13554e8640f9caf7db717a96360ec0f6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 22:38:28 +0300
+
+ liblzma: Use lzma_memcmplen() in normal mode of LZMA.
+
+ Two locations were not changed yet because the simplest change
+ assumes that the initial "len" may be greater than "limit".
+
+ src/liblzma/lzma/lzma_encoder_optimum_normal.c | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+commit f48fce093b07aeda95c18850f5e086d9f2383380
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 22:30:38 +0300
+
+ liblzma: Simplify LZMA fast mode code by using memcmp().
+
+ src/liblzma/lzma/lzma_encoder_optimum_fast.c | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+commit 6bf5308e34e23dede5b301b1b9b4f131dacd9218
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 22:29:49 +0300
+
+ liblzma: Use lzma_memcmplen() in fast mode of LZMA.
+
+ src/liblzma/lzma/lzma_encoder_optimum_fast.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 353212137e51e45b105a3a3fc2e6879f1cf0d492
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 21:16:23 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5db75054e900fa06ef5ade5f2c21dffdd5d16141
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 21:15:07 +0300
+
+ liblzma: Use lzma_memcmplen() in the match finders.
+
+ This doesn't change the match finder output.
+
+ src/liblzma/lz/lz_encoder.c | 13 ++++++++++++-
+ src/liblzma/lz/lz_encoder_mf.c | 33 +++++++++++----------------------
+ 2 files changed, 23 insertions(+), 23 deletions(-)
+
+commit e1c8f1d01f4a4e2136173edab2dc63c71ef038f4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 20:57:20 +0300
+
+ liblzma: Add lzma_memcmplen() for fast memory comparison.
+
+ This commit just adds the function. Its uses will be in
+ separate commits.
+
+ This hasn't been tested much yet and it's perhaps a bit early
+ to commit it but if there are bugs they should get found quite
+ quickly.
+
+ Thanks to Jun I Jin from Intel for help and for pointing out
+ that string comparison needs to be optimized in liblzma.
+
+ configure.ac | 13 +++
+ src/liblzma/common/Makefile.inc | 1 +
+ src/liblzma/common/memcmplen.h | 170 ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 184 insertions(+)
-commit ac6c8921d1d8d2d749d5c97f9a0b0594cc863cea
+commit 765735cf52e5123586e74a51b9c073b5257f631f
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 20:43:29 +0300
+Date: 2014-07-12 21:10:09 +0300
- Update NEWS for 5.0.7.
+ Update THANKS.
- NEWS | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
-commit d1b0276aafd441a3d4db9dfd5dd9880e9f834d49
+commit 59da01785ef66c7e62f36e70ca808fd2824bb995
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 20:21:18 +0300
+Date: 2014-07-12 20:06:08 +0300
- liblzma: Fix invalid Libs.private value in liblzma.pc.
+ Translations: Add Vietnamese translation.
+
+ Thanks to Trần Ngá»c Quân.
- src/liblzma/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ po/LINGUAS | 1 +
+ po/vi.po | 1007 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 1008 insertions(+)
-commit cac72956b1e56788182ac14bfb25519636afd503
+commit 17215f751c354852700e7f8592ccf319570a0721
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 19:42:56 +0300
+Date: 2014-06-29 20:54:14 +0300
- liblzma: Fix a portability problem in Makefile.am.
-
- POSIX supports $< only in inference rules (suffix rules).
- Using it elsewhere is a GNU make extension and doesn't
- work e.g. with OpenBSD make.
+ xz: Update the help message of a few options.
- Thanks to Christian Weisgerber for the patch.
+ Updated: --threads, --block-size, and --block-list
+ Added: --flush-timeout
- src/liblzma/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/xz/message.c | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
-commit 2cdf0875dedca3e89b02ad5ac8aa1109f902ae11
+commit 96864a6ddf91ad693d102ea165f3d7918744d582
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-14 19:35:45 +0300
+Date: 2014-06-18 22:07:06 +0300
- Bump version and soname for 5.0.6.
+ xz: Use lzma_cputhreads() instead of own copy of tuklib_cpucores().
- src/liblzma/Makefile.am | 2 +-
- src/liblzma/api/lzma/version.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/xz/Makefile.am | 1 -
+ src/xz/hardware.c | 12 +++++++++---
+ 2 files changed, 9 insertions(+), 4 deletions(-)
-commit 0168b6c8fbc88cae61b1f5fb41d6c33c9e127967
+commit a115cc3748482e277f42a968baa3cd266f031dba
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-14 19:33:46 +0300
+Date: 2014-06-18 22:04:24 +0300
- Update NEWS for 5.0.6.
+ liblzma: Add lzma_cputhreads().
- NEWS | 7 +++++++
- 1 file changed, 7 insertions(+)
+ src/liblzma/Makefile.am | 8 +++++++-
+ src/liblzma/api/lzma/hardware.h | 14 ++++++++++++++
+ src/liblzma/common/Makefile.inc | 1 +
+ src/liblzma/common/hardware_cputhreads.c | 22 ++++++++++++++++++++++
+ src/liblzma/liblzma.map | 1 +
+ 5 files changed, 45 insertions(+), 1 deletion(-)
-commit 13337714e89d002af7af48d6853f977de985d7de
+commit 3ce3e7976904fbab4e6482bafa442856f77a51fa
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-06-18 19:11:52 +0300
+
+ xz: Check for filter chain compatibility for --flush-timeout.
+
+ This avoids LZMA_PROG_ERROR from lzma_code() with filter chains
+ that don't support LZMA_SYNC_FLUSH.
+
+ src/xz/coder.c | 30 +++++++++++++++++++++---------
+ 1 file changed, 21 insertions(+), 9 deletions(-)
+
+commit 381ac14ed79e5d38809f251705be8b3193bba417
Author: Lasse Collin <lasse.collin@tukaani.org>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 09:20:08 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id A4087676;
Tue, 10 Feb 2015 09:20:08 +0000 (UTC)
Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "cloud.theravensnest.org",
Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
by mx1.freebsd.org (Postfix) with ESMTPS id 4F820CB0;
Tue, 10 Feb 2015 09:20:07 +0000 (UTC)
Received: from [192.168.0.7] (cpc16-cmbg15-2-0-cust60.5-4.cable.virginm.net
[86.5.162.61]) (authenticated bits=0)
by theravensnest.org (8.15.1/8.14.9) with ESMTPSA id t1A9K4wD002957
(version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Tue, 10 Feb 2015 09:20:06 GMT (envelope-from theraven@FreeBSD.org)
X-Authentication-Warning: theravensnest.org: Host
cpc16-cmbg15-2-0-cust60.5-4.cable.virginm.net [86.5.162.61] claimed to be
[192.168.0.7]
Content-Type: text/plain; charset=windows-1252
Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2070.6\))
Subject: Re: svn commit: r278447 - projects/release-pkg/release/packages/kernel
From: David Chisnall <theraven@FreeBSD.org>
In-Reply-To: <54D8E5CD.8050304@FreeBSD.org>
Date: Tue, 10 Feb 2015 09:19:59 +0000
Content-Transfer-Encoding: quoted-printable
Message-Id: <71EFE329-6A63-4A2A-9083-BEED15991F4C@FreeBSD.org>
References: <201502091025.t19APxwK057568@svn.freebsd.org>
<2379227.vPTf1TCfaA@ralph.baldwin.cx>
<20150209161830.GH29891@ivaldir.etoilebsd.net> <54D8E5CD.8050304@FreeBSD.org>
To: John Baldwin <jhb@FreeBSD.org>
X-Mailer: Apple Mail (2.2070.6)
Cc: svn-src-projects@freebsd.org, Baptiste Daroussin <bapt@freebsd.org>,
src-committers@freebsd.org
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 09:20:08 -0000
On 9 Feb 2015, at 16:52, John Baldwin <jhb@FreeBSD.org> wrote:
>=20
> Hmm, it might be nice to choose it at runtime. Maybe I want to use
> GENERIC as the main kernel so I want it at /boot/kernel, maybe I wnat =
to
> install the "official" FreeBSD GENERIC kernel as /boot/kernel.GENERIC =
so
> I'd like to be able to override the "prefix" as it were. Similarly, I
> might want to install a test kernel package to /boot/test so I can use
> it with nextboot without changing the machine's default kernel. In =
the
> case of the kernel all the bits live in one directory, so if you allow
> the directory to be fungible during install that should be doable. I
> can't think of other things besides the kernel that have this sort of
> behavior.
Would it work to have each kernel install as a unique name (e.g. =
KERNEL.GENERIC-11.1r6) and a symlink that's updated to point to the most =
recently installed one? I can think of a few other ports where you want =
to have multiple versions installed with a suffix like this and would =
ideally like the same behaviour (e.g. the llvm ports, where you might =
need llvm33 installed for some dependency and llvm35 installed because =
it's the latest, but would quite like symlinks from clang -> clang35 and =
so on).
The only issue that I can see with this approach is that you'd need to =
make sure that you eventually removed old kernels if you didn't want =
/boot to become full and it's not clear what the trigger should be =
(remove the old one after successful boot of the new one? Perhaps we'd =
want the ability to clear the old one's installed-by-user flag so that a =
future pkg autoremove would delete it if it's a normal upgrade - this =
might be a sensible default for anything where old and new versions =
don't conflict with each other). =20
David
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 09:29:55 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 7E6EA8A0;
Tue, 10 Feb 2015 09:29:55 +0000 (UTC)
Received: from mail-wi0-x22d.google.com (mail-wi0-x22d.google.com
[IPv6:2a00:1450:400c:c05::22d])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 170A6DD9;
Tue, 10 Feb 2015 09:29:55 +0000 (UTC)
Received: by mail-wi0-f173.google.com with SMTP id bs8so10554736wib.0;
Tue, 10 Feb 2015 01:29:53 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:date:from:to:cc:subject:message-id:references:mime-version
:content-type:content-disposition:in-reply-to:user-agent;
bh=0L6Lf/3LAsgGXiFDqkXneMritPB7fcZS0Ts5D1yB6Es=;
b=doopAr6XiBSbr1NCKmxwUSgFfn7lCRI1rECF5z1zfevllK2nEMRTXLM1l4LkYOprtk
c6yIiZvRfppH5Tb+VKss59zBBSnUDZUhwE3KrdClwf608G6maKJh5U8Wq/A/exTrNInm
iAUYa8vj9Yga9ujbJ4T/q80d7jtaLbqRO3mRqeOyeTlLk/YJYYczfH1uldM8a5+AhKfn
YZ9ZsNj/COVwOi7obWC/9Dttr9X1JilpwzxbDGLJP03ZDNYBMIwwa3SNODlaDL4HXF5c
quPaTJRxLAtN2LREtDmGvl7Xmq/1Rcubv592cGgE/qioXfQYjk1nlOH2QvBNG5g/dH8Y
epCg==
X-Received: by 10.194.234.40 with SMTP id ub8mr41924328wjc.100.1423560593416;
Tue, 10 Feb 2015 01:29:53 -0800 (PST)
Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1])
by mx.google.com with ESMTPSA id r3sm17959180wic.10.2015.02.10.01.29.51
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Tue, 10 Feb 2015 01:29:52 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Tue, 10 Feb 2015 10:29:50 +0100
From: Baptiste Daroussin <bapt@freebsd.org>
To: David Chisnall <theraven@FreeBSD.org>
Subject: Re: svn commit: r278447 - projects/release-pkg/release/packages/kernel
Message-ID: <20150210092950.GQ29891@ivaldir.etoilebsd.net>
References: <201502091025.t19APxwK057568@svn.freebsd.org>
<2379227.vPTf1TCfaA@ralph.baldwin.cx>
<20150209161830.GH29891@ivaldir.etoilebsd.net>
<54D8E5CD.8050304@FreeBSD.org>
<71EFE329-6A63-4A2A-9083-BEED15991F4C@FreeBSD.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="fu8LepSeDvpxVgv6"
Content-Disposition: inline
In-Reply-To: <71EFE329-6A63-4A2A-9083-BEED15991F4C@FreeBSD.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org,
John Baldwin <jhb@FreeBSD.org>
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 09:29:55 -0000
--fu8LepSeDvpxVgv6
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Feb 10, 2015 at 09:19:59AM +0000, David Chisnall wrote:
> On 9 Feb 2015, at 16:52, John Baldwin <jhb@FreeBSD.org> wrote:
> >=20
> > Hmm, it might be nice to choose it at runtime. Maybe I want to use
> > GENERIC as the main kernel so I want it at /boot/kernel, maybe I wnat to
> > install the "official" FreeBSD GENERIC kernel as /boot/kernel.GENERIC so
> > I'd like to be able to override the "prefix" as it were. Similarly, I
> > might want to install a test kernel package to /boot/test so I can use
> > it with nextboot without changing the machine's default kernel. In the
> > case of the kernel all the bits live in one directory, so if you allow
> > the directory to be fungible during install that should be doable. I
> > can't think of other things besides the kernel that have this sort of
> > behavior.
>=20
> Would it work to have each kernel install as a unique name (e.g. KERNEL.G=
ENERIC-11.1r6) and a symlink that's updated to point to the most recently i=
nstalled one? I can think of a few other ports where you want to have mult=
iple versions installed with a suffix like this and would ideally like the =
same behaviour (e.g. the llvm ports, where you might need llvm33 installed =
for some dependency and llvm35 installed because it's the latest, but would=
quite like symlinks from clang -> clang35 and so on).
>=20
> The only issue that I can see with this approach is that you'd need to ma=
ke sure that you eventually removed old kernels if you didn't want /boot to=
become full and it's not clear what the trigger should be (remove the old =
one after successful boot of the new one? Perhaps we'd want the ability to=
clear the old one's installed-by-user flag so that a future pkg autoremove=
would delete it if it's a normal upgrade - this might be a sensible defaul=
t for anything where old and new versions don't conflict with each other). =
=20
Yes it will work
Best regards,
Bapt
--fu8LepSeDvpxVgv6
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlTZz44ACgkQ8kTtMUmk6EzqdwCfY1LJEuMdSCzqHemn9L+dYxBJ
NFYAoLQbbWiLbvrna/CkhV+EUKUAOAm8
=EUci
-----END PGP SIGNATURE-----
--fu8LepSeDvpxVgv6--
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 13:34:48 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id EC6201FF;
Tue, 10 Feb 2015 13:34:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 D6DB9E1A;
Tue, 10 Feb 2015 13:34:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ADYl55005064;
Tue, 10 Feb 2015 13:34:47 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ADYkSi005054;
Tue, 10 Feb 2015 13:34:46 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502101334.t1ADYkSi005054@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 10 Feb 2015 13:34:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278512 - in projects/release-install-debug/release:
amd64 i386 pc98 powerpc sparc64
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 13:34:48 -0000
Author: gjb
Date: Tue Feb 10 13:34:45 2015
New Revision: 278512
URL: https://svnweb.freebsd.org/changeset/base/278512
Log:
Avoid failure if unable to rm(1) files.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/release/amd64/mkisoimages.sh
projects/release-install-debug/release/i386/mkisoimages.sh
projects/release-install-debug/release/pc98/mkisoimages.sh
projects/release-install-debug/release/powerpc/mkisoimages.sh
projects/release-install-debug/release/sparc64/mkisoimages.sh
Modified: projects/release-install-debug/release/amd64/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/amd64/mkisoimages.sh Tue Feb 10 13:29:44 2015 (r278511)
+++ projects/release-install-debug/release/amd64/mkisoimages.sh Tue Feb 10 13:34:45 2015 (r278512)
@@ -56,5 +56,5 @@ NAME=$1; shift
publisher="The FreeBSD Project. http://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
+rm -f $1/etc/fstab
rm -f efiboot.img
Modified: projects/release-install-debug/release/i386/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/i386/mkisoimages.sh Tue Feb 10 13:29:44 2015 (r278511)
+++ projects/release-install-debug/release/i386/mkisoimages.sh Tue Feb 10 13:34:45 2015 (r278512)
@@ -42,4 +42,4 @@ NAME=$1; shift
publisher="The FreeBSD Project. http://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
+rm -f $1/etc/fstab
Modified: projects/release-install-debug/release/pc98/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/pc98/mkisoimages.sh Tue Feb 10 13:29:44 2015 (r278511)
+++ projects/release-install-debug/release/pc98/mkisoimages.sh Tue Feb 10 13:34:45 2015 (r278512)
@@ -42,4 +42,4 @@ NAME=$1; shift
publisher="The FreeBSD Project. http://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
+rm -f $1/etc/fstab
Modified: projects/release-install-debug/release/powerpc/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/powerpc/mkisoimages.sh Tue Feb 10 13:29:44 2015 (r278511)
+++ projects/release-install-debug/release/powerpc/mkisoimages.sh Tue Feb 10 13:34:45 2015 (r278512)
@@ -64,6 +64,6 @@ NAME=$1; shift
publisher="The FreeBSD Project. http://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
-rm /tmp/hfs-boot-block
+rm -f $1/etc/fstab
+rm -f /tmp/hfs-boot-block
rm -rf $1/ppc
Modified: projects/release-install-debug/release/sparc64/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/sparc64/mkisoimages.sh Tue Feb 10 13:29:44 2015 (r278511)
+++ projects/release-install-debug/release/sparc64/mkisoimages.sh Tue Feb 10 13:34:45 2015 (r278512)
@@ -38,7 +38,7 @@ BASEBITSDIR=$1
publisher="The FreeBSD Project. http://www.FreeBSD.org/"
echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab"
makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
-rm "${BASEBITSDIR}/etc/fstab"
+rm -f "${BASEBITSDIR}/etc/fstab"
if [ "x$BOPT" != "x-b" ]; then
mv ${NAME}.tmp ${NAME}
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 16:01:17 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 9DEE8E44;
Tue, 10 Feb 2015 16:01:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 7EAE8FDF;
Tue, 10 Feb 2015 16:01:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AG1Hk8074761;
Tue, 10 Feb 2015 16:01:17 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AG1HEx074760;
Tue, 10 Feb 2015 16:01:17 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502101601.t1AG1HEx074760@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 10 Feb 2015 16:01:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278520 - projects/release-install-debug/release/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 16:01:17 -0000
Author: gjb
Date: Tue Feb 10 16:01:16 2015
New Revision: 278520
URL: https://svnweb.freebsd.org/changeset/base/278520
Log:
Rework MANIFEST generation:
- Use the built-in printf in place of echo to eliminate
the need for inline tabs.
- Flip ${foo}_default to default_${foo} for consistency
with the desc_${foo} variables.
- Add debugging distributions, which are off by default,
and descriptions.
- Replace '.' and '-' in distribution names with '_', to
work around 'eval' emitting errors.
- Add support for selecting a non-GENERIC kernel, and
provide the KERNCONF name in the description.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/release/scripts/make-manifest.sh
Modified: projects/release-install-debug/release/scripts/make-manifest.sh
==============================================================================
--- projects/release-install-debug/release/scripts/make-manifest.sh Tue Feb 10 15:15:08 2015 (r278519)
+++ projects/release-install-debug/release/scripts/make-manifest.sh Tue Feb 10 16:01:16 2015 (r278520)
@@ -9,19 +9,54 @@
#
# $FreeBSD$
-desc_base="Base system (MANDATORY)"
-desc_kernel="Kernel (MANDATORY)"
-desc_doc="Additional documentation"
-doc_default=off
-desc_games="Games (fortune, etc.)"
-desc_lib32="32-bit compatibility libraries"
-desc_ports="Ports tree"
-desc_src="System source code"
-desc_tests="Test suite"
-src_default=off
-tests_default=off
+base="Base system"
+doc="Additional Documentation"
+games="Games (fortune, etc.)"
+kernel="Kernel"
+ports="Ports tree"
+src="System source tree"
+lib32="32-bit compatibility libraries"
+tests="Test suite"
-for i in $*; do
- echo "`basename $i` `sha256 -q $i` `tar tvf $i | wc -l | tr -d ' '` `basename $i .txz` \"`eval echo \\\$desc_$(basename $i .txz)`\" `eval echo \\\${$(basename $i .txz)_default:-on}`"
+desc_base="${base} (MANDATORY)"
+desc_base_dbg="${base} (Debugging)"
+desc_doc="${doc}"
+desc_games="${games}"
+desc_games_dbg="${games} (Debugging)"
+desc_kernel="${kernel} (MANDATORY)"
+desc_kernel_alt="Alternate ${kernel}"
+desc_lib32="${lib32}"
+desc_lib32_dbg="${lib32} (Debugging)"
+desc_ports="${ports}"
+desc_src="${src}"
+desc_tests="${tests}"
+
+default_doc=off
+default_src=off
+default_tests=off
+default_base_dbg=off
+default_games_dbg=off
+default_lib32_dbg=off
+default_kernel_alt=off
+
+for i in ${*}; do
+ dist="${i}"
+ distname="${i%%.txz}"
+ distname="$(echo ${distname} | sed -E 's/-dbg/_dbg/')"
+ distname="$(echo ${distname} | sed -E 's/kernel\..*/kernel_alt/')"
+ hash="$(sha256 -q ${i})"
+ nfiles="$(tar tvf ${i} | wc -l | tr -d ' ')"
+ default="$(eval echo \${default_${distname}:-on})"
+ desc="$(eval echo \"\${desc_${distname}}\")"
+
+ case ${i} in
+ kernel.*.*)
+ desc="${desc} \($(echo ${i%%.txz} | cut -f 2 -d '.')\)"
+ ;;
+ *)
+ ;;
+ esac
+
+ printf "${dist}\t${hash}\t${nfiles}\t${distname}\t${desc}\t${default}\n"
done
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 18:53:36 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id E008782F;
Tue, 10 Feb 2015 18:53:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 B1A18765;
Tue, 10 Feb 2015 18:53:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AIragD058658;
Tue, 10 Feb 2015 18:53:36 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AIrahf058657;
Tue, 10 Feb 2015 18:53:36 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502101853.t1AIrahf058657@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 10 Feb 2015 18:53:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278527 -
projects/release-install-debug/usr.sbin/bsdinstall/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 18:53:37 -0000
Author: gjb
Date: Tue Feb 10 18:53:35 2015
New Revision: 278527
URL: https://svnweb.freebsd.org/changeset/base/278527
Log:
Provide a mechanism to differentiate installation distribution sets
between local and remote sources. This is needed in order to enable
MK_DEBUG_FILES by default, since the debug distribution sets will
not be included on the installer medium.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Tue Feb 10 18:49:13 2015 (r278526)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Tue Feb 10 18:53:35 2015 (r278527)
@@ -80,16 +80,20 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ];
done
fi
+LOCAL_DISTRIBUTIONS=""
FETCH_DISTRIBUTIONS=""
for dist in $DISTRIBUTIONS; do
if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then
FETCH_DISTRIBUTIONS="$FETCH_DISTRIBUTIONS $dist"
+ else
+ LOCAL_DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS $dist"
fi
done
+LOCAL_DISTRIBUTIONS=`echo $LOCAL_DISTRIBUTIONS` # Trim white space
FETCH_DISTRIBUTIONS=`echo $FETCH_DISTRIBUTIONS` # Trim white space
if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then
- dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "No installation files were found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
+ dialog --backtitle "FreeBSD Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0
bsdinstall netconfig || error
NETCONFIG_DONE=yes
fi
@@ -168,15 +172,20 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
DISTDIR_IS_UNIONFS=1
mount_nullfs -o union "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
else
- export DISTRIBUTIONS="MANIFEST $ALL_DISTRIBUTIONS"
+ export DISTRIBUTIONS="MANIFEST $FETCH_DISTRIBUTIONS"
export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
fi
export FTP_PASSIVE_MODE=YES
- bsdinstall distfetch || error "Failed to fetch distribution"
+ bsdinstall distfetch || error "Failed to fetch remote distribution"
export DISTRIBUTIONS="$ALL_DISTRIBUTIONS"
fi
+if [ ! -z "$LOCAL_DISTRIBUTIONS" ]; then
+ env DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS" bsdinstall distfetch || \
+ error "Failed to fetch distribution from local media"
+fi
+
bsdinstall checksum || error "Distribution checksum failed"
bsdinstall distextract || error "Distribution extract failed"
bsdinstall rootpass || error "Could not set root password"
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 19:04:59 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 2D2CAC80;
Tue, 10 Feb 2015 19:04:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 190A9885;
Tue, 10 Feb 2015 19:04:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AJ4wnW063585;
Tue, 10 Feb 2015 19:04:58 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AJ4we3063584;
Tue, 10 Feb 2015 19:04:58 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502101904.t1AJ4we3063584@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 10 Feb 2015 19:04:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278528 -
projects/release-install-debug/usr.sbin/bsdinstall/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 19:04:59 -0000
Author: gjb
Date: Tue Feb 10 19:04:58 2015
New Revision: 278528
URL: https://svnweb.freebsd.org/changeset/base/278528
Log:
Include MANIFEST in LOCAL_DISTRIBUTIONS by default.
It seems like a Really Bad Idea to fetch a remote checksum
file when there is always one available locally.
Any situation where a local MANIFEST is not available is
a bug.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Tue Feb 10 18:53:35 2015 (r278527)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Tue Feb 10 19:04:58 2015 (r278528)
@@ -80,7 +80,7 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ];
done
fi
-LOCAL_DISTRIBUTIONS=""
+LOCAL_DISTRIBUTIONS="MANIFEST"
FETCH_DISTRIBUTIONS=""
for dist in $DISTRIBUTIONS; do
if [ ! -f $BSDINSTALL_DISTDIR/$dist ]; then
@@ -172,7 +172,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
DISTDIR_IS_UNIONFS=1
mount_nullfs -o union "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
else
- export DISTRIBUTIONS="MANIFEST $FETCH_DISTRIBUTIONS"
+ export DISTRIBUTIONS="$FETCH_DISTRIBUTIONS"
export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
fi
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 21:51:23 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 5AFA5A40;
Tue, 10 Feb 2015 21:51:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 45FA3D90;
Tue, 10 Feb 2015 21:51:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ALpNQw045300;
Tue, 10 Feb 2015 21:51:23 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ALpNKh045299;
Tue, 10 Feb 2015 21:51:23 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502102151.t1ALpNKh045299@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 10 Feb 2015 21:51:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278536 - projects/release-install-debug/release/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 21:51:23 -0000
Author: gjb
Date: Tue Feb 10 21:51:22 2015
New Revision: 278536
URL: https://svnweb.freebsd.org/changeset/base/278536
Log:
Fix description quoting in MANIFEST.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/release/scripts/make-manifest.sh
Modified: projects/release-install-debug/release/scripts/make-manifest.sh
==============================================================================
--- projects/release-install-debug/release/scripts/make-manifest.sh Tue Feb 10 21:44:28 2015 (r278535)
+++ projects/release-install-debug/release/scripts/make-manifest.sh Tue Feb 10 21:51:22 2015 (r278536)
@@ -57,6 +57,6 @@ for i in ${*}; do
;;
esac
- printf "${dist}\t${hash}\t${nfiles}\t${distname}\t${desc}\t${default}\n"
+ printf "${dist}\t${hash}\t${nfiles}\t${distname}\t\"${desc}\"\t${default}\n"
done
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 22:02:01 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id A5DBEEAD;
Tue, 10 Feb 2015 22:02:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 90E6BF24;
Tue, 10 Feb 2015 22:02:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AM21id050491;
Tue, 10 Feb 2015 22:02:01 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AM21CU050490;
Tue, 10 Feb 2015 22:02:01 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502102202.t1AM21CU050490@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 Feb 2015 22:02:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278537 - projects/release-pkg/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 22:02:01 -0000
Author: bapt
Date: Tue Feb 10 22:02:00 2015
New Revision: 278537
URL: https://svnweb.freebsd.org/changeset/base/278537
Log:
Revert r278453 we in the end won't use make distributeworld
Modified:
projects/release-pkg/share/mk/bsd.subdir.mk
Modified: projects/release-pkg/share/mk/bsd.subdir.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.subdir.mk Tue Feb 10 21:51:22 2015 (r278536)
+++ projects/release-pkg/share/mk/bsd.subdir.mk Tue Feb 10 22:02:00 2015 (r278537)
@@ -39,7 +39,7 @@ DISTRIBUTION?= base
distribute: .MAKE
.for dist in ${DISTRIBUTION}
${_+_}cd ${.CURDIR}; \
- ${MAKE} install -DNO_SUBDIR DESTDIR=${DESTDIR}/${DISTDIR}/${dist} SHARED=copies
+ ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
.endfor
.endif
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 22:04:04 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id DF12CFA9;
Tue, 10 Feb 2015 22:04:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 B0B35F31;
Tue, 10 Feb 2015 22:04:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AM44Wa050788;
Tue, 10 Feb 2015 22:04:04 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AM44Bw050787;
Tue, 10 Feb 2015 22:04:04 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201502102204.t1AM44Bw050787@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org
using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 10 Feb 2015 22:04:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278538 - projects/cxl_iscsi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 22:04:05 -0000
Author: np
Date: Tue Feb 10 22:04:04 2015
New Revision: 278538
URL: https://svnweb.freebsd.org/changeset/base/278538
Log:
Hardware accelerated iSCSI driver for Chelsio T5 based 40G/10G/1G cards.
Added:
- copied from r278537, head/
Directory Properties:
projects/cxl_iscsi/ (props changed)
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 22:04:42 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 0D25B117;
Tue, 10 Feb 2015 22:04:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 EC835F36;
Tue, 10 Feb 2015 22:04:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AM4fL1050908;
Tue, 10 Feb 2015 22:04:41 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AM4fxH050907;
Tue, 10 Feb 2015 22:04:41 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502102204.t1AM4fxH050907@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 Feb 2015 22:04:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278539 - projects/release-pkg/etc
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 22:04:42 -0000
Author: bapt
Date: Tue Feb 10 22:04:41 2015
New Revision: 278539
URL: https://svnweb.freebsd.org/changeset/base/278539
Log:
Revert r278451 and r278454
We won't use distributeworld in the end
Modified:
projects/release-pkg/etc/Makefile
Modified: projects/release-pkg/etc/Makefile
==============================================================================
--- projects/release-pkg/etc/Makefile Tue Feb 10 22:04:04 2015 (r278538)
+++ projects/release-pkg/etc/Makefile Tue Feb 10 22:04:41 2015 (r278539)
@@ -193,8 +193,8 @@ distribute:
# Avoid installing tests here; "make distribution" will do this and
# correctly place them in the right location.
${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \
- DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION}
- ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION}
+ DESTDIR=${DISTDIR}/${DISTRIBUTION}
+ ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
.include <bsd.endian.mk>
.if ${TARGET_ENDIANNESS} == "1234"
@@ -382,7 +382,7 @@ distrib-dirs: ${MTREES:N/*}
shift; \
d=$$1; \
test "$$d" == "/" && d=""; \
- d=${DESTDIR}/${DISTBASE}$$d; \
+ d=$d; \
shift; \
test -d $$d || mkdir -p $$d; \
${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 22:05:59 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 2B9B1219;
Tue, 10 Feb 2015 22:05:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 F1F8EF4B;
Tue, 10 Feb 2015 22:05:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AM5wFS051136;
Tue, 10 Feb 2015 22:05:58 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AM5wsi051134;
Tue, 10 Feb 2015 22:05:58 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502102205.t1AM5wsi051134@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 Feb 2015 22:05:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278540 - projects/release-pkg
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 22:05:59 -0000
Author: bapt
Date: Tue Feb 10 22:05:57 2015
New Revision: 278540
URL: https://svnweb.freebsd.org/changeset/base/278540
Log:
Add a new target make stageworld which basically does the same job as:
make installworld distribution but preparing the mtree the same way
distributeworld does and respecting -DNO_ROOT
Modified:
projects/release-pkg/Makefile
projects/release-pkg/Makefile.inc1
Modified: projects/release-pkg/Makefile
==============================================================================
--- projects/release-pkg/Makefile Tue Feb 10 22:04:41 2015 (r278539)
+++ projects/release-pkg/Makefile Tue Feb 10 22:05:57 2015 (r278540)
@@ -113,7 +113,7 @@ TGTS= all all-man buildenv buildenvvars
_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
_build-tools _cross-tools _includes _libraries _depend \
build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
- xdev-links native-xtools kernel-pkgs \
+ xdev-links native-xtools kernel-pkgs stageworld \
TGTS+= ${SUBDIR_TARGETS}
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Tue Feb 10 22:04:41 2015 (r278539)
+++ projects/release-pkg/Makefile.inc1 Tue Feb 10 22:05:57 2015 (r278540)
@@ -215,7 +215,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH}
# It may not be functional, e.g., due to new ABI
# when in the middle of installing over this system.
#
-.if make(distributeworld) || make(installworld)
+.if make(distributeworld) || make(installworld) || make(stageworld)
INSTALLTMP!= /usr/bin/mktemp -d -u -t install
.endif
@@ -842,7 +842,7 @@ DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTR
MTREE_MAGIC?= mtree 2.0
-distributeworld installworld: _installcheck_world
+distributeworld installworld stageworld: _installcheck_world
mkdir -p ${INSTALLTMP}
progs=$$(for prog in ${ITOOLS}; do \
if progpath=`which $$prog`; then \
@@ -978,6 +978,20 @@ reinstall: .MAKE
${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
.endif
+restage: .MAKE
+ @echo "--------------------------------------------------------------"
+ @echo ">>> Making hierarchy"
+ @echo "--------------------------------------------------------------"
+ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 \
+ LOCAL_MTREE=${LOCAL_MTREE:Q} hierarchy distribution
+ @echo
+ @echo "--------------------------------------------------------------"
+ @echo ">>> Installing everything"
+ @echo "--------------------------------------------------------------"
+ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install
+.if defined(LIB32TMP) && ${MK_LIB32} != "no"
+ ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install32
+.endif
redistribute: .MAKE
@echo "--------------------------------------------------------------"
@echo ">>> Distributing everything"
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 22:29:10 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 671F8CB2;
Tue, 10 Feb 2015 22:29:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 50FB5235;
Tue, 10 Feb 2015 22:29:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1AMTAaU061494;
Tue, 10 Feb 2015 22:29:10 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1AMT8uS061487;
Tue, 10 Feb 2015 22:29:08 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502102229.t1AMT8uS061487@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 Feb 2015 22:29:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278542 - projects/release-pkg/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 22:29:10 -0000
Author: bapt
Date: Tue Feb 10 22:29:07 2015
New Revision: 278542
URL: https://svnweb.freebsd.org/changeset/base/278542
Log:
Tag the metalog with a global default sets of tags that will be used to decide
what will go in which package, more finer grain tagging to come
Modified:
projects/release-pkg/share/mk/bsd.doc.mk
projects/release-pkg/share/mk/bsd.files.mk
projects/release-pkg/share/mk/bsd.incs.mk
projects/release-pkg/share/mk/bsd.lib.mk
projects/release-pkg/share/mk/bsd.links.mk
projects/release-pkg/share/mk/bsd.man.mk
projects/release-pkg/share/mk/bsd.prog.mk
Modified: projects/release-pkg/share/mk/bsd.doc.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.doc.mk Tue Feb 10 22:23:52 2015 (r278541)
+++ projects/release-pkg/share/mk/bsd.doc.mk Tue Feb 10 22:29:07 2015 (r278542)
@@ -135,11 +135,11 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${
realinstall:
.for _dev in ${PRINTERDEVICE:Mhtml}
cd ${SRCDIR}; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} -T docs -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
.endfor
.for _dev in ${PRINTERDEVICE:Nhtml}
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} -T docs -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
.endfor
Modified: projects/release-pkg/share/mk/bsd.files.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.files.mk Tue Feb 10 22:23:52 2015 (r278541)
+++ projects/release-pkg/share/mk/bsd.files.mk Tue Feb 10 22:29:07 2015 (r278542)
@@ -40,7 +40,7 @@ ${group}NAME_${file:T}?= ${file:T}
.endif
installfiles-${group}: _${group}INS_${file:T}
_${group}INS_${file:T}: ${file}
- ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
+ ${INSTALL} -T runtime -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
@@ -52,11 +52,11 @@ _${group}FILES+= ${file}
installfiles-${group}: _${group}INS
_${group}INS: ${_${group}FILES}
.if defined(${group}NAME)
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
+ ${INSTALL} -T runtime -o ${${group}OWN} -g ${${group}GRP} \
-m ${${group}MODE} ${.ALLSRC} \
${DESTDIR}${${group}DIR}/${${group}NAME}
.else
- ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
+ ${INSTALL} -T runtime -o ${${group}OWN} -g ${${group}GRP} \
-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif
.endif
Modified: projects/release-pkg/share/mk/bsd.incs.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.incs.mk Tue Feb 10 22:23:52 2015 (r278541)
+++ projects/release-pkg/share/mk/bsd.incs.mk Tue Feb 10 22:29:07 2015 (r278542)
@@ -41,7 +41,7 @@ ${group}NAME_${header:T}?= ${header:T}
.endif
installincludes: _${group}INS_${header:T}
_${group}INS_${header:T}: ${header}
- ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
+ ${INSTALL} -T development -C -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
@@ -53,10 +53,10 @@ _${group}INCS+= ${header}
installincludes: _${group}INS
_${group}INS: ${_${group}INCS}
.if defined(${group}NAME)
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${INSTALL} -T development -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
.else
- ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${INSTALL} -T development -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif
.endif
Modified: projects/release-pkg/share/mk/bsd.lib.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.lib.mk Tue Feb 10 22:23:52 2015 (r278541)
+++ projects/release-pkg/share/mk/bsd.lib.mk Tue Feb 10 22:29:07 2015 (r278542)
@@ -223,7 +223,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
@${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${SHLIB_NAME} ${SHLIB_LINK}
.if defined(SHLIB_LINK)
- @${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
+ @${INSTALL_SYMLINK} -T development ${SHLIB_NAME} ${SHLIB_LINK}
.endif
.if !defined(NM)
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
@@ -313,15 +313,15 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" && !defined(PRIVATELIB)
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -T development -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
.endif
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) && !defined(PRIVATELIB)
- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -T profile -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(SHLIB_NAME)
- ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -T runtime ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
.if ${MK_DEBUG_FILES} != "no"
@@ -354,16 +354,16 @@ _libinstall:
sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
-e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
- ${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -T development -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
.else
.if ${_SHLIBDIR} == ${_LIBDIR}
- ${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
+ ${INSTALL_SYMLINK} -T development ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.else
- ${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \
+ ${INSTALL_SYMLINK} -T development ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.if exists(${DESTDIR}${_LIBDIR}/${SHLIB_NAME})
-chflags noschg ${DESTDIR}${_LIBDIR}/${SHLIB_NAME}
@@ -374,11 +374,11 @@ _libinstall:
.endif # SHLIB_LINK
.endif # SHIB_NAME
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" && !defined(PRIVATELIB)
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -T development -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
- ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} -T development -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
.endif
.endif # !defined(INTERNALLIB)
Modified: projects/release-pkg/share/mk/bsd.links.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.links.mk Tue Feb 10 22:23:52 2015 (r278541)
+++ projects/release-pkg/share/mk/bsd.links.mk Tue Feb 10 22:29:07 2015 (r278542)
@@ -15,7 +15,7 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ${INSTALL_LINK} $$l $$t; \
+ ${INSTALL_LINK} -T runtime $$l $$t; \
done; true
.endif
.if defined(SYMLINKS) && !empty(SYMLINKS)
@@ -26,6 +26,6 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ${INSTALL_SYMLINK} $$l $$t; \
+ ${INSTALL_SYMLINK} -T runtime $$l $$t; \
done; true
.endif
Modified: projects/release-pkg/share/mk/bsd.man.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.man.mk Tue Feb 10 22:23:52 2015 (r278541)
+++ projects/release-pkg/share/mk/bsd.man.mk Tue Feb 10 22:29:07 2015 (r278542)
@@ -50,7 +50,7 @@
.error bsd.man.mk cannot be included directly.
.endif
-MINSTALL?= ${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+MINSTALL?= ${INSTALL} -T runtime -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
CATDIR= ${MANDIR:H:S/$/\/cat/}
CATEXT= .cat
Modified: projects/release-pkg/share/mk/bsd.prog.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.prog.mk Tue Feb 10 22:23:52 2015 (r278541)
+++ projects/release-pkg/share/mk/bsd.prog.mk Tue Feb 10 22:29:07 2015 (r278542)
@@ -201,7 +201,7 @@ realinstall: _proginstall
.ORDER: beforeinstall _proginstall
_proginstall:
.if defined(PROG)
- ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} -T runtime ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
.if ${MK_DEBUG_FILES} != "no"
.if defined(DEBUGMKDIR)
@@ -234,7 +234,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
_scriptsinstall: _SCRIPTSINS_${script:T}
_SCRIPTSINS_${script:T}: ${script}
- ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
+ ${INSTALL} -T runtime -o ${SCRIPTSOWN_${.ALLSRC:T}} \
-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}/${SCRIPTSNAME_${.ALLSRC:T}}
From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 23:48:08 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 07728AD2;
Tue, 10 Feb 2015 23:48:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 E414BCFB;
Tue, 10 Feb 2015 23:48:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ANm7Rh099221;
Tue, 10 Feb 2015 23:48:07 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ANm7Z5099217;
Tue, 10 Feb 2015 23:48:07 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201502102348.t1ANm7Z5099217@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org
using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 10 Feb 2015 23:48:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278544 - in projects/cxl_iscsi/sys: dev/cxgbe/cxgbei
dev/cxgbe/tom dev/iscsi modules/cxgbe modules/cxgbe/cxgbei
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2015 23:48:08 -0000
Author: np
Date: Tue Feb 10 23:48:06 2015
New Revision: 278544
URL: https://svnweb.freebsd.org/changeset/base/278544
Log:
Initial drop of the hardare accelerated iSCSI driver.
Submitted by: Sreenivasa Honnur <shonnur at chelsio dot com>
Sponsored by: Chelsio Communications
Added:
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/README
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/ctl.conf
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.h
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.c
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei_ulp2_ddp.h
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/iscsi.conf
projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/mbufq.h
projects/cxl_iscsi/sys/modules/cxgbe/cxgbei/
projects/cxl_iscsi/sys/modules/cxgbe/cxgbei/Makefile
Modified:
projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c
projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_ddp.c
projects/cxl_iscsi/sys/dev/iscsi/icl.h
projects/cxl_iscsi/sys/modules/cxgbe/Makefile
Added: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/README
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/README Tue Feb 10 23:48:06 2015 (r278544)
@@ -0,0 +1,74 @@
+Chelsio iSCSI driver(cxgbei):
+=============================
+To enable offload support on Chelsion HW add below lines in /boot/loader.conf
+#cat /boot/loader.conf
+hw.cxgbe.config_file="uwire"
+hw.cxgbe.iscsicaps_allowed=0xf
+
+Loading cxgbe driver and enabling TOE on the interfaces. Add below lines in /etc/rc.conf
+#cat /etc/rc.conf
+kld_list="if_cxgbe t4_tom"
+ifconfig_cxl0="inet 15.1.1.154"
+ifconfig_cxl1="inet 16.1.1.154"
+ifconfig cxl0 toe
+ifconfig cxl1 toe
+
+Compilation Steps:
+1. Compile iscsi and ctl drivers
+ cd sys/modules/iscsi
+ make && make install
+ cd sys/modules/ctl
+ make && make install
+
+2. Compile ctld
+ cd usr.sbin/ctld
+ make all install
+
+2. Compile iscsictl & iscsid
+ cd /home/chelsio/usr.sbin/iscsid
+ make all install
+ cd /home/chelsio/usr.bin/iscsictl
+ make all install
+
+3. Compile offload module
+ cd sys/modules/cxgbe/cxgbei
+ make && make install
+
+
+Sample /etc/iscsi.conf
+======================
+t0 {
+ TargetAddress = 15.1.1.33
+ TargetName = iqn.2008-09.com.example:server.target1
+ HeaderDigest = CRC32C
+ DataDigest = CRC32C
+ FirstBurstLength = 8192
+}
+
+Sample /etc/ctl.conf
+======================
+portal-group pg0 {
+ discovery-auth-group no-authentication
+ listen 0.0.0.0
+}
+
+target iqn.2012-06.com.example:target0 {
+ auth-group no-authentication
+ portal-group pg0
+
+ lun 0 {
+ path /tmp/file1
+ size 16M
+ }
+}
+
+
+Loading iscsi-initiator:
+1. service iscsid onestart
+2. kldload cxgbei
+3. iscsictl -aA
+
+Loading iscsi-target:
+1. service ctld onestart
+2. kldload cxgbei
+3. Login from initiator.
Added: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/ctl.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/ctl.conf Tue Feb 10 23:48:06 2015 (r278544)
@@ -0,0 +1,14 @@
+portal-group pg0 {
+ discovery-auth-group no-authentication
+ listen 0.0.0.0
+}
+
+target iqn.2012-06.com.example:target0 {
+ auth-group no-authentication
+ portal-group pg0
+
+ lun 0 {
+ path /tmp/file1
+ size 16M
+ }
+}
Added: projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/cxl_iscsi/sys/dev/cxgbe/cxgbei/cxgbei.c Tue Feb 10 23:48:06 2015 (r278544)
@@ -0,0 +1,1491 @@
+/*-
+ * Copyright (c) 2012 Chelsio Communications, Inc.
+ * All rights reserved.
+ *
+ * Chelsio T5xx iSCSI driver
+ *
+ * Written by: Sreenivasa Honnur <shonnur@chelsio.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "opt_inet.h"
+
+#include <sys/types.h>
+#include <sys/module.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/mbuf.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+
+#include <netinet/in.h>
+#include <netinet/in_pcb.h>
+#include <netinet/toecore.h>
+#include <netinet/tcp_var.h>
+#include <netinet/tcp_fsm.h>
+
+#include <common/common.h>
+#include <common/t4_msg.h>
+#include <common/t4_regs.h> /* for PCIE_MEM_ACCESS */
+#include <tom/t4_tom.h>
+#include "cxgbei.h"
+
+#include "cxgbei_ulp2_ddp.h"
+
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_da.h>
+#include <cam/ctl/ctl_io.h>
+#include <cam/ctl/ctl.h>
+#include <cam/ctl/ctl_backend.h>
+#include <cam/ctl/ctl_error.h>
+#include <cam/ctl/ctl_frontend.h>
+#include <cam/ctl/ctl_frontend_internal.h>
+#include <cam/ctl/ctl_debug.h>
+#include <cam/ctl/ctl_ha.h>
+#include <cam/ctl/ctl_ioctl.h>
+#include <cam/ctl/ctl_private.h>
+
+#include <dev/iscsi/icl.h>
+#include <dev/iscsi/iscsi_proto.h>
+#include <dev/iscsi/iscsi_ioctl.h>
+#include <dev/iscsi/iscsi.h>
+#include <cam/ctl/ctl_frontend_iscsi.h>
+
+#include <cam/cam.h>
+#include <cam/cam_ccb.h>
+#include <cam/cam_xpt.h>
+#include <cam/cam_debug.h>
+#include <cam/cam_sim.h>
+#include <cam/cam_xpt_sim.h>
+#include <cam/cam_xpt_periph.h>
+#include <cam/cam_periph.h>
+#include <cam/cam_compat.h>
+#include <cam/scsi/scsi_all.h>
+#include <cam/scsi/scsi_message.h>
+
+/* forward declarations */
+struct icl_pdu * icl_pdu_new_empty(struct icl_conn *, int );
+void icl_pdu_free(struct icl_pdu *);
+
+/* mbuf_tag management functions */
+struct ulp_mbuf_cb *
+get_ulp_mbuf_cb(struct mbuf *m)
+{
+ struct m_tag *mtag = NULL;
+
+ mtag = m_tag_get(CXGBE_ISCSI_MBUF_TAG, sizeof(struct ulp_mbuf_cb),
+ M_NOWAIT);
+ if (mtag == NULL) {
+ printf("%s: mtag alloc failed\n", __func__);
+ return NULL;
+ }
+ bzero(mtag + 1, sizeof(struct ulp_mbuf_cb));
+ m_tag_prepend(m, mtag);
+
+ return ((struct ulp_mbuf_cb *)(mtag + 1));
+}
+
+static struct ulp_mbuf_cb *
+find_ulp_mbuf_cb(struct mbuf *m)
+{
+ struct m_tag *mtag = NULL;
+
+ if ((mtag = m_tag_find(m, CXGBE_ISCSI_MBUF_TAG, NULL)) == NULL)
+ return (NULL);
+
+ return ((struct ulp_mbuf_cb *)(mtag + 1));
+}
+
+/*
+ * Direct Data Placement -
+ * Directly place the iSCSI Data-In or Data-Out PDU's payload into pre-posted
+ * final destination host-memory buffers based on the Initiator Task Tag (ITT)
+ * in Data-In or Target Task Tag (TTT) in Data-Out PDUs.
+ * The host memory address is programmed into h/w in the format of pagepod
+ * entries.
+ * The location of the pagepod entry is encoded into ddp tag which is used as
+ * the base for ITT/TTT.
+ */
+#define T4_DDP
+#ifdef T4_DDP
+/*
+ * functions to program the pagepod in h/w
+ */
+static void *
+t4_tdev2ddp(void *tdev)
+{
+ struct adapter *sc = ((struct toedev *)tdev)->tod_softc;
+ return (sc->iscsi_softc);
+}
+static void inline
+ppod_set(struct pagepod *ppod,
+ struct cxgbei_ulp2_pagepod_hdr *hdr,
+ struct cxgbei_ulp2_gather_list *gl,
+ unsigned int pidx)
+{
+ int i;
+
+ memcpy(ppod, hdr, sizeof(*hdr));
+
+ for (i = 0; i < (PPOD_PAGES + 1); i++, pidx++) {
+ ppod->addr[i] = pidx < gl->nelem ?
+ cpu_to_be64(gl->dma_sg[pidx].phys_addr) : 0ULL;
+ }
+}
+
+static void inline
+ppod_clear(struct pagepod *ppod)
+{
+ memset(ppod, 0, sizeof(*ppod));
+}
+
+static inline void
+ulp_mem_io_set_hdr(struct adapter *sc, int tid, struct ulp_mem_io *req,
+ unsigned int wr_len, unsigned int dlen,
+ unsigned int pm_addr)
+{
+ struct ulptx_idata *idata = (struct ulptx_idata *)(req + 1);
+
+ INIT_ULPTX_WR(req, wr_len, 0, 0);
+ req->cmd = cpu_to_be32(V_ULPTX_CMD(ULP_TX_MEM_WRITE) |
+ V_ULP_MEMIO_ORDER(is_t4(sc)) |
+ V_T5_ULP_MEMIO_IMM(is_t5(sc)));
+ req->dlen = htonl(V_ULP_MEMIO_DATA_LEN(dlen >> 5));
+ req->len16 = htonl(DIV_ROUND_UP(wr_len - sizeof(req->wr), 16)
+ | V_FW_WR_FLOWID(tid));
+ req->lock_addr = htonl(V_ULP_MEMIO_ADDR(pm_addr >> 5));
+
+ idata->cmd_more = htonl(V_ULPTX_CMD(ULP_TX_SC_IMM));
+ idata->len = htonl(dlen);
+}
+
+#define PPOD_SIZE sizeof(struct pagepod)
+#define ULPMEM_IDATA_MAX_NPPODS 1 /* 256/PPOD_SIZE */
+#define PCIE_MEMWIN_MAX_NPPODS 16 /* 1024/PPOD_SIZE */
+
+static int
+ppod_write_idata(struct cxgbei_ulp2_ddp_info *ddp,
+ struct cxgbei_ulp2_pagepod_hdr *hdr,
+ unsigned int idx, unsigned int npods,
+ struct cxgbei_ulp2_gather_list *gl,
+ unsigned int gl_pidx, struct toepcb *toep)
+{
+ unsigned int dlen = PPOD_SIZE * npods;
+ unsigned int pm_addr = idx * PPOD_SIZE + ddp->llimit;
+ unsigned int wr_len = roundup(sizeof(struct ulp_mem_io) +
+ sizeof(struct ulptx_idata) + dlen, 16);
+ struct ulp_mem_io *req;
+ struct ulptx_idata *idata;
+ struct pagepod *ppod;
+ unsigned int i;
+ struct wrqe *wr;
+ struct adapter *sc = toep->port->adapter;
+
+ wr = alloc_wrqe(wr_len, toep->ctrlq);
+ if (wr == NULL) {
+ printf("%s: alloc wrqe failed\n", __func__);
+ return ENOMEM;
+ }
+
+ req = wrtod(wr);
+ memset(req, 0, wr_len);
+ ulp_mem_io_set_hdr(sc, toep->tid, req, wr_len, dlen, pm_addr);
+ idata = (struct ulptx_idata *)(req + 1);
+
+ ppod = (struct pagepod *)(idata + 1);
+ for (i = 0; i < npods; i++, ppod++, gl_pidx += PPOD_PAGES) {
+ if (!hdr) /* clear the pagepod */
+ ppod_clear(ppod);
+ else /* set the pagepod */
+ ppod_set(ppod, hdr, gl, gl_pidx);
+ }
+
+ t4_wrq_tx(sc, wr);
+ return 0;
+}
+
+static int
+t4_ddp_set_map(struct cxgbei_ulp2_ddp_info *ddp,
+ void *isockp, struct cxgbei_ulp2_pagepod_hdr *hdr,
+ unsigned int idx, unsigned int npods,
+ struct cxgbei_ulp2_gather_list *gl, int reply)
+{
+ iscsi_socket *isock = (iscsi_socket *)isockp;
+ struct socket *sk;
+ struct toepcb *toep;
+ struct tcpcb *tp;
+ int err;
+ unsigned int pidx = 0, w_npods = 0, cnt;
+
+ if (isock == NULL)
+ return EINVAL;
+ sk = isock->sock;
+ tp = so_sototcpcb(sk);
+ toep = tp->t_toe;
+
+ /*
+ * on T4, if we use a mix of IMMD and DSGL with ULP_MEM_WRITE,
+ * the order would not be garanteed, so we will stick with IMMD
+ */
+ gl->tid = toep->tid;
+ gl->port_id = toep->port->port_id;
+ gl->egress_dev = (void *)toep->port->ifp;
+
+ /* send via immediate data */
+ for (; w_npods < npods; idx += cnt, w_npods += cnt,
+ pidx += PPOD_PAGES) {
+ cnt = npods - w_npods;
+ if (cnt > ULPMEM_IDATA_MAX_NPPODS)
+ cnt = ULPMEM_IDATA_MAX_NPPODS;
+ err = ppod_write_idata(ddp, hdr, idx, cnt, gl,
+ pidx, toep);
+ if (err) {
+ printf("%s: ppod_write_idata failed\n", __func__);
+ break;
+ }
+ }
+ return err;
+}
+
+static void
+t4_ddp_clear_map(struct cxgbei_ulp2_ddp_info *ddp,
+ struct cxgbei_ulp2_gather_list *gl,
+ unsigned int tag, unsigned int idx, unsigned int npods,
+ iscsi_socket *isock)
+{
+ struct socket *sk;
+ struct toepcb *toep;
+ struct tcpcb *tp;
+ int err = -1;
+
+ sk = isock->sock;
+ tp = so_sototcpcb(sk);
+ toep = tp->t_toe;
+
+ /* send via immediate data */
+ unsigned int pidx = 0;
+ unsigned int w_npods = 0;
+ unsigned int cnt;
+
+ for (; w_npods < npods; idx += cnt, w_npods += cnt,
+ pidx += PPOD_PAGES) {
+ cnt = npods - w_npods;
+ if (cnt > ULPMEM_IDATA_MAX_NPPODS)
+ cnt = ULPMEM_IDATA_MAX_NPPODS;
+ err = ppod_write_idata(ddp, NULL, idx, cnt, gl, 0, toep);
+ if (err)
+ break;
+ }
+}
+#endif
+
+/*
+ * cxgbei device management
+ * maintains a list of the cxgbei devices
+ */
+typedef struct offload_device {
+ SLIST_ENTRY(offload_device) link;
+ unsigned char d_version;
+ unsigned char d_tx_hdrlen; /* CPL_TX_DATA, < 256 */
+ unsigned char d_ulp_rx_datagap; /* for coalesced iscsi msg */
+ unsigned char filler;
+
+ unsigned int d_flag;
+ unsigned int d_payload_tmax;
+ unsigned int d_payload_rmax;
+
+ struct cxgbei_ulp2_tag_format d_tag_format;
+ void *d_tdev;
+ void *d_pdev;
+ void* (*tdev2ddp)(void *tdev);
+}offload_device;
+
+SLIST_HEAD(, offload_device) odev_list;
+
+static void t4_unregister_cpl_handler_with_tom(struct adapter *sc);
+static offload_device *
+offload_device_new(void *tdev)
+{
+ offload_device *odev = NULL;
+ odev = malloc(sizeof(struct offload_device),
+ M_CXGBE, M_NOWAIT | M_ZERO);
+ if (odev) {
+ odev->d_tdev = tdev;
+ SLIST_INSERT_HEAD(&odev_list, odev, link);
+ }
+
+ return odev;
+}
+
+static offload_device *
+offload_device_find(struct toedev *tdev)
+{
+ offload_device *odev = NULL;
+
+ if (!SLIST_EMPTY(&odev_list)) {
+ SLIST_FOREACH(odev, &odev_list, link) {
+ if (odev->d_tdev == tdev)
+ break;
+ }
+ }
+ return odev;
+}
+
+static void
+cxgbei_odev_cleanup(offload_device *odev)
+{
+ struct toedev *tdev = odev->d_tdev;
+ struct adapter *sc = (struct adapter *)tdev->tod_softc;
+
+ /* de-register ULP CPL handlers with TOM */
+ t4_unregister_cpl_handler_with_tom(sc);
+ if (odev->d_flag & ODEV_FLAG_ULP_DDP_ENABLED) {
+ if (sc->iscsi_softc)
+ cxgbei_ulp2_ddp_cleanup(
+ (struct cxgbei_ulp2_ddp_info **)&sc->iscsi_softc);
+ }
+ return;
+}
+
+static void
+offload_device_remove()
+{
+ offload_device *odev = NULL, *next = NULL;
+
+ if (SLIST_EMPTY(&odev_list))
+ return;
+
+ for (odev = SLIST_FIRST(&odev_list); odev != NULL; odev = next) {
+ SLIST_REMOVE(&odev_list, odev, offload_device, link);
+ next = SLIST_NEXT(odev, link);
+ cxgbei_odev_cleanup(odev);
+ free(odev, M_CXGBE);
+ }
+
+ return;
+}
+
+static int
+cxgbei_map_sg(cxgbei_sgl *sgl, struct ccb_scsiio *csio)
+{
+ unsigned int data_len = csio->dxfer_len;
+ unsigned int sgoffset = (uint64_t)csio->data_ptr & PAGE_MASK;
+ unsigned int nsge;
+ unsigned char *sgaddr = csio->data_ptr;
+ unsigned int len = 0;
+
+ nsge = (csio->dxfer_len + sgoffset + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ sgl->sg_addr = sgaddr;
+ sgl->sg_offset = sgoffset;
+ if (data_len < (PAGE_SIZE - sgoffset))
+ len = data_len;
+ else
+ len = PAGE_SIZE - sgoffset;
+
+ sgl->sg_length = len;
+
+ data_len -= len;
+ sgaddr += len;
+ sgl = sgl+1;
+
+ while (data_len > 0) {
+ sgl->sg_addr = sgaddr;
+ len = (data_len < PAGE_SIZE)? data_len: PAGE_SIZE;
+ sgl->sg_length = len;
+ sgaddr += len;
+ data_len -= len;
+ sgl = sgl + 1;
+ }
+
+ return nsge;
+}
+
+static int
+cxgbei_map_sg_tgt(cxgbei_sgl *sgl, union ctl_io *io)
+{
+ unsigned int data_len, sgoffset, nsge;
+ unsigned char *sgaddr;
+ unsigned int len = 0, index = 0, ctl_sg_count, i;
+ struct ctl_sg_entry ctl_sg_entry, *ctl_sglist;
+
+ if (io->scsiio.kern_sg_entries > 0) {
+ ctl_sglist = (struct ctl_sg_entry *)io->scsiio.kern_data_ptr;
+ ctl_sg_count = io->scsiio.kern_sg_entries;
+ } else {
+ ctl_sglist = &ctl_sg_entry;
+ ctl_sglist->addr = io->scsiio.kern_data_ptr;
+ ctl_sglist->len = io->scsiio.kern_data_len;
+ ctl_sg_count = 1;
+ }
+
+ sgaddr = sgl->sg_addr = ctl_sglist[index].addr;
+ sgoffset = sgl->sg_offset = (uint64_t)sgl->sg_addr & PAGE_MASK;
+ data_len = ctl_sglist[index].len;
+
+ if (data_len < (PAGE_SIZE - sgoffset))
+ len = data_len;
+ else
+ len = PAGE_SIZE - sgoffset;
+
+ sgl->sg_length = len;
+
+ data_len -= len;
+ sgaddr += len;
+ sgl = sgl+1;
+
+ len = 0;
+ for (i = 0; i< ctl_sg_count; i++)
+ len += ctl_sglist[i].len;
+ nsge = (len + sgoffset + PAGE_SIZE -1) >> PAGE_SHIFT;
+ while (data_len > 0) {
+ sgl->sg_addr = sgaddr;
+ len = (data_len < PAGE_SIZE)? data_len: PAGE_SIZE;
+ sgl->sg_length = len;
+ sgaddr += len;
+ data_len -= len;
+ sgl = sgl + 1;
+ if (data_len == 0) {
+ if (index == ctl_sg_count - 1)
+ break;
+ index++;
+ sgaddr = ctl_sglist[index].addr;
+ data_len = ctl_sglist[index].len;
+ }
+ }
+
+ return nsge;
+}
+
+static int
+t4_sk_ddp_tag_reserve(iscsi_socket *isock, unsigned int xferlen,
+ cxgbei_sgl *sgl, unsigned int sgcnt,
+ unsigned int *ddp_tag)
+{
+ offload_device *odev = isock->s_odev;
+ struct toedev *tdev = odev->d_tdev;
+ struct cxgbei_ulp2_gather_list *gl;
+ int err = -EINVAL;
+ struct adapter *sc = tdev->tod_softc;
+ struct cxgbei_ulp2_ddp_info *ddp;
+
+ ddp = (struct cxgbei_ulp2_ddp_info *)sc->iscsi_softc;
+ if (ddp == NULL)
+ return ENOMEM;
+
+ gl = cxgbei_ulp2_ddp_make_gl_from_iscsi_sgvec(xferlen, sgl, sgcnt,
+ odev->d_tdev, 0);
+ if (gl) {
+ err = cxgbei_ulp2_ddp_tag_reserve(odev->tdev2ddp(tdev),
+ isock,
+ isock->s_tid,
+ &odev->d_tag_format,
+ ddp_tag, gl,
+ 0, 0);
+ if (err) {
+ CTR1(KTR_CXGBE,
+ "%s: ddp_tag_reserve failed\n", __func__);
+ cxgbei_ulp2_ddp_release_gl(gl, odev->d_tdev);
+ }
+ }
+
+ return err;
+}
+
+static unsigned int
+cxgbei_task_reserve_itt(struct icl_conn *ic, void **prv,
+ struct ccb_scsiio *scmd, unsigned int *itt)
+{
+ int xferlen = scmd->dxfer_len;
+ cxgbei_task_data *tdata = NULL;
+ cxgbei_sgl *sge = NULL;
+ struct socket *so = ic->ic_socket;
+ iscsi_socket *isock = (iscsi_socket *)(so)->so_emuldata;
+ int err = -1;
+ offload_device *odev = isock->s_odev;
+
+ tdata = (cxgbei_task_data *)*prv;
+ if ((xferlen == 0) || (tdata == NULL)) {
+ goto out;
+ }
+ if (xferlen < DDP_THRESHOLD)
+ goto out;
+
+ if ((scmd->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
+ tdata->nsge = cxgbei_map_sg(tdata->sgl, scmd);
+ if (tdata->nsge == 0) {
+ CTR1(KTR_CXGBE, "%s: map_sg failed\n", __func__);
+ return 0;
+ }
+ sge = tdata->sgl;
+
+ tdata->sc_ddp_tag = *itt;
+
+ CTR3(KTR_CXGBE, "%s: *itt:0x%x sc_ddp_tag:0x%x\n",
+ __func__, *itt, tdata->sc_ddp_tag);
+ if (cxgbei_ulp2_sw_tag_usable(&odev->d_tag_format,
+ tdata->sc_ddp_tag)) {
+ err = t4_sk_ddp_tag_reserve(isock, scmd->dxfer_len, sge,
+ tdata->nsge, &tdata->sc_ddp_tag);
+ } else {
+ CTR3(KTR_CXGBE,
+ "%s: itt:0x%x sc_ddp_tag:0x%x not usable\n",
+ __func__, *itt, tdata->sc_ddp_tag);
+ }
+ }
+out:
+ if (err < 0)
+ tdata->sc_ddp_tag =
+ cxgbei_ulp2_set_non_ddp_tag(&odev->d_tag_format, *itt);
+
+ return tdata->sc_ddp_tag;
+}
+
+static unsigned int
+cxgbei_task_reserve_ttt(struct icl_conn *ic, void **prv, union ctl_io *io,
+ unsigned int *ttt)
+{
+ struct socket *so = ic->ic_socket;
+ iscsi_socket *isock = (iscsi_socket *)(so)->so_emuldata;
+ cxgbei_task_data *tdata = NULL;
+ offload_device *odev = isock->s_odev;
+ int xferlen, err = -1;
+ cxgbei_sgl *sge = NULL;
+
+ xferlen = (io->scsiio.kern_data_len - io->scsiio.ext_data_filled);
+ tdata = (cxgbei_task_data *)*prv;
+ if ((xferlen == 0) || (tdata == NULL))
+ goto out;
+ if (xferlen < DDP_THRESHOLD)
+ goto out;
+ tdata->nsge = cxgbei_map_sg_tgt(tdata->sgl, io);
+ if (tdata->nsge == 0) {
+ CTR1(KTR_CXGBE, "%s: map_sg failed\n", __func__);
+ return 0;
+ }
+ sge = tdata->sgl;
+
+ tdata->sc_ddp_tag = *ttt;
+ if (cxgbei_ulp2_sw_tag_usable(&odev->d_tag_format, tdata->sc_ddp_tag)) {
+ err = t4_sk_ddp_tag_reserve(isock, xferlen, sge, tdata->nsge,
+ &tdata->sc_ddp_tag);
+ } else {
+ CTR2(KTR_CXGBE, "%s: sc_ddp_tag:0x%x not usable\n",
+ __func__, tdata->sc_ddp_tag);
+ }
+out:
+ if (err < 0)
+ tdata->sc_ddp_tag =
+ cxgbei_ulp2_set_non_ddp_tag(&odev->d_tag_format, *ttt);
+ return tdata->sc_ddp_tag;
+}
+
+static int
+t4_sk_ddp_tag_release(iscsi_socket *isock, unsigned int ddp_tag)
+{
+ offload_device *odev = isock->s_odev;
+ struct toedev *tdev = odev->d_tdev;
+
+ cxgbei_ulp2_ddp_tag_release(odev->tdev2ddp(tdev), ddp_tag, isock);
+ return 0;
+}
+#ifdef T4_DDP
+static struct cxgbei_ulp2_ddp_info *
+t4_ddp_init(struct ifnet *dev, struct toedev *tdev)
+{
+ struct cxgbei_ulp2_ddp_info *ddp;
+ struct adapter *sc = tdev->tod_softc;
+ struct ulp_iscsi_info uinfo;
+
+ memset(&uinfo, 0, sizeof(struct ulp_iscsi_info));
+ uinfo.llimit = sc->vres.iscsi.start;
+ uinfo.ulimit = sc->vres.iscsi.start + sc->vres.iscsi.size - 1;
+ uinfo.max_rxsz = uinfo.max_txsz =
+ G_MAXRXDATA(t4_read_reg(sc, A_TP_PARA_REG2));
+
+ if (sc->vres.iscsi.size == 0) {
+ printf("%s: iSCSI capabilities not enabled.\n", __func__);
+ return NULL;
+ }
+ printf("T4, ddp 0x%x ~ 0x%x, size %u, iolen %u, ulpddp:0x%p\n",
+ uinfo.llimit, uinfo.ulimit, sc->vres.iscsi.size,
+ uinfo.max_rxsz, sc->iscsi_softc);
+
+ cxgbei_ulp2_ddp_init((void *)tdev,
+ (struct cxgbei_ulp2_ddp_info **)&sc->iscsi_softc,
+ &uinfo);
+ ddp = (struct cxgbei_ulp2_ddp_info *)sc->iscsi_softc;
+ if (ddp) {
+ unsigned int pgsz_order[4];
+ int i;
+
+ for (i = 0; i < 4; i++)
+ pgsz_order[i] = uinfo.pgsz_factor[i];
+
+ t4_iscsi_init(dev, uinfo.tagmask, pgsz_order);
+
+ ddp->ddp_set_map = t4_ddp_set_map;
+ ddp->ddp_clear_map = t4_ddp_clear_map;
+ }
+ return ddp;
+}
+#endif
+
+static struct socket *
+cpl_find_sock(struct adapter *sc, unsigned int hwtid)
+{
+ struct socket *sk;
+ struct toepcb *toep = lookup_tid(sc, hwtid);
+ struct inpcb *inp = toep->inp;
+
+ INP_WLOCK(inp);
+ sk = inp->inp_socket;
+ INP_WUNLOCK(inp);
+ if (sk == NULL)
+ CTR2(KTR_CXGBE,
+ "%s: T4 CPL tid 0x%x, sk NULL.\n", __func__, hwtid);
+ return sk;
+}
+
+static void
+process_rx_iscsi_hdr(struct socket *sk, struct mbuf *m)
+{
+ struct tcpcb *tp = so_sototcpcb(sk);
+ struct toepcb *toep = tp->t_toe;
+
+ struct cpl_iscsi_hdr *cpl = mtod(m, struct cpl_iscsi_hdr *);
+ struct ulp_mbuf_cb *cb, *lcb;
+ struct mbuf *lmbuf;
+ unsigned char *byte;
+ iscsi_socket *isock = (iscsi_socket *)(sk)->so_emuldata;
+ unsigned int hlen, dlen, plen;
+
+ if (isock == NULL)
+ goto err_out;
+
+ if (toep == NULL)
+ goto err_out;
+ if ((m->m_flags & M_PKTHDR) == 0) {
+ printf("%s: m:%p no M_PKTHDR can't allocate m_tag\n",
+ __func__, m);
+ goto err_out;
+ }
+
+ mtx_lock(&isock->iscsi_rcv_mbufq.lock);
+
+ /* allocate m_tag to hold ulp info */
+ cb = get_ulp_mbuf_cb(m);
+ if (cb == NULL) {
+ printf("%s: Error allocation m_tag\n", __func__);
+ goto err_out1;
+ }
+ cb->seq = ntohl(cpl->seq);
+
+ /* strip off CPL header */
+ m_adj(m, sizeof(*cpl));
+
+ /* figure out if this is the pdu header or data */
+ cb->ulp_mode = ULP_MODE_ISCSI;
+ if (isock->mbuf_ulp_lhdr == NULL) {
+ iscsi_socket *isock = (iscsi_socket *)(sk)->so_emuldata;
+
+ isock->mbuf_ulp_lhdr = lmbuf = m;
+ lcb = cb;
+ cb->flags = SBUF_ULP_FLAG_HDR_RCVD |
+ SBUF_ULP_FLAG_COALESCE_OFF;
+ /* we only update tp->rcv_nxt once per pdu */
+ if (cb->seq != tp->rcv_nxt) {
+ CTR3(KTR_CXGBE,
+ "tid 0x%x, CPL_ISCSI_HDR, BAD seq got 0x%x exp 0x%x.\n",
+ toep->tid, cb->seq, tp->rcv_nxt);
+ goto err_out1;
+ }
+ byte = m->m_data;
+ hlen = ntohs(cpl->len);
+ dlen = ntohl(*(unsigned int *)(byte + 4)) & 0xFFFFFF;
+
+ plen = ntohs(cpl->pdu_len_ddp);
+ lcb->ulp.iscsi.pdulen = (hlen + dlen + 3) & (~0x3);
+ /* workaround for cpl->pdu_len_ddp since it does not include
+ the data digest count */
+ if (dlen)
+ lcb->ulp.iscsi.pdulen += isock->s_dcrc_len;
+
+ tp->rcv_nxt += lcb->ulp.iscsi.pdulen;
+ if (tp->rcv_wnd <= lcb->ulp.iscsi.pdulen)
+ CTR3(KTR_CXGBE, "%s: Neg rcv_wnd:0x%lx pdulen:0x%x\n",
+ __func__, tp->rcv_wnd, lcb->ulp.iscsi.pdulen);
+ tp->rcv_wnd -= lcb->ulp.iscsi.pdulen;
+ tp->t_rcvtime = ticks;
+ } else {
+ lmbuf = isock->mbuf_ulp_lhdr;
+ lcb = find_ulp_mbuf_cb(lmbuf);
+ if (lcb == NULL) {
+ printf("%s: lmbuf:%p lcb is NULL\n", __func__, lmbuf);
+ goto err_out1;
+ }
+ lcb->flags |= SBUF_ULP_FLAG_DATA_RCVD |
+ SBUF_ULP_FLAG_COALESCE_OFF;
+ cb->flags = SBUF_ULP_FLAG_DATA_RCVD;
+
+ /* padding */
+ if ((m->m_len % 4) != 0) {
+ m->m_len += 4 - (m->m_len % 4);
+ }
+ }
+ mbufq_tail(&isock->iscsi_rcv_mbufq, m);
+ mtx_unlock(&isock->iscsi_rcv_mbufq.lock);
+ return;
+
+err_out1:
+ mtx_unlock(&isock->iscsi_rcv_mbufq.lock);
+err_out:
+ m_freem(m);
+ return;
+}
+
+/* hand over received PDU to iscsi_initiator */
+static void
+iscsi_conn_receive_pdu(struct iscsi_socket *isock)
+{
+ struct icl_pdu *response = NULL;
+ struct icl_conn *ic = (struct icl_conn*)isock->s_conn;
+ struct mbuf *m;
+ struct ulp_mbuf_cb *cb = NULL;
+ int data_len;
+
+ response = icl_pdu_new_empty(isock->s_conn, M_NOWAIT);
+ if (response == NULL) {
+ panic("%s: failed to alloc icl_pdu\n", __func__);
+ return;
+ }
+ m = mbufq_peek(&isock->iscsi_rcv_mbufq);
+ if (m) {
+ cb = find_ulp_mbuf_cb(m);
+ if (cb == NULL) {
+ panic("%s: m:%p cb is NULL\n", __func__, m);
+ goto err_out;
+ }
+ if (!(cb->flags & SBUF_ULP_FLAG_STATUS_RCVD))
+ goto err_out;
+ }
+ /* BHS */
+ mbufq_dequeue(&isock->iscsi_rcv_mbufq);
+ data_len = cb->ulp.iscsi.pdulen;
+
+ CTR5(KTR_CXGBE, "%s: response:%p m:%p m_len:%d data_len:%d\n",
+ __func__, response, m, m->m_len, data_len);
+ response->ip_bhs_mbuf = m;
+ response->ip_bhs = mtod(response->ip_bhs_mbuf, struct iscsi_bhs *);
+
+ /* data */
+ if (cb->flags & SBUF_ULP_FLAG_DATA_RCVD) {
+ m = mbufq_peek(&isock->iscsi_rcv_mbufq);
+ if (m == NULL) {
+ CTR1(KTR_CXGBE, "%s:No Data\n", __func__);
+ goto err_out;
+ }
+ mbufq_dequeue(&isock->iscsi_rcv_mbufq);
+ response->ip_data_mbuf = m;
+ response->ip_data_len += response->ip_data_mbuf->m_len;
+ } else {
+ /* Data is DDP'ed */
+ response->ip_ofld_prv0 = 1;
+ }
+ (ic->ic_receive)(response);
+ return;
+
+err_out:
+ icl_pdu_free(response);
+ return;
+}
+
+static void
+process_rx_data_ddp(struct socket *sk, void *m)
+{
+ struct cpl_rx_data_ddp *cpl = (struct cpl_rx_data_ddp *)m;
+ struct tcpcb *tp = so_sototcpcb(sk);
+ struct toepcb *toep = tp->t_toe;
+ struct inpcb *inp = toep->inp;
+ struct mbuf *lmbuf;
+ struct ulp_mbuf_cb *lcb, *lcb1;
+ unsigned int val, pdulen;
+ iscsi_socket *isock = (iscsi_socket *)(sk)->so_emuldata;
+
+ if (isock == NULL)
+ return;
+
+ if (isock->mbuf_ulp_lhdr == NULL) {
+ panic("%s: tid 0x%x, rcv RX_DATA_DDP w/o pdu header.\n",
+ __func__, toep->tid);
+ return;
+ }
+ mtx_lock(&isock->iscsi_rcv_mbufq.lock);
+ lmbuf = isock->mbuf_ulp_lhdr;
+ if (lmbuf->m_nextpkt) {
+ lcb1 = find_ulp_mbuf_cb(lmbuf->m_nextpkt);
+ lcb1->flags |= SBUF_ULP_FLAG_STATUS_RCVD;
+ }
+ lcb = find_ulp_mbuf_cb(isock->mbuf_ulp_lhdr);
+ if (lcb == NULL) {
+ CTR2(KTR_CXGBE, "%s: mtag NULL lmbuf :%p\n", __func__, lmbuf);
+ mtx_unlock(&isock->iscsi_rcv_mbufq.lock);
+ return;
+ }
+ lcb->flags |= SBUF_ULP_FLAG_STATUS_RCVD;
+ isock->mbuf_ulp_lhdr = NULL;
+
+ if (ntohs(cpl->len) != lcb->ulp.iscsi.pdulen) {
+ CTR3(KTR_CXGBE, "tid 0x%x, RX_DATA_DDP pdulen %u != %u.\n",
+ toep->tid, ntohs(cpl->len), lcb->ulp.iscsi.pdulen);
+ CTR4(KTR_CXGBE, "%s: lmbuf:%p lcb:%p lcb->flags:0x%x\n",
+ __func__, lmbuf, lcb, lcb->flags);
+ }
+
+ lcb->ulp.iscsi.ddigest = ntohl(cpl->ulp_crc);
+ pdulen = lcb->ulp.iscsi.pdulen;
+
+ val = ntohl(cpl->ddpvld);
+ if (val & F_DDP_PADDING_ERR)
+ lcb->flags |= SBUF_ULP_FLAG_PAD_ERROR;
+ if (val & F_DDP_HDRCRC_ERR)
+ lcb->flags |= SBUF_ULP_FLAG_HCRC_ERROR;
+ if (val & F_DDP_DATACRC_ERR)
+ lcb->flags |= SBUF_ULP_FLAG_DCRC_ERROR;
+ if (!(lcb->flags & SBUF_ULP_FLAG_DATA_RCVD)) {
+ lcb->flags |= SBUF_ULP_FLAG_DATA_DDPED;
+ }
+#ifdef __T4_DBG_DDP_FAILURE__
+// else
+ {
+ unsigned char *bhs = lmbuf->m_data;
+ unsigned char opcode = bhs[0];
+ unsigned int dlen = ntohl(*(unsigned int *)(bhs + 4)) & 0xFFFFFF;
+ unsigned int ttt = ntohl(*(unsigned int *)(bhs + 20));
+ unsigned int offset = ntohl(*(unsigned int *)(bhs + 40));
+
+ if (dlen >= 2096) {
+ /* data_out and should be ddp'ed */
+ if ((opcode & 0x3F) == 0x05 && ttt != 0xFFFFFFFF) {
+ printf("CPL_RX_DATA_DDP: tid 0x%x, data-out %s ddp'ed\
+ (%u+%u), ttt 0x%x, seq 0x%x, ddpvld 0x%x.\n",
+ toep->tid,
+ (lcb->flags & SBUF_ULP_FLAG_DATA_DDPED) ? "IS" : "NOT",
+ offset, dlen, ttt, ntohl(cpl->seq), ntohl(cpl->ddpvld));
+ }
+ if ((opcode & 0x3F) == 0x25) {
+ //if (!(lcb->flags & SBUF_ULP_FLAG_DATA_DDPED))
+ printf("CPL_RX_DATA_DDP: tid 0x%x, data-in %s ddp'ed\
+ (%u+%u), seq 0x%x, ddpvld 0x%x.\n",
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 01:51:37 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 619A7CB7;
Wed, 11 Feb 2015 01:51:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 4D5FAB37;
Wed, 11 Feb 2015 01:51:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B1pbIN059568;
Wed, 11 Feb 2015 01:51:37 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B1pbcf059567;
Wed, 11 Feb 2015 01:51:37 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502110151.t1B1pbcf059567@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 01:51:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278546 - projects/release-install-debug/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 01:51:37 -0000
Author: gjb
Date: Wed Feb 11 01:51:36 2015
New Revision: 278546
URL: https://svnweb.freebsd.org/changeset/base/278546
Log:
Enable DEBUG_FILES by default in preparation of merging
this branch to head, pending successful universe build.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/share/mk/bsd.opts.mk
Modified: projects/release-install-debug/share/mk/bsd.opts.mk
==============================================================================
--- projects/release-install-debug/share/mk/bsd.opts.mk Wed Feb 11 00:58:15 2015 (r278545)
+++ projects/release-install-debug/share/mk/bsd.opts.mk Wed Feb 11 01:51:36 2015 (r278546)
@@ -50,6 +50,7 @@ __<bsd.opts.mk>__:
__DEFAULT_YES_OPTIONS = \
ASSERT_DEBUG \
+ DEBUG_FILES \
DOCCOMPRESS \
INCLUDES \
INSTALLLIB \
@@ -67,7 +68,6 @@ __DEFAULT_YES_OPTIONS = \
__DEFAULT_NO_OPTIONS = \
CTF \
- DEBUG_FILES \
INSTALL_AS_USER
.include <bsd.mkopt.mk>
@@ -80,7 +80,6 @@ __DEFAULT_NO_OPTIONS = \
#
.for var in \
CTF \
- DEBUG_FILES \
INSTALLLIB \
MAN \
PROFILE \
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 01:57:11 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id C5C29E06;
Wed, 11 Feb 2015 01:57:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 B18E1BAA;
Wed, 11 Feb 2015 01:57:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B1vBi7060245;
Wed, 11 Feb 2015 01:57:11 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B1vBCG060244;
Wed, 11 Feb 2015 01:57:11 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502110157.t1B1vBCG060244@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 01:57:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278547 -
projects/release-install-debug/tools/build/options
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 01:57:11 -0000
Author: gjb
Date: Wed Feb 11 01:57:10 2015
New Revision: 278547
URL: https://svnweb.freebsd.org/changeset/base/278547
Log:
Rename WITH_DEBUG_FILES -> WITHOUT_DEBUG_FILES, and update.
Sponsored by: The FreeBSD Foundation
Added:
projects/release-install-debug/tools/build/options/WITHOUT_DEBUG_FILES
- copied, changed from r278545, projects/release-install-debug/tools/build/options/WITH_DEBUG_FILES
Deleted:
projects/release-install-debug/tools/build/options/WITH_DEBUG_FILES
Copied and modified: projects/release-install-debug/tools/build/options/WITHOUT_DEBUG_FILES (from r278545, projects/release-install-debug/tools/build/options/WITH_DEBUG_FILES)
==============================================================================
--- projects/release-install-debug/tools/build/options/WITH_DEBUG_FILES Wed Feb 11 00:58:15 2015 (r278545, copy source)
+++ projects/release-install-debug/tools/build/options/WITHOUT_DEBUG_FILES Wed Feb 11 01:57:10 2015 (r278547)
@@ -1,7 +1,5 @@
.\" $FreeBSD$
-Set to strip debug info into a separate file for each executable binary
-and shared library.
-The debug files will be placed in a subdirectory of
+Set to disable stripping debug info into a separate file for each executable
+binary and shared library, preventing
.Pa /usr/lib/debug
-and are located automatically by
-.Xr gdb 1 .
+from being created.
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 02:00:50 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id EAAA7F5F;
Wed, 11 Feb 2015 02:00:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 D6865BC6;
Wed, 11 Feb 2015 02:00:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B20o6l061305;
Wed, 11 Feb 2015 02:00:50 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B20oE0061304;
Wed, 11 Feb 2015 02:00:50 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502110200.t1B20oE0061304@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 02:00:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278548 - projects/release-install-debug/share/man/man5
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 02:00:51 -0000
Author: gjb
Date: Wed Feb 11 02:00:49 2015
New Revision: 278548
URL: https://svnweb.freebsd.org/changeset/base/278548
Log:
Regen src.conf(5) after r278547
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/share/man/man5/src.conf.5
Modified: projects/release-install-debug/share/man/man5/src.conf.5
==============================================================================
--- projects/release-install-debug/share/man/man5/src.conf.5 Wed Feb 11 01:57:10 2015 (r278547)
+++ projects/release-install-debug/share/man/man5/src.conf.5 Wed Feb 11 02:00:49 2015 (r278548)
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
.\" $FreeBSD$
-.Dd February 4, 2015
+.Dd February 10, 2015
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -381,14 +381,12 @@ When set, it also enforces the following
.It
.Va WITHOUT_GROFF
.El
-.It Va WITH_DEBUG_FILES
-.\" from FreeBSD: head/tools/build/options/WITH_DEBUG_FILES 251512 2013-06-07 21:40:02Z emaste
-Set to strip debug info into a separate file for each executable binary
-and shared library.
-The debug files will be placed in a subdirectory of
+.It Va WITHOUT_DEBUG_FILES
+.\" from FreeBSD: projects/release-install-debug/tools/build/options/WITHOUT_DEBUG_FILES 278547 2015-02-11 01:57:10Z gjb
+Set to disable stripping debug info into a separate file for each executable
+binary and shared library, preventing
.Pa /usr/lib/debug
-and are located automatically by
-.Xr gdb 1 .
+from being created.
.It Va WITHOUT_DICT
.\" from FreeBSD: head/tools/build/options/WITHOUT_DICT 156932 2006-03-21 07:50:50Z ru
Set to not build the Webster dictionary files.
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 02:03:07 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 83DCB112;
Wed, 11 Feb 2015 02:03:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 6C208C68;
Wed, 11 Feb 2015 02:03:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B237ot064617;
Wed, 11 Feb 2015 02:03:07 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B22vMN064548;
Wed, 11 Feb 2015 02:02:57 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502110202.t1B22vMN064548@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 02:02:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278549 - in projects/release-install-debug: .
cddl/contrib/opensolaris/lib/libdtrace/arm
cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib cddl/lib/libdtrace
cddl/usr.sbin etc/rc.d games...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 02:03:07 -0000
Author: gjb
Date: Wed Feb 11 02:02:56 2015
New Revision: 278549
URL: https://svnweb.freebsd.org/changeset/base/278549
Log:
MFH: r278489-r278548
Sponsored by: The FreeBSD Foundation
Added:
projects/release-install-debug/cddl/contrib/opensolaris/lib/libdtrace/arm/
- copied from r278548, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/arm/
- copied from r278548, head/sys/cddl/contrib/opensolaris/uts/arm/
projects/release-install-debug/sys/cddl/dev/dtrace/arm/
- copied from r278548, head/sys/cddl/dev/dtrace/arm/
projects/release-install-debug/sys/cddl/dev/fbt/arm/
- copied from r278548, head/sys/cddl/dev/fbt/arm/
Deleted:
projects/release-install-debug/sys/powerpc/conf/WII
projects/release-install-debug/sys/powerpc/wii/
Modified:
projects/release-install-debug/UPDATING
projects/release-install-debug/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
projects/release-install-debug/cddl/lib/Makefile
projects/release-install-debug/cddl/lib/libdtrace/Makefile
projects/release-install-debug/cddl/usr.sbin/Makefile
projects/release-install-debug/etc/rc.d/netif
projects/release-install-debug/games/fortune/datfiles/freebsd-tips
projects/release-install-debug/lib/Makefile
projects/release-install-debug/lib/libc/nls/msgcat.c
projects/release-install-debug/lib/libproc/proc_bkpt.c
projects/release-install-debug/lib/libproc/proc_regs.c
projects/release-install-debug/release/scripts/mk-vmimage.sh
projects/release-install-debug/share/man/man5/nullfs.5
projects/release-install-debug/sys/arm/arm/cpufunc.c
projects/release-install-debug/sys/arm/arm/cpufunc_asm_armv7.S
projects/release-install-debug/sys/arm/arm/elf_trampoline.c
projects/release-install-debug/sys/arm/arm/exception.S
projects/release-install-debug/sys/arm/arm/identcpu.c
projects/release-install-debug/sys/arm/arm/trap.c
projects/release-install-debug/sys/arm/conf/BEAGLEBONE
projects/release-install-debug/sys/arm/include/armreg.h
projects/release-install-debug/sys/arm/include/cpufunc.h
projects/release-install-debug/sys/cam/ctl/ctl.c
projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
projects/release-install-debug/sys/cddl/dev/lockstat/lockstat.c
projects/release-install-debug/sys/cddl/dev/profile/profile.c
projects/release-install-debug/sys/conf/files.powerpc
projects/release-install-debug/sys/conf/kern.pre.mk
projects/release-install-debug/sys/conf/options.powerpc
projects/release-install-debug/sys/dev/malo/if_malo.c
projects/release-install-debug/sys/dev/mwl/if_mwl.c
projects/release-install-debug/sys/dev/sound/usb/uaudio.c
projects/release-install-debug/sys/fs/autofs/autofs.c
projects/release-install-debug/sys/fs/autofs/autofs_ioctl.h
projects/release-install-debug/sys/kern/kern_sig.c
projects/release-install-debug/sys/kern/vfs_mount.c
projects/release-install-debug/sys/modules/dtrace/Makefile
projects/release-install-debug/sys/modules/dtrace/dtrace/Makefile
projects/release-install-debug/sys/powerpc/aim/locore32.S
projects/release-install-debug/sys/powerpc/aim/machdep.c
projects/release-install-debug/sys/powerpc/aim/mmu_oea.c
projects/release-install-debug/sys/powerpc/conf/NOTES
projects/release-install-debug/sys/powerpc/ofw/ofw_syscons.c
projects/release-install-debug/usr.bin/w/w.c
projects/release-install-debug/usr.sbin/bsdconfig/console/INDEX
projects/release-install-debug/usr.sbin/bsdconfig/includes/INDEX
projects/release-install-debug/usr.sbin/bsdconfig/networking/share/device.subr
projects/release-install-debug/usr.sbin/bsdconfig/share/dialog.subr
projects/release-install-debug/usr.sbin/bsdconfig/share/keymap.subr
projects/release-install-debug/usr.sbin/bsdconfig/timezone/share/continents.subr
projects/release-install-debug/usr.sbin/bsdconfig/timezone/share/countries.subr
projects/release-install-debug/usr.sbin/bsdconfig/timezone/timezone
projects/release-install-debug/usr.sbin/bsdconfig/usermgmt/share/user.subr
projects/release-install-debug/usr.sbin/mountd/mountd.c
Directory Properties:
projects/release-install-debug/ (props changed)
projects/release-install-debug/cddl/ (props changed)
projects/release-install-debug/cddl/contrib/opensolaris/ (props changed)
projects/release-install-debug/etc/ (props changed)
projects/release-install-debug/lib/libc/ (props changed)
projects/release-install-debug/share/ (props changed)
projects/release-install-debug/sys/ (props changed)
projects/release-install-debug/sys/cddl/contrib/opensolaris/ (props changed)
projects/release-install-debug/sys/conf/ (props changed)
Modified: projects/release-install-debug/UPDATING
==============================================================================
--- projects/release-install-debug/UPDATING Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/UPDATING Wed Feb 11 02:02:56 2015 (r278549)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150210:
+ The autofs(4) ABI was changed in order to restore binary compatibility
+ with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work
+ with the new kernel.
+
20150131:
The powerpc64 kernel has been changed to a position-independent
executable. This can only be booted with a new version of loader(8),
Modified: projects/release-install-debug/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/release-install-debug/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
{
ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
- ctf_buf_write(b, &id, sizeof (id));
-
if (target_requires_swap) {
SWAP_16(id);
}
+ ctf_buf_write(b, &id, sizeof (id));
+
debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
}
Modified: projects/release-install-debug/cddl/lib/Makefile
==============================================================================
--- projects/release-install-debug/cddl/lib/Makefile Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/cddl/lib/Makefile Wed Feb 11 02:02:56 2015 (r278549)
@@ -27,7 +27,8 @@ _libzpool= libzpool
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+ ${MACHINE_CPUARCH} == "arm"
_drti= drti
_libdtrace= libdtrace
.endif
Modified: projects/release-install-debug/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/release-install-debug/cddl/lib/libdtrace/Makefile Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/cddl/lib/libdtrace/Makefile Wed Feb 11 02:02:56 2015 (r278549)
@@ -81,6 +81,10 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/ut
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
.elif ${MACHINE_CPUARCH} == "powerpc"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc
Modified: projects/release-install-debug/cddl/usr.sbin/Makefile
==============================================================================
--- projects/release-install-debug/cddl/usr.sbin/Makefile Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/cddl/usr.sbin/Makefile Wed Feb 11 02:02:56 2015 (r278549)
@@ -30,6 +30,12 @@ _plockstat= plockstat
.endif
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace= dtrace
+_dtruss= dtruss
+_lockstat= lockstat
+.endif
+
.if ${MACHINE_CPUARCH} == "mips"
_dtrace= dtrace
.endif
Modified: projects/release-install-debug/etc/rc.d/netif
==============================================================================
--- projects/release-install-debug/etc/rc.d/netif Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/etc/rc.d/netif Wed Feb 11 02:02:56 2015 (r278549)
@@ -252,5 +252,8 @@ netif_common()
debug "The following interfaces were not configured: $_fail"
}
+# Load the old "network" config file also for compatibility.
+# This is needed for mfsBSD at least.
+load_rc_config network
load_rc_config $name
run_rc_command $*
Modified: projects/release-install-debug/games/fortune/datfiles/freebsd-tips
==============================================================================
--- projects/release-install-debug/games/fortune/datfiles/freebsd-tips Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/games/fortune/datfiles/freebsd-tips Wed Feb 11 02:02:56 2015 (r278549)
@@ -443,7 +443,7 @@ on this system. Example entries are in
%
You can use "pkg info" to see a list of packages you have installed.
%
-You can use the 'fetch' command to retrieve files over ftp or http.
+You can use the 'fetch' command to retrieve files over ftp, http or https.
fetch http://www.FreeBSD.org/index.html
Modified: projects/release-install-debug/lib/Makefile
==============================================================================
--- projects/release-install-debug/lib/Makefile Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/lib/Makefile Wed Feb 11 02:02:56 2015 (r278549)
@@ -284,6 +284,12 @@ _libsmb= libsmb
_libsmb= libsmb
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_libsmb= libsmb
+_libproc= libproc
+_librtld_db= librtld_db
+.endif
+
.if ${MK_OPENSSL} != "no"
_libmp= libmp
.endif
Modified: projects/release-install-debug/lib/libc/nls/msgcat.c
==============================================================================
--- projects/release-install-debug/lib/libc/nls/msgcat.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/lib/libc/nls/msgcat.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
np->name = strdup(n); \
np->path = NULL; \
np->catd = NLERR; \
+ np->refcount = 0; \
np->lang = (l == NULL) ? NULL : \
strdup(l); \
np->caterrno = e; \
Modified: projects/release-install-debug/lib/libproc/proc_bkpt.c
==============================================================================
--- projects/release-install-debug/lib/libproc/proc_bkpt.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/lib/libproc/proc_bkpt.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$");
#elif defined(__powerpc__)
#define BREAKPOINT_INSTR 0x7fe00008 /* trap */
#define BREAKPOINT_INSTR_SZ 4
+#elif defined(__arm__)
+#define BREAKPOINT_INSTR 0xe7ffffff /* bkpt */
+#define BREAKPOINT_INSTR_SZ 4
#else
#error "Add support for your architecture"
#endif
Modified: projects/release-install-debug/lib/libproc/proc_regs.c
==============================================================================
--- projects/release-install-debug/lib/libproc/proc_regs.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/lib/libproc/proc_regs.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -56,6 +56,8 @@ proc_regget(struct proc_handle *phdl, pr
case REG_PC:
#if defined(__amd64__)
*regvalue = regs.r_rip;
+#elif defined(__arm__)
+ *regvalue = regs.r_pc;
#elif defined(__i386__)
*regvalue = regs.r_eip;
#elif defined(__mips__)
@@ -67,6 +69,8 @@ proc_regget(struct proc_handle *phdl, pr
case REG_SP:
#if defined(__amd64__)
*regvalue = regs.r_rsp;
+#elif defined(__arm__)
+ *regvalue = regs.r_sp;
#elif defined(__i386__)
*regvalue = regs.r_esp;
#elif defined(__mips__)
@@ -99,6 +103,8 @@ proc_regset(struct proc_handle *phdl, pr
case REG_PC:
#if defined(__amd64__)
regs.r_rip = regvalue;
+#elif defined(__arm__)
+ regs.r_pc = regvalue;
#elif defined(__i386__)
regs.r_eip = regvalue;
#elif defined(__mips__)
@@ -110,6 +116,8 @@ proc_regset(struct proc_handle *phdl, pr
case REG_SP:
#if defined(__amd64__)
regs.r_rsp = regvalue;
+#elif defined(__arm__)
+ regs.r_sp = regvalue;
#elif defined(__i386__)
regs.r_esp = regvalue;
#elif defined(__mips__)
Modified: projects/release-install-debug/release/scripts/mk-vmimage.sh
==============================================================================
--- projects/release-install-debug/release/scripts/mk-vmimage.sh Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/release/scripts/mk-vmimage.sh Wed Feb 11 02:02:56 2015 (r278549)
@@ -1,6 +1,6 @@
#!/bin/sh
#-
-# Copyright (c) 2014 The FreeBSD Foundation
+# Copyright (c) 2014, 2015 The FreeBSD Foundation
# All rights reserved.
#
# This software was developed by Glen Barber under sponsorship
@@ -40,6 +40,7 @@ usage() {
main() {
local arg
+ VMCONFIG="/dev/null"
while getopts "C:c:d:f:i:o:s:S:" arg; do
case "${arg}" in
C)
@@ -76,10 +77,9 @@ main() {
-z "${WORLDDIR}" -o \
-z "${DESTDIR}" -o \
-z "${VMSIZE}" -o \
- -z "${VMIMAGE}" -o \
- -z "${VMCONFIG}" ];
+ -z "${VMIMAGE}" ];
then
- usage
+ usage || exit 0
fi
if [ -z "${VMBUILDCONF}" ] || [ ! -e "${VMBUILDCONF}" ]; then
@@ -89,7 +89,7 @@ main() {
. "${VMBUILDCONF}"
- if [ ! -z "${VMCONFIG}" ] && [ -e "${VMCONFIG}" ]; then
+ if [ ! -z "${VMCONFIG}" ] && [ ! -c "${VMCONFIG}" ]; then
. "${VMCONFIG}"
fi
Modified: projects/release-install-debug/share/man/man5/nullfs.5
==============================================================================
--- projects/release-install-debug/share/man/man5/nullfs.5 Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/share/man/man5/nullfs.5 Wed Feb 11 02:02:56 2015 (r278549)
@@ -24,15 +24,14 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 5, 2008
+.Dd February 10, 2015
.Dt NULLFS 5
.Os
.Sh NAME
.Nm nullfs
.Nd "null file system"
.Sh SYNOPSIS
-To enable support for
-.Nm ,
+To enable support for this driver,
place the following line in the kernel configuration file:
.Bd -ragged -offset indent
.Cd "options NULLFS"
Modified: projects/release-install-debug/sys/arm/arm/cpufunc.c
==============================================================================
--- projects/release-install-debug/sys/arm/arm/cpufunc.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/arm/cpufunc.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -837,6 +837,11 @@ u_int cpu_reset_needs_v4_MMU_disable; /*
defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \
defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+/* Global cache line sizes, use 32 as default */
+int arm_dcache_min_line_size = 32;
+int arm_icache_min_line_size = 32;
+int arm_idcache_min_line_size = 32;
+
static void get_cachetype_cp15(void);
/* Additional cache information local to this file. Log2 of some of the
@@ -868,6 +873,12 @@ get_cachetype_cp15()
goto out;
if (CPU_CT_FORMAT(ctype) == CPU_CT_ARMV7) {
+ /* Resolve minimal cache line sizes */
+ arm_dcache_min_line_size = 1 << (CPU_CT_DMINLINE(ctype) + 2);
+ arm_icache_min_line_size = 1 << (CPU_CT_IMINLINE(ctype) + 2);
+ arm_idcache_min_line_size =
+ min(arm_icache_min_line_size, arm_dcache_min_line_size);
+
__asm __volatile("mrc p15, 1, %0, c0, c0, 1"
: "=r" (clevel));
arm_cache_level = clevel;
Modified: projects/release-install-debug/sys/arm/arm/cpufunc_asm_armv7.S
==============================================================================
--- projects/release-install-debug/sys/arm/arm/cpufunc_asm_armv7.S Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/arm/cpufunc_asm_armv7.S Wed Feb 11 02:02:56 2015 (r278549)
@@ -41,6 +41,12 @@ __FBSDID("$FreeBSD$");
.word _C_LABEL(arm_cache_loc)
.Lcache_type:
.word _C_LABEL(arm_cache_type)
+.Larmv7_dcache_line_size:
+ .word _C_LABEL(arm_dcache_min_line_size)
+.Larmv7_icache_line_size:
+ .word _C_LABEL(arm_icache_min_line_size)
+.Larmv7_idcache_line_size:
+ .word _C_LABEL(arm_idcache_min_line_size)
.Lway_mask:
.word 0x3ff
.Lmax_index:
@@ -180,14 +186,9 @@ ENTRY(armv7_idcache_wbinv_all)
RET
END(armv7_idcache_wbinv_all)
-/* XXX Temporary set it to 32 for MV cores, however this value should be
- * get from Cache Type register
- */
-.Larmv7_line_size:
- .word 32
-
ENTRY(armv7_dcache_wb_range)
- ldr ip, .Larmv7_line_size
+ ldr ip, .Larmv7_dcache_line_size
+ ldr ip, [ip]
sub r3, ip, #1
and r2, r0, r3
add r1, r1, r2
@@ -202,7 +203,8 @@ ENTRY(armv7_dcache_wb_range)
END(armv7_dcache_wb_range)
ENTRY(armv7_dcache_wbinv_range)
- ldr ip, .Larmv7_line_size
+ ldr ip, .Larmv7_dcache_line_size
+ ldr ip, [ip]
sub r3, ip, #1
and r2, r0, r3
add r1, r1, r2
@@ -221,7 +223,8 @@ END(armv7_dcache_wbinv_range)
* must use wb-inv of the entire cache.
*/
ENTRY(armv7_dcache_inv_range)
- ldr ip, .Larmv7_line_size
+ ldr ip, .Larmv7_dcache_line_size
+ ldr ip, [ip]
sub r3, ip, #1
and r2, r0, r3
add r1, r1, r2
@@ -236,7 +239,8 @@ ENTRY(armv7_dcache_inv_range)
END(armv7_dcache_inv_range)
ENTRY(armv7_idcache_wbinv_range)
- ldr ip, .Larmv7_line_size
+ ldr ip, .Larmv7_idcache_line_size
+ ldr ip, [ip]
sub r3, ip, #1
and r2, r0, r3
add r1, r1, r2
@@ -264,7 +268,8 @@ ENTRY_NP(armv7_icache_sync_all)
END(armv7_icache_sync_all)
ENTRY_NP(armv7_icache_sync_range)
- ldr ip, .Larmv7_line_size
+ ldr ip, .Larmv7_icache_line_size
+ ldr ip, [ip]
.Larmv7_sync_next:
mcr CP15_ICIMVAU(r0)
mcr CP15_DCCMVAC(r0)
Modified: projects/release-install-debug/sys/arm/arm/elf_trampoline.c
==============================================================================
--- projects/release-install-debug/sys/arm/arm/elf_trampoline.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/arm/elf_trampoline.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -115,6 +115,10 @@ int arm_pcache_unified;
int arm_dcache_align;
int arm_dcache_align_mask;
+int arm_dcache_min_line_size = 32;
+int arm_icache_min_line_size = 32;
+int arm_idcache_min_line_size = 32;
+
u_int arm_cache_level;
u_int arm_cache_type[14];
u_int arm_cache_loc;
@@ -277,6 +281,13 @@ get_cachetype_cp15()
goto out;
if (CPU_CT_FORMAT(ctype) == CPU_CT_ARMV7) {
+ /* Resolve minimal cache line sizes */
+ arm_dcache_min_line_size = 1 << (CPU_CT_DMINLINE(ctype) + 2);
+ arm_icache_min_line_size = 1 << (CPU_CT_IMINLINE(ctype) + 2);
+ arm_idcache_min_line_size =
+ (arm_dcache_min_line_size > arm_icache_min_line_size ?
+ arm_icache_min_line_size : arm_dcache_min_line_size);
+
__asm __volatile("mrc p15, 1, %0, c0, c0, 1"
: "=r" (clevel));
arm_cache_level = clevel;
Modified: projects/release-install-debug/sys/arm/arm/exception.S
==============================================================================
--- projects/release-install-debug/sys/arm/arm/exception.S Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/arm/exception.S Wed Feb 11 02:02:56 2015 (r278549)
@@ -48,11 +48,26 @@
#include "assym.s"
+#include "opt_kdtrace.h"
#include <machine/asm.h>
#include <machine/armreg.h>
#include <machine/asmacros.h>
__FBSDID("$FreeBSD$");
+#ifdef KDTRACE_HOOKS
+ .bss
+ .align 4
+ .global _C_LABEL(dtrace_invop_jump_addr)
+_C_LABEL(dtrace_invop_jump_addr):
+ .word 0
+ .word 0
+
+ .global _C_LABEL(dtrace_invop_calltrap_addr)
+_C_LABEL(dtrace_invop_calltrap_addr):
+ .word 0
+ .word 0
+#endif
+
.text
.align 2
Modified: projects/release-install-debug/sys/arm/arm/identcpu.c
==============================================================================
--- projects/release-install-debug/sys/arm/arm/identcpu.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/arm/identcpu.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -387,7 +387,7 @@ identify_arm_cpu(void)
u_int8_t type, linesize;
int i;
- cpuid = cpu_id();
+ cpuid = cpu_ident();
if (cpuid == 0) {
printf("Processor failed probe - no CPU ID\n");
Modified: projects/release-install-debug/sys/arm/arm/trap.c
==============================================================================
--- projects/release-install-debug/sys/arm/arm/trap.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/arm/trap.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -78,6 +78,9 @@
* Created : 28/11/94
*/
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
+#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@@ -427,6 +430,13 @@ dab_fatal(struct trapframe *tf, u_int fs
{
const char *mode;
+#ifdef KDTRACE_HOOKS
+ if (!TRAP_USERMODE(tf)) {
+ if (dtrace_trap_func != NULL && (*dtrace_trap_func)(tf, far & FAULT_TYPE_MASK))
+ return (0);
+ }
+#endif
+
mode = TRAP_USERMODE(tf) ? "user" : "kernel";
disable_interrupts(PSR_I|PSR_F);
Modified: projects/release-install-debug/sys/arm/conf/BEAGLEBONE
==============================================================================
--- projects/release-install-debug/sys/arm/conf/BEAGLEBONE Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/conf/BEAGLEBONE Wed Feb 11 02:02:56 2015 (r278549)
@@ -27,6 +27,12 @@ include "../ti/am335x/std.am335x"
makeoptions WITHOUT_MODULES="ahc"
+# DTrace support
+options KDTRACE_HOOKS # Kernel DTrace hooks
+options DDB_CTF # all architectures - kernel ELF linker loads CTF data
+makeoptions WITH_CTF=1
+makeoptions MODULES_OVERRIDE="opensolaris dtrace dtrace/lockstat dtrace/profile dtrace/fbt"
+
options HZ=100
options SCHED_4BSD # 4BSD scheduler
options PREEMPTION # Enable kernel thread preemption
Modified: projects/release-install-debug/sys/arm/include/armreg.h
==============================================================================
--- projects/release-install-debug/sys/arm/include/armreg.h Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/include/armreg.h Wed Feb 11 02:02:56 2015 (r278549)
@@ -320,6 +320,9 @@
#define CPU_CT_S (1U << 24) /* split cache */
#define CPU_CT_CTYPE(x) (((x) >> 25) & 0xf) /* cache type */
#define CPU_CT_FORMAT(x) ((x) >> 29)
+/* Cache type register definitions for ARM v7 */
+#define CPU_CT_IMINLINE(x) ((x) & 0xf) /* I$ min line size */
+#define CPU_CT_DMINLINE(x) (((x) >> 16) & 0xf) /* D$ min line size */
#define CPU_CT_CTYPE_WT 0 /* write-through */
#define CPU_CT_CTYPE_WB1 1 /* write-back, clean w/ read */
Modified: projects/release-install-debug/sys/arm/include/cpufunc.h
==============================================================================
--- projects/release-install-debug/sys/arm/include/cpufunc.h Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/arm/include/cpufunc.h Wed Feb 11 02:02:56 2015 (r278549)
@@ -175,7 +175,7 @@ struct cpu_functions {
extern struct cpu_functions cpufuncs;
extern u_int cputype;
-#define cpu_id() cpufuncs.cf_id()
+#define cpu_ident() cpufuncs.cf_id()
#define cpu_cpwait() cpufuncs.cf_cpwait()
#define cpu_control(c, e) cpufuncs.cf_control(c, e)
Modified: projects/release-install-debug/sys/cam/ctl/ctl.c
==============================================================================
--- projects/release-install-debug/sys/cam/ctl/ctl.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/cam/ctl/ctl.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -12286,64 +12286,57 @@ ctl_abort_task(union ctl_io *io)
printf("%s\n", sbuf_data(&sb));
#endif
- if ((xio->io_hdr.nexus.targ_port == io->io_hdr.nexus.targ_port)
- && (xio->io_hdr.nexus.initid.id ==
- io->io_hdr.nexus.initid.id)) {
- /*
- * If the abort says that the task is untagged, the
- * task in the queue must be untagged. Otherwise,
- * we just check to see whether the tag numbers
- * match. This is because the QLogic firmware
- * doesn't pass back the tag type in an abort
- * request.
- */
+ if ((xio->io_hdr.nexus.targ_port != io->io_hdr.nexus.targ_port)
+ || (xio->io_hdr.nexus.initid.id != io->io_hdr.nexus.initid.id)
+ || (xio->io_hdr.flags & CTL_FLAG_ABORT))
+ continue;
+
+ /*
+ * If the abort says that the task is untagged, the
+ * task in the queue must be untagged. Otherwise,
+ * we just check to see whether the tag numbers
+ * match. This is because the QLogic firmware
+ * doesn't pass back the tag type in an abort
+ * request.
+ */
#if 0
- if (((xio->scsiio.tag_type == CTL_TAG_UNTAGGED)
- && (io->taskio.tag_type == CTL_TAG_UNTAGGED))
- || (xio->scsiio.tag_num == io->taskio.tag_num)) {
+ if (((xio->scsiio.tag_type == CTL_TAG_UNTAGGED)
+ && (io->taskio.tag_type == CTL_TAG_UNTAGGED))
+ || (xio->scsiio.tag_num == io->taskio.tag_num)) {
#endif
- /*
- * XXX KDM we've got problems with FC, because it
- * doesn't send down a tag type with aborts. So we
- * can only really go by the tag number...
- * This may cause problems with parallel SCSI.
- * Need to figure that out!!
- */
- if (xio->scsiio.tag_num == io->taskio.tag_num) {
- xio->io_hdr.flags |= CTL_FLAG_ABORT;
- found = 1;
- if ((io->io_hdr.flags &
- CTL_FLAG_FROM_OTHER_SC) == 0 &&
- !(lun->flags & CTL_LUN_PRIMARY_SC)) {
- union ctl_ha_msg msg_info;
-
- io->io_hdr.flags |=
- CTL_FLAG_SENT_2OTHER_SC;
- msg_info.hdr.nexus = io->io_hdr.nexus;
- msg_info.task.task_action =
- CTL_TASK_ABORT_TASK;
- msg_info.task.tag_num =
- io->taskio.tag_num;
- msg_info.task.tag_type =
- io->taskio.tag_type;
- msg_info.hdr.msg_type =
- CTL_MSG_MANAGE_TASKS;
- msg_info.hdr.original_sc = NULL;
- msg_info.hdr.serializing_sc = NULL;
+ /*
+ * XXX KDM we've got problems with FC, because it
+ * doesn't send down a tag type with aborts. So we
+ * can only really go by the tag number...
+ * This may cause problems with parallel SCSI.
+ * Need to figure that out!!
+ */
+ if (xio->scsiio.tag_num == io->taskio.tag_num) {
+ xio->io_hdr.flags |= CTL_FLAG_ABORT;
+ found = 1;
+ if ((io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC) == 0 &&
+ !(lun->flags & CTL_LUN_PRIMARY_SC)) {
+ union ctl_ha_msg msg_info;
+
+ io->io_hdr.flags |= CTL_FLAG_SENT_2OTHER_SC;
+ msg_info.hdr.nexus = io->io_hdr.nexus;
+ msg_info.task.task_action = CTL_TASK_ABORT_TASK;
+ msg_info.task.tag_num = io->taskio.tag_num;
+ msg_info.task.tag_type = io->taskio.tag_type;
+ msg_info.hdr.msg_type = CTL_MSG_MANAGE_TASKS;
+ msg_info.hdr.original_sc = NULL;
+ msg_info.hdr.serializing_sc = NULL;
#if 0
- printf("Sent Abort to other side\n");
+ printf("Sent Abort to other side\n");
#endif
- if (CTL_HA_STATUS_SUCCESS !=
- ctl_ha_msg_send(CTL_HA_CHAN_CTL,
- (void *)&msg_info,
- sizeof(msg_info), 0)) {
- }
+ if (ctl_ha_msg_send(CTL_HA_CHAN_CTL,
+ (void *)&msg_info, sizeof(msg_info), 0) !=
+ CTL_HA_STATUS_SUCCESS) {
}
+ }
#if 0
- printf("ctl_abort_task: found I/O to abort\n");
+ printf("ctl_abort_task: found I/O to abort\n");
#endif
- break;
- }
}
}
mtx_unlock(&lun->lun_lock);
Modified: projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
==============================================================================
--- projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -11880,7 +11880,7 @@ err:
int i;
*factor = 1;
-#if defined(__amd64__) || defined(__mips__) || defined(__powerpc__)
+#if defined(__amd64__) || defined(__arm__) || defined(__mips__) || defined(__powerpc__)
/*
* FreeBSD isn't good at limiting the amount of memory we
* ask to malloc, so let's place a limit here before trying
Modified: projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
==============================================================================
--- projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h Wed Feb 11 02:02:56 2015 (r278549)
@@ -2434,6 +2434,13 @@ extern void dtrace_helpers_destroy(proc_
#define DTRACE_INVOP_MFLR_R0 5
#define DTRACE_INVOP_NOP 6
+#elif defined(__arm__)
+
+#define DTRACE_INVOP_PUSHM 1
+#define DTRACE_INVOP_POPM 2
+#define DTRACE_INVOP_B 3
+
+
#endif
#ifdef __cplusplus
Modified: projects/release-install-debug/sys/cddl/dev/lockstat/lockstat.c
==============================================================================
--- projects/release-install-debug/sys/cddl/dev/lockstat/lockstat.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/cddl/dev/lockstat/lockstat.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -44,7 +44,8 @@
#include <sys/lockstat.h>
#if defined(__i386__) || defined(__amd64__) || \
- defined(__mips__) || defined(__powerpc__)
+ defined(__mips__) || defined(__powerpc__) || \
+ defined(__arm__)
#define LOCKSTAT_AFRAMES 1
#else
#error "architecture not supported"
Modified: projects/release-install-debug/sys/cddl/dev/profile/profile.c
==============================================================================
--- projects/release-install-debug/sys/cddl/dev/profile/profile.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/cddl/dev/profile/profile.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -128,6 +128,16 @@
struct profile_probe_percpu;
+#ifdef __mips
+/* bogus */
+#define PROF_ARTIFICIAL_FRAMES 3
+#endif
+
+#ifdef __arm__
+/* bogus */
+#define PROF_ARTIFICIAL_FRAMES 3
+#endif
+
typedef struct profile_probe {
char prof_name[PROF_NAMELEN];
dtrace_id_t prof_id;
Modified: projects/release-install-debug/sys/conf/files.powerpc
==============================================================================
--- projects/release-install-debug/sys/conf/files.powerpc Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/conf/files.powerpc Wed Feb 11 02:02:56 2015 (r278549)
@@ -242,9 +242,3 @@ powerpc/psim/iobus.c optional psim
powerpc/psim/ata_iobus.c optional ata psim
powerpc/psim/openpic_iobus.c optional psim
powerpc/psim/uart_iobus.c optional uart psim
-powerpc/wii/platform_wii.c optional wii
-powerpc/wii/wii_bus.c optional wii
-powerpc/wii/wii_pic.c optional wii
-powerpc/wii/wii_fb.c optional wii
-powerpc/wii/wii_gpio.c optional wii wiigpio
-powerpc/wii/wii_ipc.c optional wii
Modified: projects/release-install-debug/sys/conf/kern.pre.mk
==============================================================================
--- projects/release-install-debug/sys/conf/kern.pre.mk Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/conf/kern.pre.mk Wed Feb 11 02:02:56 2015 (r278549)
@@ -186,7 +186,7 @@ SYSTEM_DEP+= ${LDSCRIPT}
MKMODULESENV+= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
MKMODULESENV+= MACHINE_CPUARCH=${MACHINE_CPUARCH}
MKMODULESENV+= MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH}
-MKMODULESENV+= MODULES_EXTRA=${MODULES_EXTRA} WITHOUT_MODULES=${WITHOUT_MODULES}
+MKMODULESENV+= MODULES_EXTRA="${MODULES_EXTRA}" WITHOUT_MODULES="${WITHOUT_MODULES}"
.if (${KERN_IDENT} == LINT)
MKMODULESENV+= ALL_MODULES=LINT
.endif
Modified: projects/release-install-debug/sys/conf/options.powerpc
==============================================================================
--- projects/release-install-debug/sys/conf/options.powerpc Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/conf/options.powerpc Wed Feb 11 02:02:56 2015 (r278549)
@@ -24,7 +24,6 @@ PS3 opt_platform.h
MAMBO
PSERIES
PSIM
-WII opt_platform.h
SC_OFWFB opt_ofwfb.h
Modified: projects/release-install-debug/sys/dev/malo/if_malo.c
==============================================================================
--- projects/release-install-debug/sys/dev/malo/if_malo.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/dev/malo/if_malo.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -165,7 +165,7 @@ static void
malo_bar0_write4(struct malo_softc *sc, bus_size_t off, uint32_t val)
{
DPRINTF(sc, MALO_DEBUG_FW, "%s: off 0x%jx val 0x%x\n",
- __func__, (intmax_t)off, val);
+ __func__, (uintmax_t)off, val);
bus_space_write_4(sc->malo_io0t, sc->malo_io0h, off, val);
}
@@ -510,9 +510,10 @@ malo_desc_setup(struct malo_softc *sc, c
ds = dd->dd_desc;
memset(ds, 0, dd->dd_desc_len);
- DPRINTF(sc, MALO_DEBUG_RESET, "%s: %s DMA map: %p (%lu) -> %p (%lu)\n",
+ DPRINTF(sc, MALO_DEBUG_RESET,
+ "%s: %s DMA map: %p (%lu) -> 0x%jx (%lu)\n",
__func__, dd->dd_name, ds, (u_long) dd->dd_desc_len,
- (caddr_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len);
+ (uintmax_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len);
return 0;
fail2:
@@ -877,10 +878,9 @@ malo_printrxbuf(const struct malo_rxbuf
const struct malo_rxdesc *ds = bf->bf_desc;
uint32_t status = le32toh(ds->status);
- printf("R[%2u] (DS.V:%p DS.P:%p) NEXT:%08x DATA:%08x RC:%02x%s\n"
+ printf("R[%2u] (DS.V:%p DS.P:0x%jx) NEXT:%08x DATA:%08x RC:%02x%s\n"
" STAT:%02x LEN:%04x SNR:%02x NF:%02x CHAN:%02x"
- " RATE:%02x QOS:%04x\n",
- ix, ds, (const struct malo_desc *)bf->bf_daddr,
+ " RATE:%02x QOS:%04x\n", ix, ds, (uintmax_t)bf->bf_daddr,
le32toh(ds->physnext), le32toh(ds->physbuffdata),
ds->rxcontrol,
ds->rxcontrol != MALO_RXD_CTRL_DRIVER_OWN ?
@@ -896,8 +896,7 @@ malo_printtxbuf(const struct malo_txbuf
uint32_t status = le32toh(ds->status);
printf("Q%u[%3u]", qnum, ix);
- printf(" (DS.V:%p DS.P:%p)\n",
- ds, (const struct malo_txdesc *)bf->bf_daddr);
+ printf(" (DS.V:%p DS.P:0x%jx)\n", ds, (uintmax_t)bf->bf_daddr);
printf(" NEXT:%08x DATA:%08x LEN:%04x STAT:%08x%s\n",
le32toh(ds->physnext),
le32toh(ds->pktptr), le16toh(ds->pktlen), status,
Modified: projects/release-install-debug/sys/dev/mwl/if_mwl.c
==============================================================================
--- projects/release-install-debug/sys/dev/mwl/if_mwl.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/dev/mwl/if_mwl.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -2056,9 +2056,10 @@ mwl_desc_setup(struct mwl_softc *sc, con
ds = dd->dd_desc;
memset(ds, 0, dd->dd_desc_len);
- DPRINTF(sc, MWL_DEBUG_RESET, "%s: %s DMA map: %p (%lu) -> %p (%lu)\n",
+ DPRINTF(sc, MWL_DEBUG_RESET,
+ "%s: %s DMA map: %p (%lu) -> 0x%jx (%lu)\n",
__func__, dd->dd_name, ds, (u_long) dd->dd_desc_len,
- (caddr_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len);
+ (uintmax_t) dd->dd_desc_paddr, /*XXX*/ (u_long) dd->dd_desc_len);
return 0;
fail2:
@@ -4688,11 +4689,10 @@ mwl_printrxbuf(const struct mwl_rxbuf *b
const struct mwl_rxdesc *ds = bf->bf_desc;
uint32_t status = le32toh(ds->Status);
- printf("R[%2u] (DS.V:%p DS.P:%p) NEXT:%08x DATA:%08x RC:%02x%s\n"
+ printf("R[%2u] (DS.V:%p DS.P:0x%jx) NEXT:%08x DATA:%08x RC:%02x%s\n"
" STAT:%02x LEN:%04x RSSI:%02x CHAN:%02x RATE:%02x QOS:%04x HT:%04x\n",
- ix, ds, (const struct mwl_desc *)bf->bf_daddr,
- le32toh(ds->pPhysNext), le32toh(ds->pPhysBuffData),
- ds->RxControl,
+ ix, ds, (uintmax_t)bf->bf_daddr, le32toh(ds->pPhysNext),
+ le32toh(ds->pPhysBuffData), ds->RxControl,
ds->RxControl != EAGLE_RXD_CTRL_DRIVER_OWN ?
"" : (status & EAGLE_RXD_STATUS_OK) ? " *" : " !",
ds->Status, le16toh(ds->PktLen), ds->RSSI, ds->Channel,
@@ -4706,8 +4706,7 @@ mwl_printtxbuf(const struct mwl_txbuf *b
uint32_t status = le32toh(ds->Status);
printf("Q%u[%3u]", qnum, ix);
- printf(" (DS.V:%p DS.P:%p)\n",
- ds, (const struct mwl_txdesc *)bf->bf_daddr);
+ printf(" (DS.V:%p DS.P:0x%jx)\n", ds, (uintmax_t)bf->bf_daddr);
printf(" NEXT:%08x DATA:%08x LEN:%04x STAT:%08x%s\n",
le32toh(ds->pPhysNext),
le32toh(ds->PktPtr), le16toh(ds->PktLen), status,
Modified: projects/release-install-debug/sys/dev/sound/usb/uaudio.c
==============================================================================
--- projects/release-install-debug/sys/dev/sound/usb/uaudio.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/dev/sound/usb/uaudio.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -111,6 +111,7 @@ SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, def
&uaudio_default_channels, 0, "uaudio default sample channels");
#endif
+#define UAUDIO_IRQS (8000 / UAUDIO_NFRAMES) /* interrupts per second */
#define UAUDIO_NFRAMES 64 /* must be factor of 8 due HS-USB */
#define UAUDIO_NCHANBUFS 2 /* number of outstanding request */
#define UAUDIO_RECURSE_LIMIT 255 /* rounds */
@@ -189,7 +190,6 @@ struct uaudio_chan_alt {
uint8_t iface_index;
uint8_t iface_alt_index;
uint8_t channels;
- uint8_t enable_sync;
};
struct uaudio_chan {
@@ -226,11 +226,12 @@ struct uaudio_chan {
#define CHAN_OP_STOP 2
#define CHAN_OP_DRAIN 3
- uint8_t last_sync_time;
- uint8_t last_sync_state;
-#define UAUDIO_SYNC_NONE 0
-#define UAUDIO_SYNC_MORE 1
-#define UAUDIO_SYNC_LESS 2
+ /* USB audio feedback endpoint state */
+ struct {
+ uint16_t time; /* I/O interrupt count */
+ int16_t constant; /* sample rate adjustment in Hz */
+ int16_t remainder; /* current remainder */
+ } feedback;
};
#define UMIDI_EMB_JACK_MAX 16 /* units */
@@ -1799,14 +1800,6 @@ uaudio_chan_fill_info_sub(struct uaudio_
chan_alt->iface_index = curidx;
chan_alt->iface_alt_index = alt_index;
- if (UEP_HAS_SYNCADDR(ed1) && ed1->bSynchAddress != 0) {
- DPRINTF("Sync endpoint will be used, if present\n");
- chan_alt->enable_sync = 1;
- } else {
- DPRINTF("Sync endpoint will not be used\n");
- chan_alt->enable_sync = 0;
- }
-
usbd_set_parent_iface(sc->sc_udev, curidx,
sc->sc_mixer_iface_index);
@@ -2016,29 +2009,44 @@ uaudio_chan_play_sync_callback(struct us
if (temp == 0)
break;
- /* correctly scale value */
-
- temp = (temp * 125ULL) - 64;
+ temp *= 125ULL;
/* auto adjust */
-
while (temp < (sample_rate - (sample_rate / 4)))
temp *= 2;
-
+
while (temp > (sample_rate + (sample_rate / 2)))
temp /= 2;
- /* compare */
+ /*
+ * Some USB audio devices only report a sample rate
+ * different from the nominal one when they want one
+ * more or less sample. Make sure we catch this case
+ * by pulling the sample rate offset slowly towards
+ * zero if the reported value is equal to the sample
+ * rate.
+ */
+ if (temp > sample_rate)
+ ch->feedback.constant += 1;
+ else if (temp < sample_rate)
+ ch->feedback.constant -= 1;
+ else if (ch->feedback.constant > 0)
+ ch->feedback.constant--;
+ else if (ch->feedback.constant < 0)
+ ch->feedback.constant++;
- DPRINTF("Comparing %d < %d\n",
- (int)temp, (int)sample_rate);
+ DPRINTF("Comparing %d Hz :: %d Hz :: %d samples drift\n",
+ (int)temp, (int)sample_rate, (int)ch->feedback.constant);
- if (temp == sample_rate)
- ch->last_sync_state = UAUDIO_SYNC_NONE;
- else if (temp > sample_rate)
- ch->last_sync_state = UAUDIO_SYNC_MORE;
- else
- ch->last_sync_state = UAUDIO_SYNC_LESS;
+ /*
+ * Range check sync constant. We cannot change the
+ * number of samples per second by more than the value
+ * defined by "UAUDIO_IRQS":
+ */
+ if (ch->feedback.constant > UAUDIO_IRQS)
+ ch->feedback.constant = UAUDIO_IRQS;
+ else if (ch->feedback.constant < -UAUDIO_IRQS)
+ ch->feedback.constant = -UAUDIO_IRQS;
break;
case USB_ST_SETUP:
@@ -2082,10 +2090,10 @@ tr_transferred:
}
chn_intr(ch->pcm_ch);
- /* start SYNC transfer, if any */
- if (ch->usb_alt[ch->cur_alt].enable_sync != 0) {
- if ((ch->last_sync_time++ & 7) == 0)
- usbd_transfer_start(ch->xfer[UAUDIO_NCHANBUFS]);
+ /* start the SYNC transfer one time per second, if any */
+ if (++(ch->feedback.time) >= UAUDIO_IRQS) {
+ ch->feedback.time = 0;
+ usbd_transfer_start(ch->xfer[UAUDIO_NCHANBUFS]);
}
case USB_ST_SETUP:
@@ -2120,21 +2128,22 @@ tr_transferred:
}
if (n == (blockcount - 1)) {
- switch (ch->last_sync_state) {
- case UAUDIO_SYNC_MORE:
+ /*
+ * Update sync remainder and check if
+ * we should transmit more or less
+ * data:
+ */
+ ch->feedback.remainder += ch->feedback.constant;
+ if (ch->feedback.remainder >= UAUDIO_IRQS) {
+ ch->feedback.remainder -= UAUDIO_IRQS;
DPRINTFN(6, "sending one sample more\n");
if ((frame_len + sample_size) <= mfl)
frame_len += sample_size;
- ch->last_sync_state = UAUDIO_SYNC_NONE;
- break;
- case UAUDIO_SYNC_LESS:
+ } else if (ch->feedback.remainder <= -UAUDIO_IRQS) {
+ ch->feedback.remainder += UAUDIO_IRQS;
DPRINTFN(6, "sending one sample less\n");
if (frame_len >= sample_size)
frame_len -= sample_size;
- ch->last_sync_state = UAUDIO_SYNC_NONE;
- break;
- default:
- break;
}
}
@@ -2452,6 +2461,9 @@ uaudio_chan_start(struct uaudio_chan *ch
}
usb_proc_explore_unlock(sc->sc_udev);
+ /* reset feedback endpoint state */
+ memset(&ch->feedback, 0, sizeof(ch->feedback));
+
if (do_start) {
usbd_transfer_start(ch->xfer[0]);
usbd_transfer_start(ch->xfer[1]);
Modified: projects/release-install-debug/sys/fs/autofs/autofs.c
==============================================================================
--- projects/release-install-debug/sys/fs/autofs/autofs.c Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/fs/autofs/autofs.c Wed Feb 11 02:02:56 2015 (r278549)
@@ -584,6 +584,34 @@ autofs_ioctl_request(struct autofs_daemo
}
static int
+autofs_ioctl_done_101(struct autofs_daemon_done_101 *add)
+{
+ struct autofs_request *ar;
+
+ sx_xlock(&autofs_softc->sc_lock);
+ TAILQ_FOREACH(ar, &autofs_softc->sc_requests, ar_next) {
+ if (ar->ar_id == add->add_id)
+ break;
+ }
+
+ if (ar == NULL) {
+ sx_xunlock(&autofs_softc->sc_lock);
+ AUTOFS_DEBUG("id %d not found", add->add_id);
+ return (ESRCH);
+ }
+
+ ar->ar_error = add->add_error;
+ ar->ar_wildcards = true;
+ ar->ar_done = true;
+ ar->ar_in_progress = false;
+ cv_broadcast(&autofs_softc->sc_cv);
+
+ sx_xunlock(&autofs_softc->sc_lock);
+
+ return (0);
+}
+
+static int
autofs_ioctl_done(struct autofs_daemon_done *add)
{
struct autofs_request *ar;
@@ -658,6 +686,9 @@ autofs_ioctl(struct cdev *dev, u_long cm
case AUTOFSREQUEST:
return (autofs_ioctl_request(
(struct autofs_daemon_request *)arg));
+ case AUTOFSDONE101:
+ return (autofs_ioctl_done_101(
+ (struct autofs_daemon_done_101 *)arg));
case AUTOFSDONE:
return (autofs_ioctl_done(
(struct autofs_daemon_done *)arg));
Modified: projects/release-install-debug/sys/fs/autofs/autofs_ioctl.h
==============================================================================
--- projects/release-install-debug/sys/fs/autofs/autofs_ioctl.h Wed Feb 11 02:00:49 2015 (r278548)
+++ projects/release-install-debug/sys/fs/autofs/autofs_ioctl.h Wed Feb 11 02:02:56 2015 (r278549)
@@ -71,6 +71,21 @@ struct autofs_daemon_request {
char adr_options[MAXPATHLEN];
};
+/*
+ * Compatibility with 10.1-RELEASE automountd(8).
+ */
+struct autofs_daemon_done_101 {
+ /*
+ * Identifier, copied from adr_id.
+ */
+ int add_id;
+
+ /*
+ * Error number, possibly returned to userland.
+ */
+ int add_error;
+};
+
struct autofs_daemon_done {
/*
* Identifier, copied from adr_id.
@@ -87,9 +102,15 @@ struct autofs_daemon_done {
* Error number, possibly returned to userland.
*/
int add_error;
+
+ /*
+ * Reserved for future use.
+ */
+ int add_spare[7];
};
#define AUTOFSREQUEST _IOR('I', 0x01, struct autofs_daemon_request)
-#define AUTOFSDONE _IOW('I', 0x02, struct autofs_daemon_done)
+#define AUTOFSDONE101 _IOW('I', 0x02, struct autofs_daemon_done_101)
+#define AUTOFSDONE _IOW('I', 0x03, struct autofs_daemon_done)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 06:45:00 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 8ABB93BD;
Wed, 11 Feb 2015 06:45:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 76564F62;
Wed, 11 Feb 2015 06:45:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B6j0dg097135;
Wed, 11 Feb 2015 06:45:00 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B6j0SX097134;
Wed, 11 Feb 2015 06:45:00 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201502110645.t1B6j0SX097134@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to
jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 11 Feb 2015 06:45:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278552 - projects/pmac_pmu/sys/powerpc/powermac
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 06:45:00 -0000
Author: jhibbits
Date: Wed Feb 11 06:44:59 2015
New Revision: 278552
URL: https://svnweb.freebsd.org/changeset/base/278552
Log:
KeyLargo doesn't have FCR5, so don't save or restore it.
Modified:
projects/pmac_pmu/sys/powerpc/powermac/macio.c
Modified: projects/pmac_pmu/sys/powerpc/powermac/macio.c
==============================================================================
--- projects/pmac_pmu/sys/powerpc/powermac/macio.c Wed Feb 11 05:25:23 2015 (r278551)
+++ projects/pmac_pmu/sys/powerpc/powermac/macio.c Wed Feb 11 06:44:59 2015 (r278552)
@@ -911,7 +911,10 @@ macio_suspend(device_t dev)
sc->sc_saved_fcrs[2] = bus_read_4(sc->sc_memr, KEYLARGO_FCR2);
sc->sc_saved_fcrs[3] = bus_read_4(sc->sc_memr, KEYLARGO_FCR3);
sc->sc_saved_fcrs[4] = bus_read_4(sc->sc_memr, KEYLARGO_FCR4);
- sc->sc_saved_fcrs[5] = bus_read_4(sc->sc_memr, KEYLARGO_FCR5);
+
+ /* KeyLargo doesn't have FCR5. */
+ if (sc->sc_devid != 0x22)
+ sc->sc_saved_fcrs[5] = bus_read_4(sc->sc_memr, KEYLARGO_FCR5);
if (sc->sc_devid == 0x4f) {
sc->sc_saved_fcrs[6] = bus_read_4(sc->sc_memr, K2_FCR6);
@@ -947,7 +950,10 @@ macio_resume(device_t dev)
bus_write_4(sc->sc_memr, KEYLARGO_FCR2, sc->sc_saved_fcrs[2]);
bus_write_4(sc->sc_memr, KEYLARGO_FCR3, sc->sc_saved_fcrs[3]);
bus_write_4(sc->sc_memr, KEYLARGO_FCR4, sc->sc_saved_fcrs[4]);
- bus_write_4(sc->sc_memr, KEYLARGO_FCR5, sc->sc_saved_fcrs[5]);
+
+ /* KeyLargo doesn't have FCR5. */
+ if (sc->sc_devid != 0x22)
+ bus_write_4(sc->sc_memr, KEYLARGO_FCR5, sc->sc_saved_fcrs[5]);
if (sc->sc_devid == 0x4f) {
bus_write_4(sc->sc_memr, K2_FCR6, sc->sc_saved_fcrs[6]);
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 06:52:01 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id E61C1510;
Wed, 11 Feb 2015 06:52:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 B7F5B90;
Wed, 11 Feb 2015 06:52:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B6q1pY001607;
Wed, 11 Feb 2015 06:52:01 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B6q1Jg001604;
Wed, 11 Feb 2015 06:52:01 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201502110652.t1B6q1Jg001604@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to
jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 11 Feb 2015 06:52:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278553 - projects/pmac_pmu/sys/powerpc/powermac
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 06:52:02 -0000
Author: jhibbits
Date: Wed Feb 11 06:52:00 2015
New Revision: 278553
URL: https://svnweb.freebsd.org/changeset/base/278553
Log:
Use symbolic constants instead of magic numbers for the device IDs.
Modified:
projects/pmac_pmu/sys/powerpc/powermac/macio.c
projects/pmac_pmu/sys/powerpc/powermac/maciovar.h
Modified: projects/pmac_pmu/sys/powerpc/powermac/macio.c
==============================================================================
--- projects/pmac_pmu/sys/powerpc/powermac/macio.c Wed Feb 11 06:44:59 2015 (r278552)
+++ projects/pmac_pmu/sys/powerpc/powermac/macio.c Wed Feb 11 06:52:00 2015 (r278553)
@@ -913,7 +913,7 @@ macio_suspend(device_t dev)
sc->sc_saved_fcrs[4] = bus_read_4(sc->sc_memr, KEYLARGO_FCR4);
/* KeyLargo doesn't have FCR5. */
- if (sc->sc_devid != 0x22)
+ if (sc->sc_devid != KEYLARGO_DEVID)
sc->sc_saved_fcrs[5] = bus_read_4(sc->sc_memr, KEYLARGO_FCR5);
if (sc->sc_devid == 0x4f) {
@@ -924,13 +924,14 @@ macio_suspend(device_t dev)
sc->sc_saved_fcrs[10] = bus_read_4(sc->sc_memr, K2_FCR10);
}
- if (sc->sc_devid == 0x22) {
+ if (sc->sc_devid == KEYLARGO_DEVID) {
return macio_suspend_keylargo(dev);
- } else if (sc->sc_devid == 0x25) {
+ } else if (sc->sc_devid == PANGEA_DEVID) {
return macio_suspend_pangea(dev);
- } else if (sc->sc_devid == 0x3e) {
+ } else if (sc->sc_devid == INTREPID_DEVID) {
return macio_suspend_intrepid(dev);
- } else if (sc->sc_devid == 0x4f) {
+ } else if (sc->sc_devid == SHASTA_DEVID ||
+ sc->sc_devid == K2_DEVID) {
return macio_suspend_k2(dev);
}
@@ -942,7 +943,7 @@ macio_resume(device_t dev)
{
struct macio_softc *sc = device_get_softc(dev);
- if (sc->sc_devid == 0x22)
+ if (sc->sc_devid == KEYLARGO_DEVID)
bus_write_4(sc->sc_memr, KEYLARGO_MEDIABAY, sc->sc_saved_mbcr);
bus_write_4(sc->sc_memr, KEYLARGO_FCR0, sc->sc_saved_fcrs[0]);
Modified: projects/pmac_pmu/sys/powerpc/powermac/maciovar.h
==============================================================================
--- projects/pmac_pmu/sys/powerpc/powermac/maciovar.h Wed Feb 11 06:44:59 2015 (r278552)
+++ projects/pmac_pmu/sys/powerpc/powermac/maciovar.h Wed Feb 11 06:52:00 2015 (r278553)
@@ -30,6 +30,11 @@
#ifndef _MACIO_MACIOVAR_H_
#define _MACIO_MACIOVAR_H_
+#define KEYLARGO_DEVID 0x22
+#define PANGEA_DEVID 0x25
+#define INTREPID_DEVID 0x3e
+#define K2_DEVID 0x41
+#define SHASTA_DEVID 0x4f
/*
* The addr space size
* XXX it would be better if this could be determined by querying the
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 08:27:11 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 573A827E;
Wed, 11 Feb 2015 08:27:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 3E038BB1;
Wed, 11 Feb 2015 08:27:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B8RB9k045606;
Wed, 11 Feb 2015 08:27:11 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B8R8jC045593;
Wed, 11 Feb 2015 08:27:08 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502110827.t1B8R8jC045593@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 11 Feb 2015 08:27:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278566 - in projects/building-blocks: .
cddl/contrib/opensolaris/lib/libdtrace/arm
cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib cddl/lib/libdtrace
cddl/usr.sbin contrib/mdocml contr...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 08:27:11 -0000
Author: ngie
Date: Wed Feb 11 08:27:07 2015
New Revision: 278566
URL: https://svnweb.freebsd.org/changeset/base/278566
Log:
MFhead @ r278563
Added:
projects/building-blocks/cddl/contrib/opensolaris/lib/libdtrace/arm/
- copied from r278563, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/lzma12.h
- copied unchanged from r278563, head/contrib/xz/src/liblzma/api/lzma/lzma12.h
projects/building-blocks/contrib/xz/src/liblzma/common/block_buffer_encoder.h
- copied unchanged from r278563, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/hardware_cputhreads.c
- copied unchanged from r278563, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c
projects/building-blocks/contrib/xz/src/liblzma/common/memcmplen.h
- copied unchanged from r278563, head/contrib/xz/src/liblzma/common/memcmplen.h
projects/building-blocks/contrib/xz/src/liblzma/common/outqueue.c
- copied unchanged from r278563, head/contrib/xz/src/liblzma/common/outqueue.c
projects/building-blocks/contrib/xz/src/liblzma/common/outqueue.h
- copied unchanged from r278563, head/contrib/xz/src/liblzma/common/outqueue.h
projects/building-blocks/contrib/xz/src/liblzma/common/stream_encoder_mt.c
- copied unchanged from r278563, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c
projects/building-blocks/contrib/xz/src/liblzma/liblzma.map
- copied unchanged from r278563, head/contrib/xz/src/liblzma/liblzma.map
projects/building-blocks/contrib/xz/src/liblzma/validate_map.sh
- copied unchanged from r278563, head/contrib/xz/src/liblzma/validate_map.sh
projects/building-blocks/contrib/xz/src/xz/mytime.c
- copied unchanged from r278563, head/contrib/xz/src/xz/mytime.c
projects/building-blocks/contrib/xz/src/xz/mytime.h
- copied unchanged from r278563, head/contrib/xz/src/xz/mytime.h
projects/building-blocks/lib/libdevctl/
- copied from r278563, head/lib/libdevctl/
projects/building-blocks/sys/arm/broadcom/bcm2835/bcm2835_audio.c
- copied unchanged from r278563, head/sys/arm/broadcom/bcm2835/bcm2835_audio.c
projects/building-blocks/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
- copied unchanged from r278563, head/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
projects/building-blocks/sys/cddl/contrib/opensolaris/uts/arm/
- copied from r278563, head/sys/cddl/contrib/opensolaris/uts/arm/
projects/building-blocks/sys/cddl/dev/dtrace/arm/
- copied from r278563, head/sys/cddl/dev/dtrace/arm/
projects/building-blocks/sys/cddl/dev/fbt/arm/
- copied from r278563, head/sys/cddl/dev/fbt/arm/
projects/building-blocks/sys/dev/wpi/if_wpi_debug.h
- copied unchanged from r278563, head/sys/dev/wpi/if_wpi_debug.h
projects/building-blocks/sys/modules/dtb/rpi/
- copied from r278563, head/sys/modules/dtb/rpi/
projects/building-blocks/usr.sbin/devctl/
- copied from r278563, head/usr.sbin/devctl/
projects/building-blocks/usr.sbin/pw/tests/pw_usernext.sh
- copied unchanged from r278563, head/usr.sbin/pw/tests/pw_usernext.sh
Deleted:
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/lzma.h
projects/building-blocks/contrib/xz/src/liblzma/common/stream_encoder.h
projects/building-blocks/sys/powerpc/conf/WII
projects/building-blocks/sys/powerpc/wii/
Modified:
projects/building-blocks/Makefile.inc1
projects/building-blocks/ObsoleteFiles.inc
projects/building-blocks/UPDATING
projects/building-blocks/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
projects/building-blocks/cddl/lib/Makefile
projects/building-blocks/cddl/lib/libdtrace/Makefile
projects/building-blocks/cddl/usr.sbin/Makefile
projects/building-blocks/contrib/mdocml/lib.in
projects/building-blocks/contrib/top/utils.c
projects/building-blocks/contrib/xz/ChangeLog
projects/building-blocks/contrib/xz/FREEBSD-upgrade
projects/building-blocks/contrib/xz/THANKS
projects/building-blocks/contrib/xz/TODO
projects/building-blocks/contrib/xz/src/common/mythread.h
projects/building-blocks/contrib/xz/src/common/sysdefs.h
projects/building-blocks/contrib/xz/src/common/tuklib_cpucores.c
projects/building-blocks/contrib/xz/src/common/tuklib_physmem.c
projects/building-blocks/contrib/xz/src/liblzma/api/lzma.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/base.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/block.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/container.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/filter.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/hardware.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/index.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/index_hash.h
projects/building-blocks/contrib/xz/src/liblzma/api/lzma/version.h
projects/building-blocks/contrib/xz/src/liblzma/check/check.h
projects/building-blocks/contrib/xz/src/liblzma/check/sha256.c
projects/building-blocks/contrib/xz/src/liblzma/common/alone_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/alone_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/alone_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/auto_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/block_buffer_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/block_buffer_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/block_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/block_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/block_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/block_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/block_header_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/block_header_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/block_util.c
projects/building-blocks/contrib/xz/src/liblzma/common/common.c
projects/building-blocks/contrib/xz/src/liblzma/common/common.h
projects/building-blocks/contrib/xz/src/liblzma/common/easy_buffer_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/easy_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/filter_buffer_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/filter_buffer_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/filter_common.c
projects/building-blocks/contrib/xz/src/liblzma/common/filter_common.h
projects/building-blocks/contrib/xz/src/liblzma/common/filter_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/filter_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/filter_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/filter_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/filter_flags_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/index.c
projects/building-blocks/contrib/xz/src/liblzma/common/index_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/index_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/index_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/index_hash.c
projects/building-blocks/contrib/xz/src/liblzma/common/stream_buffer_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/stream_buffer_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/stream_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/common/stream_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/common/stream_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/delta/delta_common.c
projects/building-blocks/contrib/xz/src/liblzma/delta/delta_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/delta/delta_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/delta/delta_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/delta/delta_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/delta/delta_private.h
projects/building-blocks/contrib/xz/src/liblzma/liblzma.pc.in
projects/building-blocks/contrib/xz/src/liblzma/lz/lz_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/lz/lz_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/lz/lz_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/lz/lz_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/lz/lz_encoder_mf.c
projects/building-blocks/contrib/xz/src/liblzma/lzma/fastpos.h
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma2_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma2_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_common.h
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_encoder.c
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_encoder.h
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
projects/building-blocks/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
projects/building-blocks/contrib/xz/src/liblzma/rangecoder/range_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/simple/arm.c
projects/building-blocks/contrib/xz/src/liblzma/simple/armthumb.c
projects/building-blocks/contrib/xz/src/liblzma/simple/ia64.c
projects/building-blocks/contrib/xz/src/liblzma/simple/powerpc.c
projects/building-blocks/contrib/xz/src/liblzma/simple/simple_coder.c
projects/building-blocks/contrib/xz/src/liblzma/simple/simple_coder.h
projects/building-blocks/contrib/xz/src/liblzma/simple/simple_decoder.c
projects/building-blocks/contrib/xz/src/liblzma/simple/simple_decoder.h
projects/building-blocks/contrib/xz/src/liblzma/simple/simple_private.h
projects/building-blocks/contrib/xz/src/liblzma/simple/sparc.c
projects/building-blocks/contrib/xz/src/liblzma/simple/x86.c
projects/building-blocks/contrib/xz/src/xz/args.c
projects/building-blocks/contrib/xz/src/xz/args.h
projects/building-blocks/contrib/xz/src/xz/coder.c
projects/building-blocks/contrib/xz/src/xz/coder.h
projects/building-blocks/contrib/xz/src/xz/file_io.c
projects/building-blocks/contrib/xz/src/xz/file_io.h
projects/building-blocks/contrib/xz/src/xz/hardware.c
projects/building-blocks/contrib/xz/src/xz/hardware.h
projects/building-blocks/contrib/xz/src/xz/list.c
projects/building-blocks/contrib/xz/src/xz/main.c
projects/building-blocks/contrib/xz/src/xz/message.c
projects/building-blocks/contrib/xz/src/xz/options.c
projects/building-blocks/contrib/xz/src/xz/private.h
projects/building-blocks/contrib/xz/src/xz/signals.c
projects/building-blocks/contrib/xz/src/xz/suffix.c
projects/building-blocks/contrib/xz/src/xz/xz.1
projects/building-blocks/etc/devd.conf
projects/building-blocks/etc/rc.d/jail
projects/building-blocks/etc/rc.d/netif
projects/building-blocks/games/fortune/datfiles/freebsd-tips
projects/building-blocks/lib/Makefile
projects/building-blocks/lib/libc/gen/disklabel.c
projects/building-blocks/lib/libc/gen/getgrent.c
projects/building-blocks/lib/libc/gen/getpwent.c
projects/building-blocks/lib/libc/nls/msgcat.c
projects/building-blocks/lib/libc/stdlib/tdelete.c
projects/building-blocks/lib/libc/sys/setresuid.2
projects/building-blocks/lib/liblzma/Makefile
projects/building-blocks/lib/liblzma/Symbol.map
projects/building-blocks/lib/liblzma/Versions.def
projects/building-blocks/lib/liblzma/config.h
projects/building-blocks/lib/libproc/proc_bkpt.c
projects/building-blocks/lib/libproc/proc_regs.c
projects/building-blocks/lib/libthr/thread/thr_barrier.c
projects/building-blocks/lib/msun/src/s_scalbln.c
projects/building-blocks/release/Makefile
projects/building-blocks/release/Makefile.vm
projects/building-blocks/release/scripts/mk-vmimage.sh
projects/building-blocks/rescue/rescue/Makefile
projects/building-blocks/share/man/man4/ral.4
projects/building-blocks/share/man/man4/witness.4
projects/building-blocks/share/man/man5/nullfs.5
projects/building-blocks/share/mk/bsd.libnames.mk
projects/building-blocks/share/mk/bsd.mkopt.mk
projects/building-blocks/share/mk/bsd.own.mk
projects/building-blocks/share/mk/src.libnames.mk
projects/building-blocks/sys/amd64/amd64/apic_vector.S
projects/building-blocks/sys/amd64/amd64/genassym.c
projects/building-blocks/sys/amd64/amd64/mp_machdep.c
projects/building-blocks/sys/amd64/include/cpufunc.h
projects/building-blocks/sys/amd64/vmm/vmm_support.S
projects/building-blocks/sys/arm/arm/cpufunc.c
projects/building-blocks/sys/arm/arm/cpufunc_asm_armv7.S
projects/building-blocks/sys/arm/arm/elf_trampoline.c
projects/building-blocks/sys/arm/arm/exception.S
projects/building-blocks/sys/arm/arm/identcpu.c
projects/building-blocks/sys/arm/arm/trap.c
projects/building-blocks/sys/arm/broadcom/bcm2835/files.bcm2835
projects/building-blocks/sys/arm/conf/BEAGLEBONE
projects/building-blocks/sys/arm/conf/RPI-B
projects/building-blocks/sys/arm/include/armreg.h
projects/building-blocks/sys/arm/include/cpufunc.h
projects/building-blocks/sys/boot/forth/beastie.4th
projects/building-blocks/sys/boot/forth/brand.4th
projects/building-blocks/sys/cam/ctl/ctl.c
projects/building-blocks/sys/cam/ctl/ctl_frontend_iscsi.c
projects/building-blocks/sys/cam/ctl/ctl_frontend_iscsi.h
projects/building-blocks/sys/cam/ctl/ctl_ioctl.h
projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/building-blocks/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
projects/building-blocks/sys/cddl/dev/lockstat/lockstat.c
projects/building-blocks/sys/cddl/dev/profile/profile.c
projects/building-blocks/sys/conf/dtb.mk
projects/building-blocks/sys/conf/files
projects/building-blocks/sys/conf/files.powerpc
projects/building-blocks/sys/conf/kern.opts.mk
projects/building-blocks/sys/conf/kern.pre.mk
projects/building-blocks/sys/conf/options
projects/building-blocks/sys/conf/options.powerpc
projects/building-blocks/sys/contrib/dev/acpica/include/actbl2.h
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
projects/building-blocks/sys/contrib/dev/ral/microcode.h
projects/building-blocks/sys/contrib/dev/ral/rt2860.fw.uu
projects/building-blocks/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
projects/building-blocks/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
projects/building-blocks/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h
projects/building-blocks/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c
projects/building-blocks/sys/dev/acpica/acpi.c
projects/building-blocks/sys/dev/cxgb/cxgb_osdep.h
projects/building-blocks/sys/dev/cxgbe/adapter.h
projects/building-blocks/sys/dev/cxgbe/common/t4_hw.c
projects/building-blocks/sys/dev/cxgbe/iw_cxgbe/device.c
projects/building-blocks/sys/dev/cxgbe/offload.h
projects/building-blocks/sys/dev/cxgbe/t4_main.c
projects/building-blocks/sys/dev/cxgbe/tom/t4_listen.c
projects/building-blocks/sys/dev/cxgbe/tom/t4_tom.c
projects/building-blocks/sys/dev/drm2/radeon/ni.c
projects/building-blocks/sys/dev/drm2/radeon/si.c
projects/building-blocks/sys/dev/ipmi/ipmi.c
projects/building-blocks/sys/dev/ipmi/ipmi_kcs.c
projects/building-blocks/sys/dev/ipmi/ipmi_smic.c
projects/building-blocks/sys/dev/ipmi/ipmi_ssif.c
projects/building-blocks/sys/dev/ipmi/ipmivars.h
projects/building-blocks/sys/dev/iscsi/icl.c
projects/building-blocks/sys/dev/iscsi/icl_conn_if.m
projects/building-blocks/sys/dev/iscsi/icl_soft.c
projects/building-blocks/sys/dev/iscsi/icl_wrappers.h
projects/building-blocks/sys/dev/iscsi/iscsi.c
projects/building-blocks/sys/dev/iscsi/iscsi.h
projects/building-blocks/sys/dev/malo/if_malo.c
projects/building-blocks/sys/dev/mwl/if_mwl.c
projects/building-blocks/sys/dev/pci/pci.c
projects/building-blocks/sys/dev/ral/if_ral_pci.c
projects/building-blocks/sys/dev/ral/rt2860.c
projects/building-blocks/sys/dev/ral/rt2860reg.h
projects/building-blocks/sys/dev/sound/usb/uaudio.c
projects/building-blocks/sys/dev/usb/controller/xhci.c
projects/building-blocks/sys/dev/usb/serial/u3g.c
projects/building-blocks/sys/dev/usb/usbdevs
projects/building-blocks/sys/dev/wpi/if_wpi.c
projects/building-blocks/sys/dev/wpi/if_wpireg.h
projects/building-blocks/sys/dev/wpi/if_wpivar.h
projects/building-blocks/sys/fs/autofs/autofs.c
projects/building-blocks/sys/fs/autofs/autofs_ioctl.h
projects/building-blocks/sys/i386/i386/apic_vector.s
projects/building-blocks/sys/i386/i386/genassym.c
projects/building-blocks/sys/i386/i386/mp_machdep.c
projects/building-blocks/sys/i386/include/cpufunc.h
projects/building-blocks/sys/kern/kern_sig.c
projects/building-blocks/sys/kern/kern_timeout.c
projects/building-blocks/sys/kern/subr_bus.c
projects/building-blocks/sys/kern/subr_hints.c
projects/building-blocks/sys/kern/uipc_shm.c
projects/building-blocks/sys/kern/vfs_mount.c
projects/building-blocks/sys/modules/Makefile
projects/building-blocks/sys/modules/dtrace/Makefile
projects/building-blocks/sys/modules/dtrace/dtrace/Makefile
projects/building-blocks/sys/modules/wpi/Makefile
projects/building-blocks/sys/netinet/if_ether.c
projects/building-blocks/sys/netinet/in.c
projects/building-blocks/sys/netinet6/in6.c
projects/building-blocks/sys/netinet6/nd6.c
projects/building-blocks/sys/powerpc/aim/locore32.S
projects/building-blocks/sys/powerpc/aim/machdep.c
projects/building-blocks/sys/powerpc/aim/mmu_oea.c
projects/building-blocks/sys/powerpc/conf/NOTES
projects/building-blocks/sys/powerpc/include/cpu.h
projects/building-blocks/sys/powerpc/ofw/ofw_syscons.c
projects/building-blocks/sys/powerpc/powerpc/swtch64.S
projects/building-blocks/sys/powerpc/pseries/mmu_phyp.c
projects/building-blocks/sys/powerpc/pseries/platform_chrp.c
projects/building-blocks/sys/powerpc/pseries/xics.c
projects/building-blocks/sys/sys/bitset.h
projects/building-blocks/sys/sys/bus.h
projects/building-blocks/sys/sys/callout.h
projects/building-blocks/sys/sys/copyright.h
projects/building-blocks/sys/sys/cpuset.h
projects/building-blocks/sys/sys/param.h
projects/building-blocks/sys/x86/acpica/madt.c
projects/building-blocks/sys/x86/include/apicreg.h
projects/building-blocks/sys/x86/include/apicvar.h
projects/building-blocks/sys/x86/include/specialreg.h
projects/building-blocks/sys/x86/x86/io_apic.c
projects/building-blocks/sys/x86/x86/local_apic.c
projects/building-blocks/sys/x86/xen/xen_apic.c
projects/building-blocks/tools/tools/makeroot/makeroot.8
projects/building-blocks/tools/tools/makeroot/makeroot.sh
projects/building-blocks/usr.bin/ctlstat/ctlstat.c
projects/building-blocks/usr.bin/ktrdump/ktrdump.8
projects/building-blocks/usr.bin/ktrdump/ktrdump.c
projects/building-blocks/usr.bin/w/w.c
projects/building-blocks/usr.bin/xz/Makefile
projects/building-blocks/usr.sbin/Makefile
projects/building-blocks/usr.sbin/bluetooth/hccontrol/hccontrol.8
projects/building-blocks/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
projects/building-blocks/usr.sbin/bsdconfig/console/INDEX
projects/building-blocks/usr.sbin/bsdconfig/includes/INDEX
projects/building-blocks/usr.sbin/bsdconfig/networking/share/device.subr
projects/building-blocks/usr.sbin/bsdconfig/share/dialog.subr
projects/building-blocks/usr.sbin/bsdconfig/share/keymap.subr
projects/building-blocks/usr.sbin/bsdconfig/timezone/share/continents.subr
projects/building-blocks/usr.sbin/bsdconfig/timezone/share/countries.subr
projects/building-blocks/usr.sbin/bsdconfig/timezone/timezone
projects/building-blocks/usr.sbin/bsdconfig/usermgmt/share/user.subr
projects/building-blocks/usr.sbin/ctladm/ctladm.c
projects/building-blocks/usr.sbin/ctld/ctl.conf.5
projects/building-blocks/usr.sbin/ctld/ctld.c
projects/building-blocks/usr.sbin/ctld/ctld.h
projects/building-blocks/usr.sbin/ctld/discovery.c
projects/building-blocks/usr.sbin/ctld/kernel.c
projects/building-blocks/usr.sbin/ctld/login.c
projects/building-blocks/usr.sbin/ctld/parse.y
projects/building-blocks/usr.sbin/ctld/token.l
projects/building-blocks/usr.sbin/freebsd-update/freebsd-update.sh
projects/building-blocks/usr.sbin/jail/command.c
projects/building-blocks/usr.sbin/jail/config.c
projects/building-blocks/usr.sbin/jail/jail.8
projects/building-blocks/usr.sbin/jail/jail.c
projects/building-blocks/usr.sbin/jail/jailp.h
projects/building-blocks/usr.sbin/mountd/mountd.c
projects/building-blocks/usr.sbin/pw/tests/Makefile
Directory Properties:
projects/building-blocks/ (props changed)
projects/building-blocks/cddl/ (props changed)
projects/building-blocks/cddl/contrib/opensolaris/ (props changed)
projects/building-blocks/contrib/mdocml/ (props changed)
projects/building-blocks/contrib/top/ (props changed)
projects/building-blocks/contrib/xz/ (props changed)
projects/building-blocks/etc/ (props changed)
projects/building-blocks/lib/libc/ (props changed)
projects/building-blocks/share/ (props changed)
projects/building-blocks/share/man/man4/ (props changed)
projects/building-blocks/sys/ (props changed)
projects/building-blocks/sys/amd64/vmm/ (props changed)
projects/building-blocks/sys/boot/ (props changed)
projects/building-blocks/sys/cddl/contrib/opensolaris/ (props changed)
projects/building-blocks/sys/conf/ (props changed)
projects/building-blocks/sys/contrib/dev/acpica/ (props changed)
projects/building-blocks/sys/contrib/dev/acpica/include/ (props changed)
projects/building-blocks/usr.sbin/jail/ (props changed)
Modified: projects/building-blocks/Makefile.inc1
==============================================================================
--- projects/building-blocks/Makefile.inc1 Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/Makefile.inc1 Wed Feb 11 08:27:07 2015 (r278566)
@@ -828,7 +828,7 @@ EXTRA_DISTRIBUTIONS+= tests
DEBUG_DISTRIBUTIONS=
.if ${MK_DEBUG_FILES} != "no"
-DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
.endif
MTREE_MAGIC?= mtree 2.0
@@ -1694,6 +1694,7 @@ _lib_libcapsicum=lib/libcapsicum
lib/libcapsicum__L: lib/libnv__L
lib/libpjdlog__L: lib/libutil__L
+lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
.for _DIR in ${LOCAL_LIB_DIRS}
Modified: projects/building-blocks/ObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/ObsoleteFiles.inc Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/ObsoleteFiles.inc Wed Feb 11 08:27:07 2015 (r278566)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150209: liblzma header
+OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
OLD_FILES+=usr/share/man/man9/spl.9
OLD_FILES+=usr/share/man/man9/spl0.9
Modified: projects/building-blocks/UPDATING
==============================================================================
--- projects/building-blocks/UPDATING Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/UPDATING Wed Feb 11 08:27:07 2015 (r278566)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150210:
+ The autofs(4) ABI was changed in order to restore binary compatibility
+ with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work
+ with the new kernel.
+
20150131:
The powerpc64 kernel has been changed to a position-independent
executable. This can only be booted with a new version of loader(8),
@@ -287,6 +292,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
The lindev device has been removed since /dev/full has been made a
standard device. __FreeBSD_version has been bumped.
+20140424:
+ The knob WITHOUT_VI was added to the base system, which controls
+ building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1)
+ in order to reorder files share/termcap and didn't build ex(1) as a
+ build tool, so building/installing with WITH_VI is highly advised for
+ build hosts for older releases.
+
+ This issue has been fixed in stable/9 and stable/10 in r277022 and
+ r276991, respectively.
+
20140418:
The YES_HESIOD knob has been removed. It has been obsolete for
a decade. Please move to using WITH_HESIOD instead or your builds
Modified: projects/building-blocks/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 08:27:07 2015 (r278566)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
{
ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
- ctf_buf_write(b, &id, sizeof (id));
-
if (target_requires_swap) {
SWAP_16(id);
}
+ ctf_buf_write(b, &id, sizeof (id));
+
debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
}
Modified: projects/building-blocks/cddl/lib/Makefile
==============================================================================
--- projects/building-blocks/cddl/lib/Makefile Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/cddl/lib/Makefile Wed Feb 11 08:27:07 2015 (r278566)
@@ -27,7 +27,8 @@ _libzpool= libzpool
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+ ${MACHINE_CPUARCH} == "arm"
_drti= drti
_libdtrace= libdtrace
.endif
Modified: projects/building-blocks/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/building-blocks/cddl/lib/libdtrace/Makefile Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/cddl/lib/libdtrace/Makefile Wed Feb 11 08:27:07 2015 (r278566)
@@ -81,6 +81,10 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/ut
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
.elif ${MACHINE_CPUARCH} == "powerpc"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc
Modified: projects/building-blocks/cddl/usr.sbin/Makefile
==============================================================================
--- projects/building-blocks/cddl/usr.sbin/Makefile Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/cddl/usr.sbin/Makefile Wed Feb 11 08:27:07 2015 (r278566)
@@ -30,6 +30,12 @@ _plockstat= plockstat
.endif
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace= dtrace
+_dtruss= dtruss
+_lockstat= lockstat
+.endif
+
.if ${MACHINE_CPUARCH} == "mips"
_dtrace= dtrace
.endif
Modified: projects/building-blocks/contrib/mdocml/lib.in
==============================================================================
--- projects/building-blocks/contrib/mdocml/lib.in Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/contrib/mdocml/lib.in Wed Feb 11 08:27:07 2015 (r278566)
@@ -41,6 +41,7 @@ LINE("libcrypt", "Crypt Library (libcryp
LINE("libcurses", "Curses Library (libcurses, \\-lcurses)")
LINE("libcuse", "Userland Character Device Library (libcuse, \\-lcuse)")
LINE("libdevattr", "Device attribute and event library (libdevattr, \\-ldevattr)")
+LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)")
LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)")
LINE("libdevstat", "Device Statistics Library (libdevstat, \\-ldevstat)")
LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)")
Modified: projects/building-blocks/contrib/top/utils.c
==============================================================================
--- projects/building-blocks/contrib/top/utils.c Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/contrib/top/utils.c Wed Feb 11 08:27:07 2015 (r278566)
@@ -58,6 +58,7 @@ char *str;
* ever convert will be 2^32-1, which is 10
* digits.
*/
+_Static_assert(sizeof(int) <= 4, "buffer too small for this sized int");
char *itoa(val)
Modified: projects/building-blocks/contrib/xz/ChangeLog
==============================================================================
--- projects/building-blocks/contrib/xz/ChangeLog Wed Feb 11 08:26:36 2015 (r278565)
+++ projects/building-blocks/contrib/xz/ChangeLog Wed Feb 11 08:27:07 2015 (r278566)
@@ -1,66 +1,923 @@
-commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af
+commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 20:44:32 +0300
+Date: 2014-12-21 20:48:37 +0200
- Bump version and soname for 5.0.7.
+ DOS: Update Makefile.
+
+ dos/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 19:50:38 +0200
+
+ Windows: Fix bin_i486 to bin_i686 in build.bash.
+
+ windows/build.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cbafa710918195dbba3db02c3fab4f0538235206
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:58:44 +0200
+
+ Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c.
+
+ doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 4 deletions(-)
+
+commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:56:44 +0200
+
+ Docs: Update docs/examples/00_README.txt.
+
+ doc/examples/00_README.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:11:17 +0200
+
+ Bump version and soname for 5.2.0.
+
+ I know that soname != app version, but I skip AGE=1
+ in -version-info to make the soname match the liblzma
+ version anyway. It doesn't hurt anything as long as
+ it doesn't conflict with library versioning rules.
src/liblzma/Makefile.am | 2 +-
- src/liblzma/api/lzma/version.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/liblzma/api/lzma/version.h | 6 +++---
+ src/liblzma/liblzma.map | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3e8bd1d15e417f2d588e9be50ce027ee3d48b2da
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:05:03 +0200
+
+ Avoid variable-length arrays in the debug programs.
+
+ debug/full_flush.c | 3 ++-
+ debug/sync_flush.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 72f7307cfdceb941aeb2bf30d424cc0d13621786
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:01:45 +0200
+
+ Build: Include 04_compress_easy_mt.c in the tarball.
+
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2cb82ff21c62def11f3683a8bb0aaf363102aaa0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:00:38 +0200
+
+ Fix build when --disable-threads is used.
+
+ src/common/mythread.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9b9e3536e458ef958f66b0e8982efc9d36de4d17
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:56:15 +0100
+
+ po/fr: improve wording for help for --lzma1/--lzma2.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a8b6b569e7fadbf5b5b9139d53bc764015c15027
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:55:48 +0100
+
+ po/fr: missing line in translation of --extreme.
+
+ po/fr.po | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f168a6fd1a888cf4f0caaddcafcb21dadc6ab6e9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:33 +0200
+
+ Update NEWS for 5.2.0.
+
+ NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+
+commit cec2ee863b3a88f4bf039cb00f73c4a4fc93a429
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:22 +0200
+
+ Update NEWS for 5.0.8.
+
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 42e97a32649bf53ce43be2258b902a417c6e7fa1
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:07:54 +0200
+
+ xz: Fix a comment.
+
+ src/xz/options.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 29b95d5d6665cedffa6a9d6d3d914f981e852182
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:43:14 +0200
+
+ Update INSTALL about the dependencies of the scripts.
+
+ INSTALL | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit 3af91040bb42c21afbb81f5568c3313125e61192
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:42:33 +0200
+
+ Windows: Update build instructions.
+
+ INSTALL | 15 +++++++++------
+ windows/INSTALL-Windows.txt | 44 +++++++++++++++++++++-----------------------
+ 2 files changed, 30 insertions(+), 29 deletions(-)
+
+commit 0152f72bf6289d744823dc6c849538f3a139ad70
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:41:48 +0200
+
+ Windows: Update the build script and README-Windows.txt.
+
+ The 32-bit build is now for i686 or newer because the
+ prebuilt MinGW-w64 toolchains include i686 code in the
+ executables even if one uses -march=i486.
+
+ The build script builds 32-bit SSE2 enabled version too.
+ Run-time detection of SSE2 support would be nice (on any OS)
+ but it's not implemented in XZ Utils yet.
+
+ windows/README-Windows.txt | 30 ++++++++++++++++--------------
+ windows/build.bash | 23 ++++++++++++++---------
+ 2 files changed, 30 insertions(+), 23 deletions(-)
+
+commit 4a1f6133ee5533cee8d91e06fcc22443e5f1881a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-19 15:51:50 +0200
+
+ Windows: Define TUKLIB_SYMBOL_PREFIX in config.h.
+
+ It is to keep all symbols in the lzma_ namespace.
+
+ windows/config.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 7f7d093de79eee0c7dbfd7433647e46302f19f82
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 21:00:09 +0200
+
+ xz: Update the man page about --threads.
+
+ src/xz/xz.1 | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 009823448b82aa5f465668878a544c5842885407
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 20:57:43 +0200
+
+ xz: Update the man page about --block-size.
+
+ src/xz/xz.1 | 41 +++++++++++++++++++++++++++++++++--------
+ 1 file changed, 33 insertions(+), 8 deletions(-)
+
+commit 7dddfbeb499e528940bc12047355c184644aafe9
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:26:57 +0100
+
+ po/fr: several more translation updates: reword and handle --ignore-check.
+
+ po/fr.po | 50 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+commit 6eca5be40e04ddc4b738d493e4e56835956d8b69
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:23:01 +0100
+
+ po/fr: yet another place where my email address had to be updated.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d1003673e92ba47edd6aeeb3dbea05c18269d0e7
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:22:20 +0100
+
+ po/fr: fix several typos that have been around since the beginning.
+
+ po/fr.po | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+commit 4c5aa911a0df027e46171e368debc543d2fa72b2
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:02:31 +0100
+
+ po/fr: last batch of new translations for now.
+
+ Four new error messages.
+
+ po/fr.po | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 3e3099e36d27059499e7996fb38a62e8ab01d356
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:01:32 +0100
+
+ po/fr: translations for --threads, --block-size and --block-list.
+
+ po/fr.po | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit e7d96a5933eec4e9d4a62569ee88df0ebb0f1d53
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:00:53 +0100
+
+ po/fr: remove fuzzy marker for error messages that will be kept in English.
+
+ The following is a copy of a comment inside fr.po:
+
+ Note from translator on "file status flags".
+ The following entry is kept un-translated on purpose. It is difficult to
+ translate and should only happen in exceptional circumstances which means
+ that translating would:
+ - lose some of the meaning
+ - make it more difficult to look up in search engines; it might happen one
+ in
+ a million times, if we dilute the error message in 20 languages, it will be
+ almost impossible to find an explanation and support for the error.
+
+ po/fr.po | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+commit 46cbb9033af8a21fafe543302d6919746e0d72af
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:58:25 +0100
+
+ po/fr: several minor updates and better wording.
+
+ Meaning doesn't change at all: it's only for better wording and/or
+ formatting of a few strings.
+
+ po/fr.po | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 7ce49d444f04e73145f79c832eb4d510594b074a
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:56:12 +0100
+
+ po/fr: update my email address and copyright years.
+
+ po/fr.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 214c553ebc3047cd720da1ce5c80cf7c38118d3c
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-11-26 10:08:26 +0100
+
+ fr.po: commit file after only "update-po" so actual is readable.
+
+ po/fr.po | 311 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 199 insertions(+), 112 deletions(-)
+
+commit 1190c641af09cde85f8bd0fbe5c4906f4a29431b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-02 20:04:07 +0200
+
+ liblzma: Document how lzma_mt.block_size affects memory usage.
+
+ src/liblzma/api/lzma/container.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e4fc1d2f9571fba79ce383595be2ea2a9257def0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-28 20:07:18 +0200
+
+ Update INSTALL about a "make check" failure in test_scripts.sh.
+
+ INSTALL | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+commit 34f9e40a0a0c3bd2c2730cdb9cd550bbb8a3f2fe
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:12:27 +0200
+
+ Remove LZMA_UNSTABLE macro.
+
+ src/liblzma/api/lzma/container.h | 4 ----
+ src/liblzma/common/common.h | 2 --
+ src/xz/private.h | 1 -
+ 3 files changed, 7 deletions(-)
+
+commit 6d9c0ce9f2677b159e32b224aba5b535b304a705
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:10:33 +0200
+
+ liblzma: Update lzma_stream_encoder_mt() API docs.
+
+ src/liblzma/api/lzma/container.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 2301f3f05dd9742f42cda8f0f318864f5dc39ab3
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-25 12:32:05 +0200
+
+ liblzma: Verify the filter chain in threaded encoder initialization.
+
+ This way an invalid filter chain is detected at the Stream
+ encoder initialization instead of delaying it to the first
+ call to lzma_code() which triggers the initialization of
+ the actual filter encoder(s).
+
+ src/liblzma/common/stream_encoder_mt.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 107a263d5bb63cd3593fd6a5c938706539f84523
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 19:11:49 +0200
+
+ Build: Update m4/ax_pthread.m4 from Autoconf Archive.
+
+ m4/ax_pthread.m4 | 71 +++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 47 insertions(+), 24 deletions(-)
+
+commit b13a781833399ff5726cfc997f3cb2f0acbdbf31
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:52:21 +0200
+
+ Build: Replace obsolete AC_HELP_STRING with AS_HELP_STRING.
+
+ configure.ac | 36 ++++++++++++++++++------------------
+ m4/tuklib_integer.m4 | 2 +-
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 542cac122ed3550148a2af0033af22b757491378
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:43:19 +0200
+
+ Build: Fix Autoconf warnings about escaped backquotes.
+
+ Thanks to Daniel Richard G. for pointing out that it's
+ good to sometimes run autoreconf -fi with -Wall.
+
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 7b03a15cea8cd4f19ed680b51c4bcbae3ce4142f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:54:40 +0200
+
+ xzdiff: Use mkdir if mktemp isn't available.
+
+ src/scripts/xzdiff.in | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+commit f8c13e5e3609581d5dd9f8777985ca07f2390ad7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:45:01 +0200
+
+ xzdiff: Create a temporary directory to hold a temporary file.
+
+ This avoids the possibility of "File name too long" when
+ creating a temp file when the input file name is very long.
+
+ This also means that other users on the system can no longer
+ see the input file names in /tmp (or whatever $TMPDIR is)
+ since the temporary directory will have a generic name. This
+ usually doesn't matter since on many systems one can see
+ the arguments given to all processes anyway.
+
+ The number X chars to mktemp where increased from 6 to 10.
+
+ Note that with some shells temp files or dirs won't be used at all.
+
+ src/scripts/xzdiff.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 7716dcf9df7f457500cb657314e7a9aea5fedb06
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 15:38:47 +0200
+
+ liblzma: Fix lzma_mt.preset in lzma_stream_encoder_mt_memusage().
+
+ It read the filter chain from a wrong variable. This is a similar
+ bug that was fixed in 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e.
+
+ src/liblzma/common/stream_encoder_mt.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 230fa4a605542c84b4178a57381695a0af4e779b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 14:49:55 +0200
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4e4ae08bc7c1711e399c9f2d26eb375d39d08101
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:28:25 +0200
+
+ Update .gitignore files.
+
+ .gitignore | 2 ++
+ m4/.gitignore | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit c923b140b27d1a055db6284e10fd546ad1a7fcdb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:15:35 +0200
+
+ Build: Prepare to support Automake's subdir-objects.
+
+ Due to a bug in Automake, subdir-objects won't be enabled
+ for now.
+
+ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+
+ Thanks to Daniel Richard G. for the original patches.
+
+ configure.ac | 7 ++++++-
+ src/Makefile.am | 22 +++++++++++++++++++++-
+ src/liblzma/Makefile.am | 4 ++--
+ src/lzmainfo/Makefile.am | 4 ++--
+ src/xz/Makefile.am | 10 +++++-----
+ src/xzdec/Makefile.am | 8 ++++----
+ 6 files changed, 40 insertions(+), 15 deletions(-)
+
+commit 08c2aa16bea0df82828f665d51fba2e0a5e8997f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-24 20:09:29 +0300
+
+ Translations: Update the Italian translation.
+
+ Thanks to Milo Casagrande.
+
+ po/it.po | 452 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 275 insertions(+), 177 deletions(-)
+
+commit 2f9f61aa83539c54ff6c118a2693890f0519b3dd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-18 18:51:45 +0300
+
+ Translations: Update the Polish translation.
+
+ Thanks to Jakub Bogusz.
+
+ po/pl.po | 332 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 214 insertions(+), 118 deletions(-)
+
+commit 4f9d233f67aea25e532824d11b7642cf7dee7a76
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:30 +0200
+
+ l10n: de.po: Change translator email address.
+
+ Although the old address is still working, the new one should
+ be preferred. So this commit changes all three places in de.po
+ accordingly.
+
+ Signed-off-by: Andre Noll <maan@tuebingen.mpg.de>
+
+ po/de.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 00502b2bedad43f0cc167ac17ae0608837ee196b
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:29 +0200
+
+ l10n: de.po: Update German translation
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 531 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 281 insertions(+), 250 deletions(-)
+
+commit 706b0496753fb609e69f1570ec603f11162189d1
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:28 +0200
+
+ l10n: de.po: Fix typo: Schießen -> Schließen.
+
+ That's a funny one since "schießen" means to shoot :)
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7c32e6a935c3d7ee366abad1679bd5f322f0c7d4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:42:26 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 076258cc458f1e705041ac7a729b15ffe8c5214a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:41:51 +0300
+
+ Add support for AmigaOS/AROS to tuklib_physmem().
+
+ Thanks to Fredrik Wikstrom.
+
+ m4/tuklib_physmem.m4 | 3 ++-
+ src/common/tuklib_physmem.c | 7 +++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit efa7b0a210e1baa8e128fc98c5443a944c39ad24
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 18:42:14 +0300
+
+ xzgrep: Avoid passing both -q and -l to grep.
+
+ The behavior of grep -ql varies:
+ - GNU grep behaves like grep -q.
+ - OpenBSD grep behaves like grep -l.
+
+ POSIX doesn't make it 100 % clear what behavior is expected.
+ Anyway, using both -q and -l at the same time makes no sense
+ so both options simply should never be used at the same time.
+
+ Thanks to Christian Weisgerber.
+
+ src/scripts/xzgrep.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 9c5f76098c9986b48d2fc574a0b764f4cde0c538
+Author: Trần Ngá»c Quân <vnwildman@gmail.com>
+Date: 2014-09-25 09:22:45 +0700
+
+ l10n: vi.po: Update Vietnamese translation
+
+ Signed-off-by: Trần Ngá»c Quân <vnwildman@gmail.com>
+
+ po/vi.po | 136 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 84 insertions(+), 52 deletions(-)
+
+commit c4911f2db36d811896c73c008b4218d8fa9a4730
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-25 18:38:48 +0300
+
+ Build: Detect supported compiler warning flags better.
+
+ Clang and nowadays also GCC accept any -Wfoobar option
+ but then may give a warning that an unknown warning option
+ was specified. To avoid adding unsupported warning options,
+ the options are now tested with -Werror.
+
+ Thanks to Charles Diza.
+
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 76e75522ed6f5c228d55587dee5a997893f6e474
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-20 21:01:21 +0300
+
+ Update NEWS for 5.0.7.
+
+ NEWS | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+commit d62028b4c1174fc67b6929f126f5eb24c018c700
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-20 19:42:56 +0300
+
+ liblzma: Fix a portability problem in Makefile.am.
+
+ POSIX supports $< only in inference rules (suffix rules).
+ Using it elsewhere is a GNU make extension and doesn't
+ work e.g. with OpenBSD make.
+
+ Thanks to Christian Weisgerber for the patch.
+
+ src/liblzma/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c35de31d4283edad3e57d37ffe939406542cb7bb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:54:09 +0300
+
+ Bump the version number to 5.1.4beta.
+
+ src/liblzma/api/lzma/version.h | 4 ++--
+ src/liblzma/liblzma.map | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e9e097e22cacdaa23e5414fea7913535449cb340
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:50:13 +0300
+
+ Update NEWS for 5.0.6 and 5.1.4beta.
+
+ NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 50 insertions(+)
+
+commit 642f856bb8562ab66704b1e01ac7bc08b6d0a663
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:02:41 +0300
+
+ Update TODO.
+
+ TODO | 38 ++++++++++++++++++++++++++++++++++----
+ 1 file changed, 34 insertions(+), 4 deletions(-)
+
+commit 6b5e3b9eff5b8cedb2aac5f524d4d60fc8a48124
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:32:36 +0300
+
+ xz: Add --ignore-check.
+
+ src/xz/args.c | 7 +++++++
+ src/xz/args.h | 1 +
+ src/xz/coder.c | 10 +++++++++-
+ src/xz/message.c | 2 ++
+ src/xz/xz.1 | 19 +++++++++++++++++++
+ 5 files changed, 38 insertions(+), 1 deletion(-)
+
+commit 9adbc2ff373f979c917cdfd3679ce0ebd59f1040
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:15:07 +0300
+
+ liblzma: Add support for LZMA_IGNORE_CHECK.
+
+ src/liblzma/api/lzma/container.h | 24 ++++++++++++++++++++++++
+ src/liblzma/common/common.h | 1 +
+ src/liblzma/common/stream_decoder.c | 14 ++++++++++++--
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+commit 0e0f34b8e4f1c60ecaec15c2105982381cc9c3e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:03:30 +0300
+
+ liblzma: Add support for lzma_block.ignore_check.
+
+ Note that this slightly changes how lzma_block_header_decode()
+ has been documented. Earlier it said that the .version is set
+ to the lowest required value, but now it says that the .version
+ field is kept unchanged if possible. In practice this doesn't
+ affect any old code, because before this commit the only
+ possible .version was 0.
+
+ src/liblzma/api/lzma/block.h | 50 ++++++++++++++++++++++++-------
+ src/liblzma/common/block_buffer_encoder.c | 2 +-
+ src/liblzma/common/block_decoder.c | 18 ++++++++---
+ src/liblzma/common/block_encoder.c | 2 +-
+ src/liblzma/common/block_header_decoder.c | 12 ++++++--
+ src/liblzma/common/block_header_encoder.c | 2 +-
+ src/liblzma/common/block_util.c | 2 +-
+ 7 files changed, 68 insertions(+), 20 deletions(-)
+
+commit 71e1437ab585b46f7a25f5a131557d3d1c0cbaa2
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-04 19:25:58 +0300
+
+ liblzma: Use lzma_memcmplen() in the BT3 match finder.
+
+ I had missed this when writing the commit
+ 5db75054e900fa06ef5ade5f2c21dffdd5d16141.
+
+ Thanks to Jun I Jin.
+
+ src/liblzma/lz/lz_encoder_mf.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+commit 41dc9ea06e1414ebe8ef52afc8fc15b6e3282b04
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-04 00:25:44 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5dcffdbcc23a68abc3ac3539b30be71bc9b5af84
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 21:32:25 +0300
+
+ liblzma: SHA-256: Optimize the Maj macro slightly.
+
+ The Maj macro is used where multiple things are added
+ together, so making Maj a sum of two expressions allows
+ some extra freedom for the compiler to schedule the
+ instructions.
+
+ I learned this trick from
+ <http://www.hackersdelight.org/corres.txt>.
+
+ src/liblzma/check/sha256.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a9477d1e0c6fd0e47e637d051e7b9e2a5d9af517
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 21:08:12 +0300
+
+ liblzma: SHA-256: Optimize the way rotations are done.
+
+ This looks weird because the rotations become sequential,
+ but it helps quite a bit on both 32-bit and 64-bit x86:
+
+ - It requires fewer instructions on two-operand
+ instruction sets like x86.
+
+ - It requires one register less which matters especially
+ on 32-bit x86.
+
+ I hope this doesn't hurt other archs.
+
+ I didn't invent this idea myself, but I don't remember where
+ I saw it first.
+
+ src/liblzma/check/sha256.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+commit 5a76c7c8ee9a0afbeedb1c211db9224260404347
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 20:38:13 +0300
+
+ liblzma: SHA-256: Remove the GCC #pragma that became unneeded.
+
+ The unrolling in the previous commit should avoid the
+ situation where a compiler may think that an uninitialized
+ variable might be accessed.
+
+ src/liblzma/check/sha256.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 9a096f8e57509775c331950b8351bbca77bdcfa8
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 20:33:38 +0300
+
+ liblzma: SHA-256: Unroll a little more.
+
+ This way a branch isn't needed for each operation
+ to choose between blk0 and blk2, and still the code
+ doesn't grow as much as it would with full unrolling.
+
+ src/liblzma/check/sha256.c | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+commit bc7650d87bf27f85f1a2a806dc2db1780e09e6a5
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 19:56:43 +0300
+
+ liblzma: SHA-256: Do the byteswapping without a temporary buffer.
+
+ src/liblzma/check/sha256.c | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+commit 544aaa3d13554e8640f9caf7db717a96360ec0f6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 22:38:28 +0300
+
+ liblzma: Use lzma_memcmplen() in normal mode of LZMA.
+
+ Two locations were not changed yet because the simplest change
+ assumes that the initial "len" may be greater than "limit".
+
+ src/liblzma/lzma/lzma_encoder_optimum_normal.c | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+commit f48fce093b07aeda95c18850f5e086d9f2383380
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 22:30:38 +0300
+
+ liblzma: Simplify LZMA fast mode code by using memcmp().
+
+ src/liblzma/lzma/lzma_encoder_optimum_fast.c | 11 +----------
+ 1 file changed, 1 insertion(+), 10 deletions(-)
+
+commit 6bf5308e34e23dede5b301b1b9b4f131dacd9218
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 22:29:49 +0300
+
+ liblzma: Use lzma_memcmplen() in fast mode of LZMA.
+
+ src/liblzma/lzma/lzma_encoder_optimum_fast.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 353212137e51e45b105a3a3fc2e6879f1cf0d492
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 21:16:23 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5db75054e900fa06ef5ade5f2c21dffdd5d16141
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 21:15:07 +0300
+
+ liblzma: Use lzma_memcmplen() in the match finders.
+
+ This doesn't change the match finder output.
+
+ src/liblzma/lz/lz_encoder.c | 13 ++++++++++++-
+ src/liblzma/lz/lz_encoder_mf.c | 33 +++++++++++----------------------
+ 2 files changed, 23 insertions(+), 23 deletions(-)
+
+commit e1c8f1d01f4a4e2136173edab2dc63c71ef038f4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 20:57:20 +0300
+
+ liblzma: Add lzma_memcmplen() for fast memory comparison.
+
+ This commit just adds the function. Its uses will be in
+ separate commits.
+
+ This hasn't been tested much yet and it's perhaps a bit early
+ to commit it but if there are bugs they should get found quite
+ quickly.
+
+ Thanks to Jun I Jin from Intel for help and for pointing out
+ that string comparison needs to be optimized in liblzma.
+
+ configure.ac | 13 +++
+ src/liblzma/common/Makefile.inc | 1 +
+ src/liblzma/common/memcmplen.h | 170 ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 184 insertions(+)
-commit ac6c8921d1d8d2d749d5c97f9a0b0594cc863cea
+commit 765735cf52e5123586e74a51b9c073b5257f631f
Author: Lasse Collin <lasse.collin@tukaani.org>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 08:28:58 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 3A131383;
Wed, 11 Feb 2015 08:28:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 25694BC1;
Wed, 11 Feb 2015 08:28:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B8SwF7046028;
Wed, 11 Feb 2015 08:28:58 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B8Sw0K046027;
Wed, 11 Feb 2015 08:28:58 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502110828.t1B8Sw0K046027@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 11 Feb 2015 08:28:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278567 - in projects/building-blocks: . share/info
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 08:28:58 -0000
Author: ngie
Date: Wed Feb 11 08:28:57 2015
New Revision: 278567
URL: https://svnweb.freebsd.org/changeset/base/278567
Log:
MFhead @ r278566
Deleted:
projects/building-blocks/share/info/
Modified:
projects/building-blocks/Makefile.inc1
Directory Properties:
projects/building-blocks/ (props changed)
projects/building-blocks/contrib/llvm/ (props changed)
projects/building-blocks/share/ (props changed)
Modified: projects/building-blocks/Makefile.inc1
==============================================================================
--- projects/building-blocks/Makefile.inc1 Wed Feb 11 08:27:07 2015 (r278566)
+++ projects/building-blocks/Makefile.inc1 Wed Feb 11 08:28:57 2015 (r278567)
@@ -50,10 +50,6 @@
.include <bsd.arch.inc.mk>
.include <bsd.compiler.mk>
-# We must do share/info early so that installation of info `dir'
-# entries works correctly. Do it first since it is less likely to
-# grow dependencies on include and lib than vice versa.
-#
# We must do lib/ and libexec/ before bin/, because if installworld
# installs a new /bin/sh, the 'make' command will *immediately*
# use that new version. And the new (dynamically-linked) /bin/sh
@@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
-SUBDIR= share/info lib libexec
+SUBDIR= lib libexec
SUBDIR+=bin
.if ${MK_GAMES} != "no"
SUBDIR+=games
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 15:21:33 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id C3845A60;
Wed, 11 Feb 2015 15:21:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 AA5ECE80;
Wed, 11 Feb 2015 15:21:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BFLXbb054938;
Wed, 11 Feb 2015 15:21:33 GMT (envelope-from jhibbits@FreeBSD.org)
Received: (from jhibbits@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BFLQQU054814;
Wed, 11 Feb 2015 15:21:26 GMT (envelope-from jhibbits@FreeBSD.org)
Message-Id: <201502111521.t1BFLQQU054814@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to
jhibbits@FreeBSD.org using -f
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 11 Feb 2015 15:21:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278581 - in projects/pmac_pmu: .
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat
cddl/contrib/opensolaris/lib/libd...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 15:21:33 -0000
Author: jhibbits
Date: Wed Feb 11 15:21:25 2015
New Revision: 278581
URL: https://svnweb.freebsd.org/changeset/base/278581
Log:
IFC@r278554
Added:
projects/pmac_pmu/cddl/contrib/opensolaris/lib/libdtrace/arm/
- copied from r278554, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
projects/pmac_pmu/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
- copied unchanged from r278554, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff
projects/pmac_pmu/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff
- copied unchanged from r278554, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff
projects/pmac_pmu/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff
- copied unchanged from r278554, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/lzma12.h
- copied unchanged from r278554, head/contrib/xz/src/liblzma/api/lzma/lzma12.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_buffer_encoder.h
- copied unchanged from r278554, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/hardware_cputhreads.c
- copied unchanged from r278554, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/memcmplen.h
- copied unchanged from r278554, head/contrib/xz/src/liblzma/common/memcmplen.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/outqueue.c
- copied unchanged from r278554, head/contrib/xz/src/liblzma/common/outqueue.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/outqueue.h
- copied unchanged from r278554, head/contrib/xz/src/liblzma/common/outqueue.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/stream_encoder_mt.c
- copied unchanged from r278554, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c
projects/pmac_pmu/contrib/xz/src/liblzma/liblzma.map
- copied unchanged from r278554, head/contrib/xz/src/liblzma/liblzma.map
projects/pmac_pmu/contrib/xz/src/liblzma/validate_map.sh
- copied unchanged from r278554, head/contrib/xz/src/liblzma/validate_map.sh
projects/pmac_pmu/contrib/xz/src/xz/mytime.c
- copied unchanged from r278554, head/contrib/xz/src/xz/mytime.c
projects/pmac_pmu/contrib/xz/src/xz/mytime.h
- copied unchanged from r278554, head/contrib/xz/src/xz/mytime.h
projects/pmac_pmu/lib/libdevctl/
- copied from r278554, head/lib/libdevctl/
projects/pmac_pmu/release/doc/share/xml/errata.xml
- copied unchanged from r278554, head/release/doc/share/xml/errata.xml
projects/pmac_pmu/release/doc/share/xml/security.xml
- copied unchanged from r278554, head/release/doc/share/xml/security.xml
projects/pmac_pmu/sys/amd64/include/pvclock.h
- copied unchanged from r278554, head/sys/amd64/include/pvclock.h
projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_audio.c
- copied unchanged from r278554, head/sys/arm/broadcom/bcm2835/bcm2835_audio.c
projects/pmac_pmu/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
- copied unchanged from r278554, head/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/arm/
- copied from r278554, head/sys/cddl/contrib/opensolaris/uts/arm/
projects/pmac_pmu/sys/cddl/dev/dtrace/arm/
- copied from r278554, head/sys/cddl/dev/dtrace/arm/
projects/pmac_pmu/sys/cddl/dev/fbt/arm/
- copied from r278554, head/sys/cddl/dev/fbt/arm/
projects/pmac_pmu/sys/contrib/vchiq/
- copied from r278554, head/sys/contrib/vchiq/
projects/pmac_pmu/sys/dev/cxgbe/if_cxl.c
- copied unchanged from r278554, head/sys/dev/cxgbe/if_cxl.c
projects/pmac_pmu/sys/dev/wpi/if_wpi_debug.h
- copied unchanged from r278554, head/sys/dev/wpi/if_wpi_debug.h
projects/pmac_pmu/sys/i386/include/pvclock.h
- copied unchanged from r278554, head/sys/i386/include/pvclock.h
projects/pmac_pmu/sys/modules/cxgbe/if_cxl/
- copied from r278554, head/sys/modules/cxgbe/if_cxl/
projects/pmac_pmu/sys/modules/dtb/rpi/
- copied from r278554, head/sys/modules/dtb/rpi/
projects/pmac_pmu/sys/x86/include/pvclock.h
- copied unchanged from r278554, head/sys/x86/include/pvclock.h
projects/pmac_pmu/sys/x86/x86/pvclock.c
- copied unchanged from r278554, head/sys/x86/x86/pvclock.c
projects/pmac_pmu/tools/build/options/WITHOUT_BOOTPARAMD
- copied unchanged from r278554, head/tools/build/options/WITHOUT_BOOTPARAMD
projects/pmac_pmu/tools/build/options/WITHOUT_BOOTPD
- copied unchanged from r278554, head/tools/build/options/WITHOUT_BOOTPD
projects/pmac_pmu/tools/build/options/WITHOUT_FILE
- copied unchanged from r278554, head/tools/build/options/WITHOUT_FILE
projects/pmac_pmu/tools/build/options/WITHOUT_FINGER
- copied unchanged from r278554, head/tools/build/options/WITHOUT_FINGER
projects/pmac_pmu/tools/build/options/WITHOUT_FTP
- copied unchanged from r278554, head/tools/build/options/WITHOUT_FTP
projects/pmac_pmu/tools/build/options/WITHOUT_INETD
- copied unchanged from r278554, head/tools/build/options/WITHOUT_INETD
projects/pmac_pmu/tools/build/options/WITHOUT_RADIUS_SUPPORT
- copied unchanged from r278554, head/tools/build/options/WITHOUT_RADIUS_SUPPORT
projects/pmac_pmu/tools/build/options/WITHOUT_RBOOTD
- copied unchanged from r278554, head/tools/build/options/WITHOUT_RBOOTD
projects/pmac_pmu/tools/build/options/WITHOUT_TCP_WRAPPERS
- copied unchanged from r278554, head/tools/build/options/WITHOUT_TCP_WRAPPERS
projects/pmac_pmu/tools/build/options/WITHOUT_TFTP
- copied unchanged from r278554, head/tools/build/options/WITHOUT_TFTP
projects/pmac_pmu/tools/build/options/WITHOUT_TIMED
- copied unchanged from r278554, head/tools/build/options/WITHOUT_TIMED
projects/pmac_pmu/tools/tools/qrndtest/
- copied from r278554, head/tools/tools/qrndtest/
projects/pmac_pmu/usr.sbin/devctl/
- copied from r278554, head/usr.sbin/devctl/
projects/pmac_pmu/usr.sbin/pw/tests/pw_usernext.sh
- copied unchanged from r278554, head/usr.sbin/pw/tests/pw_usernext.sh
Deleted:
projects/pmac_pmu/contrib/llvm/patches/patch-29-llvm-r226664-aarch64-x18.diff
projects/pmac_pmu/contrib/llvm/patches/patch-30-clang-r227062-fixes-x18.diff
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/lzma.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/stream_encoder.h
projects/pmac_pmu/sys/powerpc/conf/WII
projects/pmac_pmu/sys/powerpc/wii/
Modified:
projects/pmac_pmu/Makefile.inc1
projects/pmac_pmu/ObsoleteFiles.inc
projects/pmac_pmu/UPDATING
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe (contents, props changed)
projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe (contents, props changed)
projects/pmac_pmu/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
projects/pmac_pmu/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
projects/pmac_pmu/cddl/lib/Makefile
projects/pmac_pmu/cddl/lib/libdtrace/Makefile
projects/pmac_pmu/cddl/usr.sbin/Makefile
projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.c
projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.h
projects/pmac_pmu/contrib/mdocml/lib.in
projects/pmac_pmu/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
projects/pmac_pmu/contrib/xz/ChangeLog
projects/pmac_pmu/contrib/xz/FREEBSD-upgrade
projects/pmac_pmu/contrib/xz/THANKS
projects/pmac_pmu/contrib/xz/TODO
projects/pmac_pmu/contrib/xz/src/common/mythread.h
projects/pmac_pmu/contrib/xz/src/common/sysdefs.h
projects/pmac_pmu/contrib/xz/src/common/tuklib_cpucores.c
projects/pmac_pmu/contrib/xz/src/common/tuklib_physmem.c
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/base.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/block.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/container.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/filter.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/hardware.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/index.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/index_hash.h
projects/pmac_pmu/contrib/xz/src/liblzma/api/lzma/version.h
projects/pmac_pmu/contrib/xz/src/liblzma/check/check.h
projects/pmac_pmu/contrib/xz/src/liblzma/check/sha256.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/alone_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/alone_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/alone_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/auto_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_buffer_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_buffer_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_header_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_header_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/block_util.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/common.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/common.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/easy_buffer_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/easy_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_buffer_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_buffer_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_common.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_common.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/filter_flags_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/index.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/index_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/index_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/index_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/index_hash.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/stream_buffer_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/stream_buffer_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/stream_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/common/stream_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/common/stream_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/delta/delta_common.c
projects/pmac_pmu/contrib/xz/src/liblzma/delta/delta_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/delta/delta_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/delta/delta_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/delta/delta_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/delta/delta_private.h
projects/pmac_pmu/contrib/xz/src/liblzma/liblzma.pc.in
projects/pmac_pmu/contrib/xz/src/liblzma/lz/lz_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/lz/lz_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/lz/lz_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/lz/lz_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/lz/lz_encoder_mf.c
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/fastpos.h
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma2_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma2_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_common.h
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_encoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_encoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
projects/pmac_pmu/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
projects/pmac_pmu/contrib/xz/src/liblzma/rangecoder/range_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/simple/arm.c
projects/pmac_pmu/contrib/xz/src/liblzma/simple/armthumb.c
projects/pmac_pmu/contrib/xz/src/liblzma/simple/ia64.c
projects/pmac_pmu/contrib/xz/src/liblzma/simple/powerpc.c
projects/pmac_pmu/contrib/xz/src/liblzma/simple/simple_coder.c
projects/pmac_pmu/contrib/xz/src/liblzma/simple/simple_coder.h
projects/pmac_pmu/contrib/xz/src/liblzma/simple/simple_decoder.c
projects/pmac_pmu/contrib/xz/src/liblzma/simple/simple_decoder.h
projects/pmac_pmu/contrib/xz/src/liblzma/simple/simple_private.h
projects/pmac_pmu/contrib/xz/src/liblzma/simple/sparc.c
projects/pmac_pmu/contrib/xz/src/liblzma/simple/x86.c
projects/pmac_pmu/contrib/xz/src/xz/args.c
projects/pmac_pmu/contrib/xz/src/xz/args.h
projects/pmac_pmu/contrib/xz/src/xz/coder.c
projects/pmac_pmu/contrib/xz/src/xz/coder.h
projects/pmac_pmu/contrib/xz/src/xz/file_io.c
projects/pmac_pmu/contrib/xz/src/xz/file_io.h
projects/pmac_pmu/contrib/xz/src/xz/hardware.c
projects/pmac_pmu/contrib/xz/src/xz/hardware.h
projects/pmac_pmu/contrib/xz/src/xz/list.c
projects/pmac_pmu/contrib/xz/src/xz/main.c
projects/pmac_pmu/contrib/xz/src/xz/message.c
projects/pmac_pmu/contrib/xz/src/xz/options.c
projects/pmac_pmu/contrib/xz/src/xz/private.h
projects/pmac_pmu/contrib/xz/src/xz/signals.c
projects/pmac_pmu/contrib/xz/src/xz/suffix.c
projects/pmac_pmu/contrib/xz/src/xz/xz.1
projects/pmac_pmu/etc/Makefile
projects/pmac_pmu/etc/devd.conf
projects/pmac_pmu/etc/rc.d/Makefile
projects/pmac_pmu/etc/rc.d/jail
projects/pmac_pmu/etc/rc.d/netif
projects/pmac_pmu/etc/rc.d/routing
projects/pmac_pmu/games/fortune/datfiles/freebsd-tips
projects/pmac_pmu/include/Makefile
projects/pmac_pmu/lib/Makefile
projects/pmac_pmu/lib/clang/clang.build.mk
projects/pmac_pmu/lib/csu/powerpc64/Makefile
projects/pmac_pmu/lib/libc/gen/disklabel.c
projects/pmac_pmu/lib/libc/gen/getgrent.c
projects/pmac_pmu/lib/libc/gen/getpwent.c
projects/pmac_pmu/lib/libc/gen/ttyname.c
projects/pmac_pmu/lib/libc/nls/msgcat.c
projects/pmac_pmu/lib/libc/rpc/crypt_client.c
projects/pmac_pmu/lib/libc/rpc/svc_vc.c
projects/pmac_pmu/lib/libc/stdlib/tdelete.c
projects/pmac_pmu/lib/libc/sys/setresuid.2
projects/pmac_pmu/lib/libdevinfo/devinfo.h
projects/pmac_pmu/lib/liblzma/Makefile
projects/pmac_pmu/lib/liblzma/Symbol.map
projects/pmac_pmu/lib/liblzma/Versions.def
projects/pmac_pmu/lib/liblzma/config.h
projects/pmac_pmu/lib/libnetgraph/debug.c
projects/pmac_pmu/lib/libpam/modules/modules.inc
projects/pmac_pmu/lib/libproc/proc_bkpt.c
projects/pmac_pmu/lib/libproc/proc_regs.c
projects/pmac_pmu/lib/libthr/thread/thr_barrier.c
projects/pmac_pmu/lib/msun/src/s_scalbln.c
projects/pmac_pmu/libexec/Makefile
projects/pmac_pmu/release/Makefile
projects/pmac_pmu/release/Makefile.vm
projects/pmac_pmu/release/doc/en_US.ISO8859-1/errata/article.xml
projects/pmac_pmu/release/doc/en_US.ISO8859-1/relnotes/article.xml
projects/pmac_pmu/release/doc/share/mk/doc.relnotes.mk
projects/pmac_pmu/release/doc/share/xml/release.ent
projects/pmac_pmu/release/release.sh
projects/pmac_pmu/release/scripts/mk-vmimage.sh
projects/pmac_pmu/release/tools/gce.conf
projects/pmac_pmu/rescue/rescue/Makefile
projects/pmac_pmu/sbin/Makefile
projects/pmac_pmu/sbin/ifconfig/af_inet6.c
projects/pmac_pmu/sbin/ifconfig/ifconfig.c
projects/pmac_pmu/sbin/ipfw/ipfw2.c
projects/pmac_pmu/share/examples/Makefile
projects/pmac_pmu/share/man/man4/Makefile
projects/pmac_pmu/share/man/man4/ral.4
projects/pmac_pmu/share/man/man4/witness.4
projects/pmac_pmu/share/man/man5/nullfs.5
projects/pmac_pmu/share/man/man5/src.conf.5
projects/pmac_pmu/share/man/man9/Makefile
projects/pmac_pmu/share/misc/Makefile
projects/pmac_pmu/share/mk/bsd.libnames.mk
projects/pmac_pmu/share/mk/bsd.mkopt.mk
projects/pmac_pmu/share/mk/bsd.own.mk
projects/pmac_pmu/share/mk/src.libnames.mk
projects/pmac_pmu/share/mk/src.opts.mk
projects/pmac_pmu/sys/amd64/amd64/apic_vector.S
projects/pmac_pmu/sys/amd64/amd64/genassym.c
projects/pmac_pmu/sys/amd64/amd64/mp_machdep.c
projects/pmac_pmu/sys/amd64/include/cpufunc.h
projects/pmac_pmu/sys/amd64/vmm/vmm_support.S
projects/pmac_pmu/sys/arm/arm/busdma_machdep-v6.c
projects/pmac_pmu/sys/arm/arm/cpufunc.c
projects/pmac_pmu/sys/arm/arm/cpufunc_asm_armv7.S
projects/pmac_pmu/sys/arm/arm/elf_trampoline.c
projects/pmac_pmu/sys/arm/arm/exception.S
projects/pmac_pmu/sys/arm/arm/identcpu.c
projects/pmac_pmu/sys/arm/arm/trap.c
projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
projects/pmac_pmu/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
projects/pmac_pmu/sys/arm/broadcom/bcm2835/files.bcm2835
projects/pmac_pmu/sys/arm/conf/BEAGLEBONE
projects/pmac_pmu/sys/arm/conf/RPI-B
projects/pmac_pmu/sys/arm/include/armreg.h
projects/pmac_pmu/sys/arm/include/cpufunc.h
projects/pmac_pmu/sys/arm/ti/am335x/am335x_prcm.c
projects/pmac_pmu/sys/arm/ti/ti_gpio.c
projects/pmac_pmu/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
projects/pmac_pmu/sys/boot/amd64/boot1.efi/generate-fat.sh
projects/pmac_pmu/sys/boot/amd64/efi/main.c
projects/pmac_pmu/sys/boot/efi/include/efiapi.h
projects/pmac_pmu/sys/boot/fdt/fdt_loader_cmd.c
projects/pmac_pmu/sys/boot/forth/beastie.4th
projects/pmac_pmu/sys/boot/forth/brand.4th
projects/pmac_pmu/sys/cam/cam.h
projects/pmac_pmu/sys/cam/cam_ccb.h
projects/pmac_pmu/sys/cam/cam_periph.c
projects/pmac_pmu/sys/cam/cam_xpt.c
projects/pmac_pmu/sys/cam/cam_xpt_internal.h
projects/pmac_pmu/sys/cam/ctl/ctl.c
projects/pmac_pmu/sys/cam/ctl/ctl_frontend.c
projects/pmac_pmu/sys/cam/ctl/ctl_frontend.h
projects/pmac_pmu/sys/cam/ctl/ctl_frontend_iscsi.c
projects/pmac_pmu/sys/cam/ctl/ctl_frontend_iscsi.h
projects/pmac_pmu/sys/cam/ctl/ctl_ioctl.h
projects/pmac_pmu/sys/cam/ctl/ctl_private.h
projects/pmac_pmu/sys/cam/ctl/ctl_tpc_local.c
projects/pmac_pmu/sys/cam/scsi/scsi_cd.c
projects/pmac_pmu/sys/cam/scsi/scsi_da.c
projects/pmac_pmu/sys/cam/scsi/scsi_xpt.c
projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
projects/pmac_pmu/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
projects/pmac_pmu/sys/cddl/dev/dtrace/dtrace_load.c
projects/pmac_pmu/sys/cddl/dev/dtrace/dtrace_unload.c
projects/pmac_pmu/sys/cddl/dev/lockstat/lockstat.c
projects/pmac_pmu/sys/cddl/dev/profile/profile.c
projects/pmac_pmu/sys/conf/dtb.mk
projects/pmac_pmu/sys/conf/files
projects/pmac_pmu/sys/conf/files.amd64
projects/pmac_pmu/sys/conf/files.i386
projects/pmac_pmu/sys/conf/files.powerpc
projects/pmac_pmu/sys/conf/kern.mk
projects/pmac_pmu/sys/conf/kern.opts.mk
projects/pmac_pmu/sys/conf/kern.pre.mk
projects/pmac_pmu/sys/conf/options
projects/pmac_pmu/sys/conf/options.powerpc
projects/pmac_pmu/sys/contrib/dev/acpica/include/actbl2.h
projects/pmac_pmu/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
projects/pmac_pmu/sys/contrib/dev/ral/microcode.h
projects/pmac_pmu/sys/contrib/dev/ral/rt2860.fw.uu
projects/pmac_pmu/sys/dev/acpica/acpi.c
projects/pmac_pmu/sys/dev/ahci/ahci.h
projects/pmac_pmu/sys/dev/ahci/ahci_pci.c
projects/pmac_pmu/sys/dev/cxgb/cxgb_osdep.h
projects/pmac_pmu/sys/dev/cxgbe/adapter.h
projects/pmac_pmu/sys/dev/cxgbe/common/t4_hw.c
projects/pmac_pmu/sys/dev/cxgbe/iw_cxgbe/device.c
projects/pmac_pmu/sys/dev/cxgbe/offload.h
projects/pmac_pmu/sys/dev/cxgbe/t4_main.c
projects/pmac_pmu/sys/dev/cxgbe/tom/t4_listen.c
projects/pmac_pmu/sys/dev/cxgbe/tom/t4_tom.c
projects/pmac_pmu/sys/dev/drm2/i915/i915_drv.c
projects/pmac_pmu/sys/dev/drm2/i915/i915_drv.h
projects/pmac_pmu/sys/dev/drm2/i915/intel_dp.c
projects/pmac_pmu/sys/dev/drm2/i915/intel_iic.c
projects/pmac_pmu/sys/dev/drm2/radeon/ni.c
projects/pmac_pmu/sys/dev/drm2/radeon/si.c
projects/pmac_pmu/sys/dev/drm2/ttm/ttm_bo.c
projects/pmac_pmu/sys/dev/drm2/ttm/ttm_page_alloc.c
projects/pmac_pmu/sys/dev/ed/if_ed.c
projects/pmac_pmu/sys/dev/fe/if_fe_isa.c
projects/pmac_pmu/sys/dev/gpio/gpiobus.c
projects/pmac_pmu/sys/dev/gpio/gpiobusvar.h
projects/pmac_pmu/sys/dev/gpio/ofw_gpiobus.c
projects/pmac_pmu/sys/dev/ipmi/ipmi.c
projects/pmac_pmu/sys/dev/ipmi/ipmi_kcs.c
projects/pmac_pmu/sys/dev/ipmi/ipmi_smic.c
projects/pmac_pmu/sys/dev/ipmi/ipmi_ssif.c
projects/pmac_pmu/sys/dev/ipmi/ipmivars.h
projects/pmac_pmu/sys/dev/iscsi/icl.c
projects/pmac_pmu/sys/dev/iscsi/icl.h
projects/pmac_pmu/sys/dev/iscsi/icl_conn_if.m
projects/pmac_pmu/sys/dev/iscsi/icl_soft.c
projects/pmac_pmu/sys/dev/iscsi/icl_wrappers.h
projects/pmac_pmu/sys/dev/iscsi/iscsi.c
projects/pmac_pmu/sys/dev/iscsi/iscsi.h
projects/pmac_pmu/sys/dev/iscsi/iscsi_ioctl.h
projects/pmac_pmu/sys/dev/iscsi/iscsi_proto.h
projects/pmac_pmu/sys/dev/malo/if_malo.c
projects/pmac_pmu/sys/dev/mwl/if_mwl.c
projects/pmac_pmu/sys/dev/pci/pci.c
projects/pmac_pmu/sys/dev/ral/if_ral_pci.c
projects/pmac_pmu/sys/dev/ral/rt2860.c
projects/pmac_pmu/sys/dev/ral/rt2860reg.h
projects/pmac_pmu/sys/dev/sfxge/common/efsys.h
projects/pmac_pmu/sys/dev/sfxge/sfxge.c
projects/pmac_pmu/sys/dev/sfxge/sfxge.h
projects/pmac_pmu/sys/dev/sfxge/sfxge_ev.c
projects/pmac_pmu/sys/dev/sfxge/sfxge_mcdi.c
projects/pmac_pmu/sys/dev/sfxge/sfxge_port.c
projects/pmac_pmu/sys/dev/sfxge/sfxge_rx.c
projects/pmac_pmu/sys/dev/sfxge/sfxge_tx.c
projects/pmac_pmu/sys/dev/sfxge/sfxge_tx.h
projects/pmac_pmu/sys/dev/sound/usb/uaudio.c
projects/pmac_pmu/sys/dev/uart/uart_bus_pci.c
projects/pmac_pmu/sys/dev/usb/controller/xhci.c
projects/pmac_pmu/sys/dev/usb/serial/u3g.c
projects/pmac_pmu/sys/dev/usb/usb_core.h
projects/pmac_pmu/sys/dev/usb/usb_msctest.c
projects/pmac_pmu/sys/dev/usb/usb_transfer.c
projects/pmac_pmu/sys/dev/usb/usbdevs
projects/pmac_pmu/sys/dev/vt/hw/vga/vt_vga.c
projects/pmac_pmu/sys/dev/wpi/if_wpi.c
projects/pmac_pmu/sys/dev/wpi/if_wpireg.h
projects/pmac_pmu/sys/dev/wpi/if_wpivar.h
projects/pmac_pmu/sys/dev/xen/timer/timer.c
projects/pmac_pmu/sys/fs/autofs/autofs.c
projects/pmac_pmu/sys/fs/autofs/autofs_ioctl.h
projects/pmac_pmu/sys/fs/tmpfs/tmpfs_subr.c
projects/pmac_pmu/sys/i386/i386/apic_vector.s
projects/pmac_pmu/sys/i386/i386/genassym.c
projects/pmac_pmu/sys/i386/i386/mp_machdep.c
projects/pmac_pmu/sys/i386/include/cpufunc.h
projects/pmac_pmu/sys/i386/xen/clock.c
projects/pmac_pmu/sys/kern/init_main.c
projects/pmac_pmu/sys/kern/kern_clock.c
projects/pmac_pmu/sys/kern/kern_clocksource.c
projects/pmac_pmu/sys/kern/kern_sig.c
projects/pmac_pmu/sys/kern/kern_timeout.c
projects/pmac_pmu/sys/kern/subr_bus.c
projects/pmac_pmu/sys/kern/subr_hints.c
projects/pmac_pmu/sys/kern/sys_pipe.c
projects/pmac_pmu/sys/kern/uipc_shm.c
projects/pmac_pmu/sys/kern/vfs_mount.c
projects/pmac_pmu/sys/mips/atheros/if_argevar.h
projects/pmac_pmu/sys/modules/Makefile
projects/pmac_pmu/sys/modules/cxgbe/Makefile
projects/pmac_pmu/sys/modules/dtrace/Makefile
projects/pmac_pmu/sys/modules/dtrace/dtrace/Makefile
projects/pmac_pmu/sys/modules/wpi/Makefile
projects/pmac_pmu/sys/netinet/if_ether.c
projects/pmac_pmu/sys/netinet/in.c
projects/pmac_pmu/sys/netinet/ip_output.c
projects/pmac_pmu/sys/netinet6/in6.c
projects/pmac_pmu/sys/netinet6/nd6.c
projects/pmac_pmu/sys/netpfil/ipfw/ip_fw_iface.c (contents, props changed)
projects/pmac_pmu/sys/netpfil/ipfw/ip_fw_nat.c
projects/pmac_pmu/sys/netpfil/ipfw/ip_fw_private.h
projects/pmac_pmu/sys/netpfil/ipfw/ip_fw_table.c
projects/pmac_pmu/sys/netpfil/ipfw/ip_fw_table_algo.c
projects/pmac_pmu/sys/ofed/include/linux/linux_idr.c
projects/pmac_pmu/sys/powerpc/aim/locore32.S
projects/pmac_pmu/sys/powerpc/aim/machdep.c
projects/pmac_pmu/sys/powerpc/aim/mmu_oea.c
projects/pmac_pmu/sys/powerpc/conf/NOTES
projects/pmac_pmu/sys/powerpc/include/cpu.h
projects/pmac_pmu/sys/powerpc/ofw/ofw_syscons.c
projects/pmac_pmu/sys/powerpc/powerpc/swtch64.S
projects/pmac_pmu/sys/powerpc/pseries/mmu_phyp.c
projects/pmac_pmu/sys/powerpc/pseries/platform_chrp.c
projects/pmac_pmu/sys/powerpc/pseries/xics.c
projects/pmac_pmu/sys/rpc/svc_vc.c
projects/pmac_pmu/sys/sys/bitset.h
projects/pmac_pmu/sys/sys/bus.h
projects/pmac_pmu/sys/sys/callout.h
projects/pmac_pmu/sys/sys/cdefs.h
projects/pmac_pmu/sys/sys/copyright.h
projects/pmac_pmu/sys/sys/cpuset.h
projects/pmac_pmu/sys/sys/param.h
projects/pmac_pmu/sys/sys/systm.h
projects/pmac_pmu/sys/ufs/ffs/ffs_softdep.c
projects/pmac_pmu/sys/x86/acpica/madt.c
projects/pmac_pmu/sys/x86/include/apicreg.h
projects/pmac_pmu/sys/x86/include/apicvar.h
projects/pmac_pmu/sys/x86/include/specialreg.h
projects/pmac_pmu/sys/x86/x86/io_apic.c
projects/pmac_pmu/sys/x86/x86/local_apic.c
projects/pmac_pmu/sys/x86/xen/xen_apic.c
projects/pmac_pmu/tools/build/mk/OptionalObsoleteFiles.inc
projects/pmac_pmu/tools/tools/makeroot/makeroot.8
projects/pmac_pmu/tools/tools/makeroot/makeroot.sh
projects/pmac_pmu/usr.bin/Makefile
projects/pmac_pmu/usr.bin/ctlstat/ctlstat.c
projects/pmac_pmu/usr.bin/iscsictl/iscsi.conf.5
projects/pmac_pmu/usr.bin/iscsictl/iscsictl.c
projects/pmac_pmu/usr.bin/iscsictl/iscsictl.h
projects/pmac_pmu/usr.bin/iscsictl/parse.y
projects/pmac_pmu/usr.bin/iscsictl/token.l
projects/pmac_pmu/usr.bin/ktrdump/ktrdump.8
projects/pmac_pmu/usr.bin/ktrdump/ktrdump.c
projects/pmac_pmu/usr.bin/w/w.c
projects/pmac_pmu/usr.bin/xz/Makefile
projects/pmac_pmu/usr.sbin/Makefile
projects/pmac_pmu/usr.sbin/bluetooth/hccontrol/hccontrol.8
projects/pmac_pmu/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
projects/pmac_pmu/usr.sbin/bsdconfig/console/INDEX
projects/pmac_pmu/usr.sbin/bsdconfig/includes/INDEX
projects/pmac_pmu/usr.sbin/bsdconfig/networking/share/device.subr
projects/pmac_pmu/usr.sbin/bsdconfig/share/dialog.subr
projects/pmac_pmu/usr.sbin/bsdconfig/share/keymap.subr
projects/pmac_pmu/usr.sbin/bsdconfig/timezone/share/continents.subr
projects/pmac_pmu/usr.sbin/bsdconfig/timezone/share/countries.subr
projects/pmac_pmu/usr.sbin/bsdconfig/timezone/timezone
projects/pmac_pmu/usr.sbin/bsdconfig/usermgmt/share/user.subr
projects/pmac_pmu/usr.sbin/ctladm/ctladm.8
projects/pmac_pmu/usr.sbin/ctladm/ctladm.c
projects/pmac_pmu/usr.sbin/ctld/ctl.conf.5
projects/pmac_pmu/usr.sbin/ctld/ctld.c
projects/pmac_pmu/usr.sbin/ctld/ctld.h
projects/pmac_pmu/usr.sbin/ctld/discovery.c
projects/pmac_pmu/usr.sbin/ctld/kernel.c
projects/pmac_pmu/usr.sbin/ctld/login.c
projects/pmac_pmu/usr.sbin/ctld/parse.y
projects/pmac_pmu/usr.sbin/ctld/token.l
projects/pmac_pmu/usr.sbin/devinfo/devinfo.c
projects/pmac_pmu/usr.sbin/freebsd-update/freebsd-update.sh
projects/pmac_pmu/usr.sbin/iscsid/iscsid.c
projects/pmac_pmu/usr.sbin/iscsid/iscsid.h
projects/pmac_pmu/usr.sbin/iscsid/login.c
projects/pmac_pmu/usr.sbin/jail/command.c
projects/pmac_pmu/usr.sbin/jail/config.c
projects/pmac_pmu/usr.sbin/jail/jail.8
projects/pmac_pmu/usr.sbin/jail/jail.c
projects/pmac_pmu/usr.sbin/jail/jailp.h
projects/pmac_pmu/usr.sbin/mountd/mountd.c
projects/pmac_pmu/usr.sbin/pkg/pkg.c
projects/pmac_pmu/usr.sbin/ppp/Makefile
projects/pmac_pmu/usr.sbin/pw/tests/Makefile
projects/pmac_pmu/usr.sbin/syslogd/syslogd.c
Directory Properties:
projects/pmac_pmu/ (props changed)
projects/pmac_pmu/cddl/ (props changed)
projects/pmac_pmu/cddl/contrib/opensolaris/ (props changed)
projects/pmac_pmu/contrib/gcc/ (props changed)
projects/pmac_pmu/contrib/llvm/ (props changed)
projects/pmac_pmu/contrib/mdocml/ (props changed)
projects/pmac_pmu/contrib/xz/ (props changed)
projects/pmac_pmu/etc/ (props changed)
projects/pmac_pmu/include/ (props changed)
projects/pmac_pmu/lib/libc/ (props changed)
projects/pmac_pmu/sbin/ (props changed)
projects/pmac_pmu/sbin/ipfw/ (props changed)
projects/pmac_pmu/share/ (props changed)
projects/pmac_pmu/share/man/man4/ (props changed)
projects/pmac_pmu/sys/ (props changed)
projects/pmac_pmu/sys/amd64/vmm/ (props changed)
projects/pmac_pmu/sys/boot/ (props changed)
projects/pmac_pmu/sys/cddl/contrib/opensolaris/ (props changed)
projects/pmac_pmu/sys/conf/ (props changed)
projects/pmac_pmu/sys/contrib/dev/acpica/ (props changed)
projects/pmac_pmu/sys/contrib/dev/acpica/include/ (props changed)
projects/pmac_pmu/usr.sbin/jail/ (props changed)
Modified: projects/pmac_pmu/Makefile.inc1
==============================================================================
--- projects/pmac_pmu/Makefile.inc1 Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/Makefile.inc1 Wed Feb 11 15:21:25 2015 (r278581)
@@ -823,7 +823,7 @@ EXTRA_DISTRIBUTIONS+= tests
DEBUG_DISTRIBUTIONS=
.if ${MK_DEBUG_FILES} != "no"
-DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
.endif
MTREE_MAGIC?= mtree 2.0
@@ -1634,7 +1634,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
${_lib_libcapsicum} \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
- lib/libradius lib/libsbuf lib/libtacplus \
+ ${_lib_libradius} lib/libsbuf lib/libtacplus \
lib/libgeom \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
${_cddl_lib_libuutil} \
@@ -1657,6 +1657,10 @@ lib/libgeom__L: lib/libexpat__L
_lib_libthr= lib/libthr
.endif
+.if ${MK_RADIUS_SUPPORT} != "no"
+_lib_libradius= lib/libradius
+.endif
+
.if ${MK_OFED} != "no"
_ofed_lib= contrib/ofed/usr.lib/
.endif
@@ -1667,6 +1671,7 @@ _lib_libcapsicum=lib/libcapsicum
lib/libcapsicum__L: lib/libnv__L
lib/libpjdlog__L: lib/libutil__L
+lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
.for _DIR in ${LOCAL_LIB_DIRS}
Modified: projects/pmac_pmu/ObsoleteFiles.inc
==============================================================================
--- projects/pmac_pmu/ObsoleteFiles.inc Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/ObsoleteFiles.inc Wed Feb 11 15:21:25 2015 (r278581)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150209: liblzma header
+OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
OLD_FILES+=usr/share/man/man9/spl.9
OLD_FILES+=usr/share/man/man9/spl0.9
Modified: projects/pmac_pmu/UPDATING
==============================================================================
--- projects/pmac_pmu/UPDATING Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/UPDATING Wed Feb 11 15:21:25 2015 (r278581)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150210:
+ The autofs(4) ABI was changed in order to restore binary compatibility
+ with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work
+ with the new kernel.
+
20150131:
The powerpc64 kernel has been changed to a position-independent
executable. This can only be booted with a new version of loader(8),
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
#
# CDDL HEADER START
#
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe
==============================================================================
Binary file (source and/or target). No diff available.
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe
==============================================================================
Binary file (source and/or target). No diff available.
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c Wed Feb 11 15:21:25 2015 (r278581)
@@ -382,6 +382,9 @@ dt_stddev(uint64_t *data, uint64_t norma
int64_t norm_avg;
uint64_t diff[2];
+ if (data[0] == 0)
+ return (0);
+
/*
* The standard approximation for standard deviation is
* sqrt(average(x**2) - average(x)**2), i.e. the square root
Modified: projects/pmac_pmu/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/pmac_pmu/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 15:21:25 2015 (r278581)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
{
ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
- ctf_buf_write(b, &id, sizeof (id));
-
if (target_requires_swap) {
SWAP_16(id);
}
+ ctf_buf_write(b, &id, sizeof (id));
+
debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
}
Modified: projects/pmac_pmu/cddl/lib/Makefile
==============================================================================
--- projects/pmac_pmu/cddl/lib/Makefile Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/lib/Makefile Wed Feb 11 15:21:25 2015 (r278581)
@@ -27,7 +27,8 @@ _libzpool= libzpool
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+ ${MACHINE_CPUARCH} == "arm"
_drti= drti
_libdtrace= libdtrace
.endif
Modified: projects/pmac_pmu/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/pmac_pmu/cddl/lib/libdtrace/Makefile Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/lib/libdtrace/Makefile Wed Feb 11 15:21:25 2015 (r278581)
@@ -81,6 +81,10 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/ut
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
.elif ${MACHINE_CPUARCH} == "powerpc"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc
Modified: projects/pmac_pmu/cddl/usr.sbin/Makefile
==============================================================================
--- projects/pmac_pmu/cddl/usr.sbin/Makefile Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/cddl/usr.sbin/Makefile Wed Feb 11 15:21:25 2015 (r278581)
@@ -30,6 +30,12 @@ _plockstat= plockstat
.endif
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace= dtrace
+_dtruss= dtruss
+_lockstat= lockstat
+.endif
+
.if ${MACHINE_CPUARCH} == "mips"
_dtrace= dtrace
.endif
Modified: projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.c
==============================================================================
--- projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.c Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.c Wed Feb 11 15:21:25 2015 (r278581)
@@ -25,6 +25,7 @@
along with this program; see the file COPYING. If not, write to
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
+#define __ARM_STATIC_INLINE
#include "unwind.h"
/* We add a prototype for abort here to avoid creating a dependency on
@@ -1089,4 +1090,11 @@ _Unwind_GetIPInfo (struct _Unwind_Contex
*ip_before_insn = 0;
return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1;
}
+
+void
+_Unwind_SetIP (struct _Unwind_Context *context, _Unwind_Ptr val)
+{
+ _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1));
+}
+
#endif
Modified: projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.h
==============================================================================
--- projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.h Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/contrib/gcc/config/arm/unwind-arm.h Wed Feb 11 15:21:25 2015 (r278581)
@@ -34,6 +34,10 @@
#define __ARM_EABI_UNWINDER__ 1
+#ifndef __ARM_STATIC_INLINE
+#define __ARM_STATIC_INLINE static inline
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -245,7 +249,7 @@ extern "C" {
return tmp;
}
- static inline _Unwind_Word
+ __ARM_STATIC_INLINE _Unwind_Word
_Unwind_GetGR (_Unwind_Context *context, int regno)
{
_uw val;
@@ -253,6 +257,12 @@ extern "C" {
return val;
}
+ __ARM_STATIC_INLINE void
+ _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val)
+ {
+ _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val);
+ }
+
#ifndef __FreeBSD__
/* Return the address of the instruction, not the actual IP value. */
#define _Unwind_GetIP(context) \
@@ -260,21 +270,16 @@ extern "C" {
#define _Unwind_GetIPInfo(context, ip_before_insn) \
(*ip_before_insn = 0, _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1)
-#else
- _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
- _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
-#endif
-
- static inline void
- _Unwind_SetGR (_Unwind_Context *context, int regno, _Unwind_Word val)
- {
- _Unwind_VRS_Set (context, _UVRSC_CORE, regno, _UVRSD_UINT32, &val);
- }
/* The dwarf unwinder doesn't understand arm/thumb state. We assume the
landing pad uses the same instruction set as the call site. */
#define _Unwind_SetIP(context, val) \
_Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1))
+#else
+ _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *);
+ _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
+ void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr);
+#endif
#ifdef __cplusplus
} /* extern "C" */
Copied: projects/pmac_pmu/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff (from r278554, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pmac_pmu/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff Wed Feb 11 15:21:25 2015 (r278581, copy of r278554, head/contrib/llvm/patches/patch-29-clang-add-mips-triples.diff)
@@ -0,0 +1,33 @@
+Allow clang to be built for mips/mips64 backend types by adding our mips
+triple ids
+
+This only allows testing and does not change the defaults for mips/mips64.
+They still build/use gcc by default.
+
+Differential Revision: https://reviews.freebsd.org/D1190
+Reviewed by: dim
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/277423
+
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -6592,6 +6592,17 @@ void freebsd::Link::ConstructJob(Compilation &C, c
+ CmdArgs.push_back("elf32ppc_fbsd");
+ }
+
++ if (Arg *A = Args.getLastArg(options::OPT_G)) {
++ if (ToolChain.getArch() == llvm::Triple::mips ||
++ ToolChain.getArch() == llvm::Triple::mipsel ||
++ ToolChain.getArch() == llvm::Triple::mips64 ||
++ ToolChain.getArch() == llvm::Triple::mips64el) {
++ StringRef v = A->getValue();
++ CmdArgs.push_back(Args.MakeArgString("-G" + v));
++ A->claim();
++ }
++ }
++
+ if (Output.isFilename()) {
+ CmdArgs.push_back("-o");
+ CmdArgs.push_back(Output.getFilename());
Copied: projects/pmac_pmu/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff (from r278554, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pmac_pmu/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff Wed Feb 11 15:21:25 2015 (r278581, copy of r278554, head/contrib/llvm/patches/patch-30-llvm-r226664-aarch64-x18.diff)
@@ -0,0 +1,83 @@
+Pull in r226664 from upstream llvm trunk (by Tim Northover):
+
+ AArch64: add backend option to reserve x18 (platform register)
+
+ AAPCS64 says that it's up to the platform to specify whether x18 is
+ reserved, and a first step on that way is to add a flag controlling
+ it.
+
+ From: Andrew Turner <andrew@fubar.geek.nz>
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/277774
+
+Index: lib/Target/AArch64/AArch64RegisterInfo.cpp
+===================================================================
+--- lib/Target/AArch64/AArch64RegisterInfo.cpp
++++ lib/Target/AArch64/AArch64RegisterInfo.cpp
+@@ -33,6 +33,10 @@ using namespace llvm;
+ #define GET_REGINFO_TARGET_DESC
+ #include "AArch64GenRegisterInfo.inc"
+
++static cl::opt<bool>
++ReserveX18("aarch64-reserve-x18", cl::Hidden,
++ cl::desc("Reserve X18, making it unavailable as GPR"));
++
+ AArch64RegisterInfo::AArch64RegisterInfo(const AArch64InstrInfo *tii,
+ const AArch64Subtarget *sti)
+ : AArch64GenRegisterInfo(AArch64::LR), TII(tii), STI(sti) {}
+@@ -90,7 +94,7 @@ AArch64RegisterInfo::getReservedRegs(const Machine
+ Reserved.set(AArch64::W29);
+ }
+
+- if (STI->isTargetDarwin()) {
++ if (STI->isTargetDarwin() || ReserveX18) {
+ Reserved.set(AArch64::X18); // Platform register
+ Reserved.set(AArch64::W18);
+ }
+@@ -117,7 +121,7 @@ bool AArch64RegisterInfo::isReservedReg(const Mach
+ return true;
+ case AArch64::X18:
+ case AArch64::W18:
+- return STI->isTargetDarwin();
++ return STI->isTargetDarwin() || ReserveX18;
+ case AArch64::FP:
+ case AArch64::W29:
+ return TFI->hasFP(MF) || STI->isTargetDarwin();
+@@ -379,7 +383,7 @@ unsigned AArch64RegisterInfo::getRegPressureLimit(
+ case AArch64::GPR64commonRegClassID:
+ return 32 - 1 // XZR/SP
+ - (TFI->hasFP(MF) || STI->isTargetDarwin()) // FP
+- - STI->isTargetDarwin() // X18 reserved as platform register
++ - (STI->isTargetDarwin() || ReserveX18) // X18 reserved as platform register
+ - hasBasePointer(MF); // X19
+ case AArch64::FPR8RegClassID:
+ case AArch64::FPR16RegClassID:
+Index: test/CodeGen/AArch64/arm64-platform-reg.ll
+===================================================================
+--- test/CodeGen/AArch64/arm64-platform-reg.ll
++++ test/CodeGen/AArch64/arm64-platform-reg.ll
+@@ -1,4 +1,5 @@
+-; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-DARWIN
++; RUN: llc -mtriple=arm64-apple-ios -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18
++; RUN: llc -mtriple=arm64-freebsd-gnu -aarch64-reserve-x18 -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE-X18
+ ; RUN: llc -mtriple=arm64-linux-gnu -o - %s | FileCheck %s
+
+ ; x18 is reserved as a platform register on Darwin but not on other
+@@ -16,11 +17,11 @@ define void @keep_live() {
+ ; CHECK: ldr x18
+ ; CHECK: str x18
+
+-; CHECK-DARWIN-NOT: ldr fp
+-; CHECK-DARWIN-NOT: ldr x18
+-; CHECK-DARWIN: Spill
+-; CHECK-DARWIN-NOT: ldr fp
+-; CHECK-DARWIN-NOT: ldr x18
+-; CHECK-DARWIN: ret
++; CHECK-RESERVE-X18-NOT: ldr fp
++; CHECK-RESERVE-X18-NOT: ldr x18
++; CHECK-RESERVE-X18: Spill
++; CHECK-RESERVE-X18-NOT: ldr fp
++; CHECK-RESERVE-X18-NOT: ldr x18
++; CHECK-RESERVE-X18: ret
+ ret void
+ }
Copied: projects/pmac_pmu/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff (from r278554, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/pmac_pmu/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff Wed Feb 11 15:21:25 2015 (r278581, copy of r278554, head/contrib/llvm/patches/patch-31-clang-r227062-fixes-x18.diff)
@@ -0,0 +1,54 @@
+Pull in r227062 from upstream clang trunk (by Renato Golin):
+
+ Allows Clang to use LLVM's fixes-x18 option
+
+ This patch allows clang to have llvm reserve the x18
+ platform register on AArch64. FreeBSD will use this in the kernel for
+ per-cpu data but has no need to reserve this register in userland so
+ will need this flag to reserve it.
+
+ This uses llvm r226664 to allow this register to be reserved.
+
+ Patch by Andrew Turner.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/277775
+
+Index: tools/clang/include/clang/Driver/Options.td
+===================================================================
+--- tools/clang/include/clang/Driver/Options.td
++++ tools/clang/include/clang/Driver/Options.td
+@@ -1141,6 +1141,9 @@ def mno_long_calls : Flag<["-"], "mno-long-calls">
+ def mgeneral_regs_only : Flag<["-"], "mgeneral-regs-only">, Group<m_aarch64_Features_Group>,
+ HelpText<"Generate code which only uses the general purpose registers (AArch64 only)">;
+
++def ffixed_x18 : Flag<["-"], "ffixed-x18">, Group<m_aarch64_Features_Group>,
++ HelpText<"Reserve the x18 register (AArch64 only)">;
++
+ def mvsx : Flag<["-"], "mvsx">, Group<m_ppc_Features_Group>;
+ def mno_vsx : Flag<["-"], "mno-vsx">, Group<m_ppc_Features_Group>;
+ def mfprnd : Flag<["-"], "mfprnd">, Group<m_ppc_Features_Group>;
+Index: tools/clang/lib/Driver/Tools.cpp
+===================================================================
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -887,6 +887,11 @@ void Clang::AddAArch64TargetArgs(const ArgList &Ar
+ if (A->getOption().matches(options::OPT_mno_global_merge))
+ CmdArgs.push_back("-mno-global-merge");
+ }
++
++ if (Args.hasArg(options::OPT_ffixed_x18)) {
++ CmdArgs.push_back("-backend-option");
++ CmdArgs.push_back("-aarch64-reserve-x18");
++ }
+ }
+
+ // Get CPU and ABI names. They are not independent
+Index: tools/clang/test/Driver/aarch64-fixed-x18.c
+===================================================================
+--- tools/clang/test/Driver/aarch64-fixed-x18.c
++++ tools/clang/test/Driver/aarch64-fixed-x18.c
+@@ -0,0 +1,4 @@
++// RUN: %clang -target aarch64-none-gnu -ffixed-x18 -### %s 2> %t
++// RUN: FileCheck --check-prefix=CHECK-FIXED-X18 < %t %s
++
++// CHECK-FIXED-X18: "-backend-option" "-aarch64-reserve-x18"
Modified: projects/pmac_pmu/contrib/mdocml/lib.in
==============================================================================
--- projects/pmac_pmu/contrib/mdocml/lib.in Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/contrib/mdocml/lib.in Wed Feb 11 15:21:25 2015 (r278581)
@@ -41,6 +41,7 @@ LINE("libcrypt", "Crypt Library (libcryp
LINE("libcurses", "Curses Library (libcurses, \\-lcurses)")
LINE("libcuse", "Userland Character Device Library (libcuse, \\-lcuse)")
LINE("libdevattr", "Device attribute and event library (libdevattr, \\-ldevattr)")
+LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)")
LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)")
LINE("libdevstat", "Device Statistics Library (libdevstat, \\-ldevstat)")
LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)")
Modified: projects/pmac_pmu/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c
==============================================================================
--- projects/pmac_pmu/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/contrib/netbsd-tests/lib/libc/gen/t_ttyname.c Wed Feb 11 15:21:25 2015 (r278581)
@@ -107,9 +107,6 @@ ATF_TC_BODY(ttyname_r_err, tc)
ATF_REQUIRE(rv == ERANGE);
}
-#ifdef __FreeBSD__
- atf_tc_expect_fail("FreeBSD returns ENOTTY instead of EBADF; see bin/191936");
-#endif
rv = ttyname_r(-1, buf, ttymax);
ATF_REQUIRE(rv == EBADF);
Modified: projects/pmac_pmu/contrib/xz/ChangeLog
==============================================================================
--- projects/pmac_pmu/contrib/xz/ChangeLog Wed Feb 11 14:59:35 2015 (r278580)
+++ projects/pmac_pmu/contrib/xz/ChangeLog Wed Feb 11 15:21:25 2015 (r278581)
@@ -1,66 +1,923 @@
-commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af
+commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 20:44:32 +0300
+Date: 2014-12-21 20:48:37 +0200
- Bump version and soname for 5.0.7.
+ DOS: Update Makefile.
+
+ dos/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 19:50:38 +0200
+
+ Windows: Fix bin_i486 to bin_i686 in build.bash.
+
+ windows/build.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cbafa710918195dbba3db02c3fab4f0538235206
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:58:44 +0200
+
+ Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c.
+
+ doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 4 deletions(-)
+
+commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:56:44 +0200
+
+ Docs: Update docs/examples/00_README.txt.
+
+ doc/examples/00_README.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:11:17 +0200
+
+ Bump version and soname for 5.2.0.
+
+ I know that soname != app version, but I skip AGE=1
+ in -version-info to make the soname match the liblzma
+ version anyway. It doesn't hurt anything as long as
+ it doesn't conflict with library versioning rules.
src/liblzma/Makefile.am | 2 +-
- src/liblzma/api/lzma/version.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/liblzma/api/lzma/version.h | 6 +++---
+ src/liblzma/liblzma.map | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3e8bd1d15e417f2d588e9be50ce027ee3d48b2da
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:05:03 +0200
+
+ Avoid variable-length arrays in the debug programs.
+
+ debug/full_flush.c | 3 ++-
+ debug/sync_flush.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 72f7307cfdceb941aeb2bf30d424cc0d13621786
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:01:45 +0200
+
+ Build: Include 04_compress_easy_mt.c in the tarball.
+
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2cb82ff21c62def11f3683a8bb0aaf363102aaa0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:00:38 +0200
+
+ Fix build when --disable-threads is used.
+
+ src/common/mythread.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9b9e3536e458ef958f66b0e8982efc9d36de4d17
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:56:15 +0100
+
+ po/fr: improve wording for help for --lzma1/--lzma2.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a8b6b569e7fadbf5b5b9139d53bc764015c15027
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:55:48 +0100
+
+ po/fr: missing line in translation of --extreme.
+
+ po/fr.po | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f168a6fd1a888cf4f0caaddcafcb21dadc6ab6e9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:33 +0200
+
+ Update NEWS for 5.2.0.
+
+ NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+
+commit cec2ee863b3a88f4bf039cb00f73c4a4fc93a429
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:22 +0200
+
+ Update NEWS for 5.0.8.
+
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 42e97a32649bf53ce43be2258b902a417c6e7fa1
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:07:54 +0200
+
+ xz: Fix a comment.
+
+ src/xz/options.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 29b95d5d6665cedffa6a9d6d3d914f981e852182
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:43:14 +0200
+
+ Update INSTALL about the dependencies of the scripts.
+
+ INSTALL | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit 3af91040bb42c21afbb81f5568c3313125e61192
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:42:33 +0200
+
+ Windows: Update build instructions.
+
+ INSTALL | 15 +++++++++------
+ windows/INSTALL-Windows.txt | 44 +++++++++++++++++++++-----------------------
+ 2 files changed, 30 insertions(+), 29 deletions(-)
+
+commit 0152f72bf6289d744823dc6c849538f3a139ad70
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:41:48 +0200
+
+ Windows: Update the build script and README-Windows.txt.
+
+ The 32-bit build is now for i686 or newer because the
+ prebuilt MinGW-w64 toolchains include i686 code in the
+ executables even if one uses -march=i486.
+
+ The build script builds 32-bit SSE2 enabled version too.
+ Run-time detection of SSE2 support would be nice (on any OS)
+ but it's not implemented in XZ Utils yet.
+
+ windows/README-Windows.txt | 30 ++++++++++++++++--------------
+ windows/build.bash | 23 ++++++++++++++---------
+ 2 files changed, 30 insertions(+), 23 deletions(-)
+
+commit 4a1f6133ee5533cee8d91e06fcc22443e5f1881a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-19 15:51:50 +0200
+
+ Windows: Define TUKLIB_SYMBOL_PREFIX in config.h.
+
+ It is to keep all symbols in the lzma_ namespace.
+
+ windows/config.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 7f7d093de79eee0c7dbfd7433647e46302f19f82
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 21:00:09 +0200
+
+ xz: Update the man page about --threads.
+
+ src/xz/xz.1 | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 009823448b82aa5f465668878a544c5842885407
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 20:57:43 +0200
+
+ xz: Update the man page about --block-size.
+
+ src/xz/xz.1 | 41 +++++++++++++++++++++++++++++++++--------
+ 1 file changed, 33 insertions(+), 8 deletions(-)
+
+commit 7dddfbeb499e528940bc12047355c184644aafe9
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:26:57 +0100
+
+ po/fr: several more translation updates: reword and handle --ignore-check.
+
+ po/fr.po | 50 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+commit 6eca5be40e04ddc4b738d493e4e56835956d8b69
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:23:01 +0100
+
+ po/fr: yet another place where my email address had to be updated.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d1003673e92ba47edd6aeeb3dbea05c18269d0e7
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:22:20 +0100
+
+ po/fr: fix several typos that have been around since the beginning.
+
+ po/fr.po | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+commit 4c5aa911a0df027e46171e368debc543d2fa72b2
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:02:31 +0100
+
+ po/fr: last batch of new translations for now.
+
+ Four new error messages.
+
+ po/fr.po | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 3e3099e36d27059499e7996fb38a62e8ab01d356
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:01:32 +0100
+
+ po/fr: translations for --threads, --block-size and --block-list.
+
+ po/fr.po | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit e7d96a5933eec4e9d4a62569ee88df0ebb0f1d53
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:00:53 +0100
+
+ po/fr: remove fuzzy marker for error messages that will be kept in English.
+
+ The following is a copy of a comment inside fr.po:
+
+ Note from translator on "file status flags".
+ The following entry is kept un-translated on purpose. It is difficult to
+ translate and should only happen in exceptional circumstances which means
+ that translating would:
+ - lose some of the meaning
+ - make it more difficult to look up in search engines; it might happen one
+ in
+ a million times, if we dilute the error message in 20 languages, it will be
+ almost impossible to find an explanation and support for the error.
+
+ po/fr.po | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+commit 46cbb9033af8a21fafe543302d6919746e0d72af
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:58:25 +0100
+
+ po/fr: several minor updates and better wording.
+
+ Meaning doesn't change at all: it's only for better wording and/or
+ formatting of a few strings.
+
+ po/fr.po | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 7ce49d444f04e73145f79c832eb4d510594b074a
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:56:12 +0100
+
+ po/fr: update my email address and copyright years.
+
+ po/fr.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 214c553ebc3047cd720da1ce5c80cf7c38118d3c
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-11-26 10:08:26 +0100
+
+ fr.po: commit file after only "update-po" so actual is readable.
+
+ po/fr.po | 311 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 199 insertions(+), 112 deletions(-)
+
+commit 1190c641af09cde85f8bd0fbe5c4906f4a29431b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-02 20:04:07 +0200
+
+ liblzma: Document how lzma_mt.block_size affects memory usage.
+
+ src/liblzma/api/lzma/container.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e4fc1d2f9571fba79ce383595be2ea2a9257def0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-28 20:07:18 +0200
+
+ Update INSTALL about a "make check" failure in test_scripts.sh.
+
+ INSTALL | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+commit 34f9e40a0a0c3bd2c2730cdb9cd550bbb8a3f2fe
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:12:27 +0200
+
+ Remove LZMA_UNSTABLE macro.
+
+ src/liblzma/api/lzma/container.h | 4 ----
+ src/liblzma/common/common.h | 2 --
+ src/xz/private.h | 1 -
+ 3 files changed, 7 deletions(-)
+
+commit 6d9c0ce9f2677b159e32b224aba5b535b304a705
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:10:33 +0200
+
+ liblzma: Update lzma_stream_encoder_mt() API docs.
+
+ src/liblzma/api/lzma/container.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 2301f3f05dd9742f42cda8f0f318864f5dc39ab3
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-25 12:32:05 +0200
+
+ liblzma: Verify the filter chain in threaded encoder initialization.
+
+ This way an invalid filter chain is detected at the Stream
+ encoder initialization instead of delaying it to the first
+ call to lzma_code() which triggers the initialization of
+ the actual filter encoder(s).
+
+ src/liblzma/common/stream_encoder_mt.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 107a263d5bb63cd3593fd6a5c938706539f84523
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 19:11:49 +0200
+
+ Build: Update m4/ax_pthread.m4 from Autoconf Archive.
+
+ m4/ax_pthread.m4 | 71 +++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 47 insertions(+), 24 deletions(-)
+
+commit b13a781833399ff5726cfc997f3cb2f0acbdbf31
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:52:21 +0200
+
+ Build: Replace obsolete AC_HELP_STRING with AS_HELP_STRING.
+
+ configure.ac | 36 ++++++++++++++++++------------------
+ m4/tuklib_integer.m4 | 2 +-
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 542cac122ed3550148a2af0033af22b757491378
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:43:19 +0200
+
+ Build: Fix Autoconf warnings about escaped backquotes.
+
+ Thanks to Daniel Richard G. for pointing out that it's
+ good to sometimes run autoreconf -fi with -Wall.
+
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 7b03a15cea8cd4f19ed680b51c4bcbae3ce4142f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:54:40 +0200
+
+ xzdiff: Use mkdir if mktemp isn't available.
+
+ src/scripts/xzdiff.in | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+commit f8c13e5e3609581d5dd9f8777985ca07f2390ad7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:45:01 +0200
+
+ xzdiff: Create a temporary directory to hold a temporary file.
+
+ This avoids the possibility of "File name too long" when
+ creating a temp file when the input file name is very long.
+
+ This also means that other users on the system can no longer
+ see the input file names in /tmp (or whatever $TMPDIR is)
+ since the temporary directory will have a generic name. This
+ usually doesn't matter since on many systems one can see
+ the arguments given to all processes anyway.
+
+ The number X chars to mktemp where increased from 6 to 10.
+
+ Note that with some shells temp files or dirs won't be used at all.
+
+ src/scripts/xzdiff.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 7716dcf9df7f457500cb657314e7a9aea5fedb06
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 15:38:47 +0200
+
+ liblzma: Fix lzma_mt.preset in lzma_stream_encoder_mt_memusage().
+
+ It read the filter chain from a wrong variable. This is a similar
+ bug that was fixed in 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e.
+
+ src/liblzma/common/stream_encoder_mt.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 230fa4a605542c84b4178a57381695a0af4e779b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 14:49:55 +0200
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4e4ae08bc7c1711e399c9f2d26eb375d39d08101
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:28:25 +0200
+
+ Update .gitignore files.
+
+ .gitignore | 2 ++
+ m4/.gitignore | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit c923b140b27d1a055db6284e10fd546ad1a7fcdb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:15:35 +0200
+
+ Build: Prepare to support Automake's subdir-objects.
+
+ Due to a bug in Automake, subdir-objects won't be enabled
+ for now.
+
+ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+
+ Thanks to Daniel Richard G. for the original patches.
+
+ configure.ac | 7 ++++++-
+ src/Makefile.am | 22 +++++++++++++++++++++-
+ src/liblzma/Makefile.am | 4 ++--
+ src/lzmainfo/Makefile.am | 4 ++--
+ src/xz/Makefile.am | 10 +++++-----
+ src/xzdec/Makefile.am | 8 ++++----
+ 6 files changed, 40 insertions(+), 15 deletions(-)
+
+commit 08c2aa16bea0df82828f665d51fba2e0a5e8997f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-24 20:09:29 +0300
+
+ Translations: Update the Italian translation.
+
+ Thanks to Milo Casagrande.
+
+ po/it.po | 452 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 275 insertions(+), 177 deletions(-)
+
+commit 2f9f61aa83539c54ff6c118a2693890f0519b3dd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-18 18:51:45 +0300
+
+ Translations: Update the Polish translation.
+
+ Thanks to Jakub Bogusz.
+
+ po/pl.po | 332 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 214 insertions(+), 118 deletions(-)
+
+commit 4f9d233f67aea25e532824d11b7642cf7dee7a76
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:30 +0200
+
+ l10n: de.po: Change translator email address.
+
+ Although the old address is still working, the new one should
+ be preferred. So this commit changes all three places in de.po
+ accordingly.
+
+ Signed-off-by: Andre Noll <maan@tuebingen.mpg.de>
+
+ po/de.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 00502b2bedad43f0cc167ac17ae0608837ee196b
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:29 +0200
+
+ l10n: de.po: Update German translation
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 531 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 281 insertions(+), 250 deletions(-)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 16:07:32 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 23806969;
Wed, 11 Feb 2015 16:07:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 0BCE43B8;
Wed, 11 Feb 2015 16:07:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BG7VJC075714;
Wed, 11 Feb 2015 16:07:31 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BG7TJu075696;
Wed, 11 Feb 2015 16:07:29 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502111607.t1BG7TJu075696@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 16:07:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278583 - in projects/release-install-debug: .
contrib/elftoolchain/libdwarf contrib/top share/info share/man/man4
sys/arm/arm sys/arm/xscale/ixp425 sys/boot/arm/ixp425/boot2 sys/boot/p...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 16:07:32 -0000
Author: gjb
Date: Wed Feb 11 16:07:28 2015
New Revision: 278583
URL: https://svnweb.freebsd.org/changeset/base/278583
Log:
MFH: r278551-r278582
Sponsored by: The FreeBSD Foundation
Deleted:
projects/release-install-debug/share/info/
Modified:
projects/release-install-debug/Makefile.inc1
projects/release-install-debug/UPDATING
projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.h
projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
projects/release-install-debug/contrib/top/utils.c
projects/release-install-debug/share/man/man4/ral.4
projects/release-install-debug/sys/arm/arm/db_trace.c
projects/release-install-debug/sys/arm/xscale/ixp425/if_npe.c
projects/release-install-debug/sys/boot/arm/ixp425/boot2/ixp425_board.c
projects/release-install-debug/sys/boot/pc98/boot2/Makefile
projects/release-install-debug/sys/contrib/dev/ral/microcode.h
projects/release-install-debug/sys/contrib/dev/ral/rt2860.fw.uu
projects/release-install-debug/sys/dev/hwpmc/hwpmc_armv7.c
projects/release-install-debug/sys/dev/ral/if_ral_pci.c
projects/release-install-debug/sys/dev/ral/rt2860.c
projects/release-install-debug/sys/dev/ral/rt2860reg.h
Directory Properties:
projects/release-install-debug/ (props changed)
projects/release-install-debug/contrib/elftoolchain/ (props changed)
projects/release-install-debug/contrib/top/ (props changed)
projects/release-install-debug/share/ (props changed)
projects/release-install-debug/share/man/man4/ (props changed)
projects/release-install-debug/sys/ (props changed)
projects/release-install-debug/sys/boot/ (props changed)
Modified: projects/release-install-debug/Makefile.inc1
==============================================================================
--- projects/release-install-debug/Makefile.inc1 Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/Makefile.inc1 Wed Feb 11 16:07:28 2015 (r278583)
@@ -50,10 +50,6 @@
.include <bsd.arch.inc.mk>
.include <bsd.compiler.mk>
-# We must do share/info early so that installation of info `dir'
-# entries works correctly. Do it first since it is less likely to
-# grow dependencies on include and lib than vice versa.
-#
# We must do lib/ and libexec/ before bin/, because if installworld
# installs a new /bin/sh, the 'make' command will *immediately*
# use that new version. And the new (dynamically-linked) /bin/sh
@@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
-SUBDIR= share/info lib libexec
+SUBDIR= lib libexec
SUBDIR+=bin
.if ${MK_GAMES} != "no"
SUBDIR+=games
Modified: projects/release-install-debug/UPDATING
==============================================================================
--- projects/release-install-debug/UPDATING Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/UPDATING Wed Feb 11 16:07:28 2015 (r278583)
@@ -292,6 +292,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
The lindev device has been removed since /dev/full has been made a
standard device. __FreeBSD_version has been bumped.
+20140424:
+ The knob WITHOUT_VI was added to the base system, which controls
+ building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1)
+ in order to reorder files share/termcap and didn't build ex(1) as a
+ build tool, so building/installing with WITH_VI is highly advised for
+ build hosts for older releases.
+
+ This issue has been fixed in stable/9 and stable/10 in r277022 and
+ r276991, respectively.
+
20140418:
The YES_HESIOD knob has been removed. It has been obsolete for
a decade. Please move to using WITH_HESIOD instead or your builds
Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.h Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.h Wed Feb 11 16:07:28 2015 (r278583)
@@ -439,6 +439,7 @@ enum Dwarf_ISA {
DW_ISA_SPARC,
DW_ISA_X86,
DW_ISA_X86_64,
+ DW_ISA_AARCH64,
DW_ISA_MAX
};
Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Wed Feb 11 16:07:28 2015 (r278583)
@@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
assert(dbg != NULL);
switch (dbg->dbgp_isa) {
+ case DW_ISA_AARCH64:
+ return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
case DW_ISA_X86:
return (R_386_32);
case DW_ISA_X86_64:
@@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
switch (dbg->dbg_machine) {
case EM_NONE:
break;
+ case EM_AARCH64:
+ if (rel_type == R_AARCH64_ABS32)
+ return (4);
+ else if (rel_type == R_AARCH64_ABS64)
+ return (8);
+ break;
case EM_ARM:
if (rel_type == R_ARM_ABS32)
return (4);
Modified: projects/release-install-debug/contrib/top/utils.c
==============================================================================
--- projects/release-install-debug/contrib/top/utils.c Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/contrib/top/utils.c Wed Feb 11 16:07:28 2015 (r278583)
@@ -58,6 +58,7 @@ char *str;
* ever convert will be 2^32-1, which is 10
* digits.
*/
+_Static_assert(sizeof(int) <= 4, "buffer too small for this sized int");
char *itoa(val)
Modified: projects/release-install-debug/share/man/man4/ral.4
==============================================================================
--- projects/release-install-debug/share/man/man4/ral.4 Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/share/man/man4/ral.4 Wed Feb 11 16:07:28 2015 (r278583)
@@ -42,7 +42,7 @@ if_ral_load="YES"
The
.Nm
driver supports PCI/PCIe/CardBus wireless adapters based on the Ralink RT2500,
-RT2501, RT2600, RT2700, RT2800 and RT3090 chipsets.
+RT2501, RT2600, RT2700, RT2800, RT3090 and RT3900E chipsets.
.Pp
The RT2500 chipset is the first generation of 802.11b/g adapters from Ralink.
It consists of two integrated chips, an RT2560 MAC/BBP and an RT2525 radio
@@ -104,6 +104,13 @@ interfaces may be operated together with
.Cm hostap
interface to construct a wireless repeater device.
.Pp
+The RT3900E chipset is a single-chip 802.11n adapters from Ralink.
+The MAC/Baseband Processor can be an RT5390 or RT5392.
+The RT5390 chip operates in the 2GHz spectrum and supports 1 transmit path
+and 1 receiver path (1T1R).
+The RT5392 chip operates in the 2GHz spectrum and supports up to 2 transmit
+paths and 2 receiver paths (2T2R).
+.Pp
The transmit speed is user-selectable or can be adapted automatically by the
driver depending on the number of hardware transmission retries.
For more information on configuring this device, see
@@ -142,6 +149,7 @@ chipsets, including:
.It "Compex WLP54G" Ta RT2560 Ta PCI
.It "Conceptronic C54RC" Ta RT2560 Ta CardBus
.It "Conceptronic C54Ri" Ta RT2560 Ta PCI
+.It "D-Link DWA-525 rev A2" Ta RT5392 Ta PCI
.It "Digitus DN-7001G-RA" Ta RT2560 Ta CardBus
.It "Digitus DN-7006G-RA" Ta RT2560 Ta PCI
.It "E-Tech WGPC02" Ta RT2560 Ta CardBus
Modified: projects/release-install-debug/sys/arm/arm/db_trace.c
==============================================================================
--- projects/release-install-debug/sys/arm/arm/db_trace.c Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/sys/arm/arm/db_trace.c Wed Feb 11 16:07:28 2015 (r278583)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <ddb/db_sym.h>
#include <ddb/db_output.h>
-#ifdef __ARM_EABI__
/*
* Definitions for the instruction interpreter.
*
@@ -453,131 +452,6 @@ db_stack_trace_cmd(struct unwind_state *
}
}
}
-#endif
-
-/*
- * APCS stack frames are awkward beasts, so I don't think even trying to use
- * a structure to represent them is a good idea.
- *
- * Here's the diagram from the APCS. Increasing address is _up_ the page.
- *
- * save code pointer [fp] <- fp points to here
- * return link value [fp, #-4]
- * return sp value [fp, #-8]
- * return fp value [fp, #-12]
- * [saved v7 value]
- * [saved v6 value]
- * [saved v5 value]
- * [saved v4 value]
- * [saved v3 value]
- * [saved v2 value]
- * [saved v1 value]
- * [saved a4 value]
- * [saved a3 value]
- * [saved a2 value]
- * [saved a1 value]
- *
- * The save code pointer points twelve bytes beyond the start of the
- * code sequence (usually a single STM) that created the stack frame.
- * We have to disassemble it if we want to know which of the optional
- * fields are actually present.
- */
-
-#ifndef __ARM_EABI__ /* The frame format is differend in AAPCS */
-static void
-db_stack_trace_cmd(db_expr_t addr, db_expr_t count, boolean_t kernel_only)
-{
- u_int32_t *frame, *lastframe;
- c_db_sym_t sym;
- const char *name;
- db_expr_t value;
- db_expr_t offset;
- int scp_offset;
-
- frame = (u_int32_t *)addr;
- lastframe = NULL;
- scp_offset = -(get_pc_str_offset() >> 2);
-
- while (count-- && frame != NULL && !db_pager_quit) {
- db_addr_t scp;
- u_int32_t savecode;
- int r;
- u_int32_t *rp;
- const char *sep;
-
- /*
- * In theory, the SCP isn't guaranteed to be in the function
- * that generated the stack frame. We hope for the best.
- */
- scp = frame[FR_SCP];
-
- sym = db_search_symbol(scp, DB_STGY_ANY, &offset);
- if (sym == C_DB_SYM_NULL) {
- value = 0;
- name = "(null)";
- } else
- db_symbol_values(sym, &name, &value);
- db_printf("%s() at ", name);
- db_printsym(scp, DB_STGY_PROC);
- db_printf("\n");
-#ifdef __PROG26
- db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV] & R15_PC);
- db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC);
- db_printf(")\n");
-#else
- db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV]);
- db_printsym(frame[FR_RLV], DB_STGY_PROC);
- db_printf(")\n");
-#endif
- db_printf("\trsp=0x%08x rfp=0x%08x", frame[FR_RSP], frame[FR_RFP]);
-
- savecode = ((u_int32_t *)scp)[scp_offset];
- if ((savecode & 0x0e100000) == 0x08000000) {
- /* Looks like an STM */
- rp = frame - 4;
- sep = "\n\t";
- for (r = 10; r >= 0; r--) {
- if (savecode & (1 << r)) {
- db_printf("%sr%d=0x%08x",
- sep, r, *rp--);
- sep = (frame - rp) % 4 == 2 ?
- "\n\t" : " ";
- }
- }
- }
-
- db_printf("\n");
-
- /*
- * Switch to next frame up
- */
- if (frame[FR_RFP] == 0)
- break; /* Top of stack */
-
- lastframe = frame;
- frame = (u_int32_t *)(frame[FR_RFP]);
-
- if (INKERNEL((int)frame)) {
- /* staying in kernel */
- if (frame <= lastframe) {
- db_printf("Bad frame pointer: %p\n", frame);
- break;
- }
- } else if (INKERNEL((int)lastframe)) {
- /* switch from user to kernel */
- if (kernel_only)
- break; /* kernel stack only */
- } else {
- /* in user */
- if (frame <= lastframe) {
- db_printf("Bad user frame pointer: %p\n",
- frame);
- break;
- }
- }
- }
-}
-#endif
/* XXX stubs */
void
@@ -600,24 +474,18 @@ db_md_set_watchpoint(db_expr_t addr, db_
int
db_trace_thread(struct thread *thr, int count)
{
-#ifdef __ARM_EABI__
struct unwind_state state;
-#endif
struct pcb *ctx;
if (thr != curthread) {
ctx = kdb_thr_ctx(thr);
-#ifdef __ARM_EABI__
state.registers[FP] = ctx->pcb_regs.sf_r11;
state.registers[SP] = ctx->pcb_regs.sf_sp;
state.registers[LR] = ctx->pcb_regs.sf_lr;
state.registers[PC] = ctx->pcb_regs.sf_pc;
db_stack_trace_cmd(&state);
-#else
- db_stack_trace_cmd(ctx->pcb_regs.sf_r11, -1, TRUE);
-#endif
} else
db_trace_self();
return (0);
@@ -626,7 +494,6 @@ db_trace_thread(struct thread *thr, int
void
db_trace_self(void)
{
-#ifdef __ARM_EABI__
struct unwind_state state;
uint32_t sp;
@@ -639,10 +506,4 @@ db_trace_self(void)
state.registers[PC] = (uint32_t)db_trace_self;
db_stack_trace_cmd(&state);
-#else
- db_addr_t addr;
-
- addr = (db_addr_t)__builtin_frame_address(0);
- db_stack_trace_cmd(addr, -1, FALSE);
-#endif
}
Modified: projects/release-install-debug/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- projects/release-install-debug/sys/arm/xscale/ixp425/if_npe.c Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/sys/arm/xscale/ixp425/if_npe.c Wed Feb 11 16:07:28 2015 (r278583)
@@ -285,7 +285,7 @@ unit2npeid(int unit)
};
/* XXX check feature register instead */
return (unit < 3 ? npeidmap[
- (cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
+ (cpu_ident() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
}
static int
Modified: projects/release-install-debug/sys/boot/arm/ixp425/boot2/ixp425_board.c
==============================================================================
--- projects/release-install-debug/sys/boot/arm/ixp425/boot2/ixp425_board.c Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/sys/boot/arm/ixp425/boot2/ixp425_board.c Wed Feb 11 16:07:28 2015 (r278583)
@@ -74,7 +74,7 @@ board_init(void)
{
struct board_config **pbp;
- cputype = cpu_id() & CPU_ID_CPU_MASK;
+ cputype = cpu_ident() & CPU_ID_CPU_MASK;
SET_FOREACH(pbp, boards)
/* XXX pass down redboot board type */
Modified: projects/release-install-debug/sys/boot/pc98/boot2/Makefile
==============================================================================
--- projects/release-install-debug/sys/boot/pc98/boot2/Makefile Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/sys/boot/pc98/boot2/Makefile Wed Feb 11 16:07:28 2015 (r278583)
@@ -92,6 +92,7 @@ boot2.out: ${BTXCRT} boot2.o sio.o
${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
boot2.o: boot2.s
+ ${CC} ${ACFLAGS} -c boot2.s
SRCS= boot2.c boot2.h
Modified: projects/release-install-debug/sys/contrib/dev/ral/microcode.h
==============================================================================
--- projects/release-install-debug/sys/contrib/dev/ral/microcode.h Wed Feb 11 15:49:14 2015 (r278582)
+++ projects/release-install-debug/sys/contrib/dev/ral/microcode.h Wed Feb 11 16:07:28 2015 (r278583)
@@ -2268,24 +2268,24 @@ static const uint8_t rt2661[] = {
};
static const uint8_t rt2860[] = {
- 0x02, 0x03, 0x5b, 0x02, 0x02, 0xa6, 0x22, 0x22, 0xff, 0xff, 0xff,
+ 0x02, 0x02, 0xa3, 0x02, 0x02, 0x2e, 0x22, 0xff, 0xff, 0xff, 0xff,
0x02, 0x01, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x1e,
0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0xdd, 0xc0, 0xe0, 0xc0,
0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x75, 0xd0, 0x18, 0xc2,
0xaf, 0x30, 0x45, 0x03, 0x12, 0x10, 0x09, 0x90, 0x04, 0x16, 0xe0,
0x30, 0xe3, 0x03, 0x74, 0x08, 0xf0, 0x90, 0x04, 0x14, 0xe0, 0x20,
0xe7, 0x03, 0x02, 0x00, 0xcb, 0x74, 0x80, 0xf0, 0x90, 0x70, 0x12,
- 0xe0, 0xf5, 0x36, 0x90, 0x04, 0x04, 0xe0, 0x24, 0xcf, 0x60, 0x30,
+ 0xe0, 0xf5, 0x24, 0x90, 0x04, 0x04, 0xe0, 0x24, 0xcf, 0x60, 0x30,
0x14, 0x60, 0x42, 0x24, 0xe2, 0x60, 0x47, 0x14, 0x60, 0x55, 0x24,
0x21, 0x70, 0x60, 0xe5, 0x55, 0x24, 0xfe, 0x60, 0x07, 0x14, 0x60,
0x08, 0x24, 0x02, 0x70, 0x08, 0x7d, 0x01, 0x80, 0x28, 0x7d, 0x02,
- 0x80, 0x24, 0x90, 0x70, 0x10, 0xe0, 0xf5, 0x50, 0x85, 0x36, 0x40,
+ 0x80, 0x24, 0x90, 0x70, 0x10, 0xe0, 0xf5, 0x50, 0x85, 0x24, 0x40,
0xd2, 0x01, 0x80, 0x3e, 0xe5, 0x55, 0x64, 0x03, 0x60, 0x04, 0xe5,
- 0x55, 0x70, 0x04, 0x7d, 0x02, 0x80, 0x09, 0x85, 0x36, 0x41, 0xd2,
- 0x02, 0x80, 0x29, 0xad, 0x55, 0xaf, 0x36, 0x12, 0x02, 0x82, 0x80,
+ 0x55, 0x70, 0x04, 0x7d, 0x02, 0x80, 0x09, 0x85, 0x24, 0x41, 0xd2,
+ 0x02, 0x80, 0x29, 0xad, 0x55, 0xaf, 0x24, 0x12, 0x02, 0x0a, 0x80,
0x20, 0x90, 0x70, 0x10, 0xe0, 0xf5, 0x47, 0x90, 0x70, 0x11, 0xe0,
0xf5, 0x44, 0x12, 0x10, 0x25, 0x80, 0x06, 0x90, 0x70, 0x10, 0xe0,
- 0xf5, 0x45, 0xe4, 0xfd, 0xaf, 0x36, 0x12, 0x02, 0x82, 0xd2, 0x04,
+ 0xf5, 0x45, 0xe4, 0xfd, 0xaf, 0x24, 0x12, 0x02, 0x0a, 0xd2, 0x04,
0x90, 0x70, 0x13, 0xe4, 0xf0, 0x90, 0x70, 0x13, 0xe4, 0xf0, 0xd2,
0xaf, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xf0, 0xd0, 0xe0,
0x32, 0xc0, 0xe0, 0xc0, 0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0,
@@ -2302,54 +2302,54 @@ static const uint8_t rt2860[] = {
0x15, 0x50, 0x80, 0x02, 0xc2, 0x59, 0xd5, 0x53, 0x07, 0x30, 0x60,
0x04, 0x15, 0x46, 0xd2, 0x04, 0x30, 0x45, 0x03, 0x12, 0x10, 0x0f,
0xc2, 0x8d, 0xd2, 0xaf, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, 0xd0,
- 0xf0, 0xd0, 0xe0, 0x32, 0x90, 0x70, 0x2a, 0xe0, 0x30, 0xe1, 0x43,
- 0xc2, 0xaf, 0x90, 0x70, 0x28, 0xe0, 0x90, 0x10, 0x1c, 0xf0, 0x90,
- 0x70, 0x29, 0xe0, 0x90, 0x10, 0x1d, 0xf0, 0x90, 0x70, 0x2a, 0xe0,
- 0x90, 0x10, 0x1e, 0xf0, 0x90, 0x10, 0x1c, 0xe0, 0xf5, 0x37, 0x90,
- 0x10, 0x1e, 0xe0, 0x20, 0xe1, 0xf3, 0x90, 0x10, 0x1c, 0xe0, 0x90,
- 0x70, 0x28, 0xf0, 0x90, 0x10, 0x1d, 0xe0, 0x90, 0x70, 0x29, 0xf0,
- 0x90, 0x10, 0x1e, 0xe0, 0x90, 0x70, 0x2a, 0xf0, 0xc2, 0x05, 0xd2,
- 0xaf, 0x22, 0x12, 0x02, 0xc8, 0x30, 0x45, 0x03, 0x12, 0x10, 0x03,
- 0x30, 0x01, 0x06, 0x20, 0x09, 0x03, 0x12, 0x10, 0x1c, 0x30, 0x02,
- 0x06, 0x20, 0x0a, 0x03, 0x12, 0x10, 0x1f, 0x30, 0x03, 0x06, 0x20,
- 0x0b, 0x03, 0x12, 0x10, 0x1f, 0x30, 0x04, 0x06, 0x20, 0x0c, 0x03,
- 0x12, 0x10, 0x22, 0x20, 0x13, 0x09, 0x20, 0x11, 0x06, 0xe5, 0x2b,
- 0x45, 0x2c, 0x60, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0xa9, 0x12,
- 0x03, 0x1c, 0x80, 0xbf, 0xc2, 0x43, 0xd2, 0x45, 0xe4, 0xf5, 0x20,
- 0xf5, 0x21, 0xf5, 0x53, 0xf5, 0x46, 0xf5, 0x2b, 0xf5, 0x2c, 0xc2,
- 0x42, 0xf5, 0x51, 0xf5, 0x52, 0xf5, 0x55, 0x90, 0x04, 0x18, 0x74,
- 0x80, 0xf0, 0x90, 0x04, 0x1a, 0x74, 0x08, 0xf0, 0xc2, 0x1a, 0xc2,
- 0x18, 0xc2, 0x1b, 0x22, 0xc8, 0xef, 0xc8, 0xe6, 0xfa, 0x08, 0xe6,
- 0x4a, 0x60, 0x0c, 0xc8, 0xef, 0xc8, 0x08, 0xe6, 0x16, 0x18, 0x70,
- 0x01, 0x16, 0xc3, 0x22, 0xed, 0x24, 0xff, 0xfd, 0xec, 0x34, 0xff,
- 0xc8, 0xef, 0xc8, 0xf6, 0x08, 0xc6, 0xed, 0xc6, 0xd3, 0x22, 0xd0,
- 0x83, 0xd0, 0x82, 0xf8, 0xe4, 0x93, 0x70, 0x12, 0x74, 0x01, 0x93,
- 0x70, 0x0d, 0xa3, 0xa3, 0x93, 0xf8, 0x74, 0x01, 0x93, 0xf5, 0x82,
- 0x88, 0x83, 0xe4, 0x73, 0x74, 0x02, 0x93, 0x68, 0x60, 0xef, 0xa3,
- 0xa3, 0xa3, 0x80, 0xdf, 0xef, 0xf4, 0x60, 0x1f, 0xe4, 0xfe, 0x12,
- 0x03, 0x67, 0xe0, 0xb4, 0xff, 0x12, 0x12, 0x03, 0x67, 0xef, 0xf0,
- 0x74, 0x1c, 0x2e, 0xf5, 0x82, 0xe4, 0x34, 0x70, 0xf5, 0x83, 0xed,
- 0xf0, 0x22, 0x0e, 0xbe, 0x04, 0xe3, 0x22, 0xc0, 0xe0, 0xc0, 0xf0,
- 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x75, 0xd0, 0x08, 0xc2, 0xaf,
- 0x30, 0x45, 0x03, 0x12, 0x10, 0x06, 0xd2, 0xaf, 0xd0, 0xd0, 0xd0,
- 0x82, 0xd0, 0x83, 0xd0, 0xf0, 0xd0, 0xe0, 0x32, 0xc2, 0xaf, 0x12,
- 0x00, 0x06, 0x12, 0x02, 0x09, 0x12, 0x02, 0xe1, 0xe4, 0xf5, 0x22,
- 0xf5, 0x47, 0x90, 0x04, 0x00, 0x74, 0x80, 0xf0, 0xd2, 0xaf, 0x22,
- 0x75, 0x89, 0x02, 0xe4, 0xf5, 0x8c, 0xf5, 0x8a, 0xf5, 0x88, 0xf5,
- 0xb8, 0xf5, 0xe8, 0x75, 0x90, 0x18, 0xd2, 0x8c, 0x75, 0xa8, 0x05,
- 0x22, 0xef, 0x60, 0x03, 0x1f, 0x80, 0xfa, 0x22, 0xff, 0xc0, 0x26,
+ 0xf0, 0xd0, 0xe0, 0x32, 0x12, 0x02, 0x50, 0x30, 0x45, 0x03, 0x12,
+ 0x10, 0x03, 0x30, 0x01, 0x06, 0x20, 0x09, 0x03, 0x12, 0x10, 0x1c,
+ 0x30, 0x02, 0x06, 0x20, 0x0a, 0x03, 0x12, 0x10, 0x1f, 0x30, 0x03,
+ 0x06, 0x20, 0x0b, 0x03, 0x12, 0x10, 0x1f, 0x30, 0x04, 0x06, 0x20,
+ 0x0c, 0x03, 0x12, 0x10, 0x22, 0x20, 0x13, 0x09, 0x20, 0x11, 0x06,
+ 0xe5, 0x2b, 0x45, 0x2c, 0x60, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92,
+ 0xa9, 0x12, 0x02, 0x80, 0x80, 0xbf, 0xc2, 0x43, 0xd2, 0x45, 0xe4,
+ 0xf5, 0x20, 0xf5, 0x21, 0xf5, 0x53, 0xf5, 0x46, 0xf5, 0x2b, 0xf5,
+ 0x2c, 0xc2, 0x42, 0xf5, 0x51, 0xf5, 0x52, 0xf5, 0x55, 0x90, 0x04,
+ 0x18, 0x74, 0x80, 0xf0, 0x90, 0x04, 0x1a, 0x74, 0x08, 0xf0, 0x22,
+ 0xd0, 0x83, 0xd0, 0x82, 0xf8, 0xe4, 0x93, 0x70, 0x12, 0x74, 0x01,
+ 0x93, 0x70, 0x0d, 0xa3, 0xa3, 0x93, 0xf8, 0x74, 0x01, 0x93, 0xf5,
+ 0x82, 0x88, 0x83, 0xe4, 0x73, 0x74, 0x02, 0x93, 0x68, 0x60, 0xef,
+ 0xa3, 0xa3, 0xa3, 0x80, 0xdf, 0xef, 0xf4, 0x60, 0x1f, 0xe4, 0xfe,
+ 0x12, 0x02, 0xaf, 0xe0, 0xb4, 0xff, 0x12, 0x12, 0x02, 0xaf, 0xef,
+ 0xf0, 0x74, 0x1c, 0x2e, 0xf5, 0x82, 0xe4, 0x34, 0x70, 0xf5, 0x83,
+ 0xed, 0xf0, 0x22, 0x0e, 0xbe, 0x04, 0xe3, 0x22, 0xc0, 0xe0, 0xc0,
+ 0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x75, 0xd0, 0x08, 0xc2,
+ 0xaf, 0x30, 0x45, 0x03, 0x12, 0x10, 0x06, 0xd2, 0xaf, 0xd0, 0xd0,
+ 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xf0, 0xd0, 0xe0, 0x32, 0xc2, 0xaf,
+ 0x12, 0x00, 0x06, 0x12, 0x01, 0xbe, 0x12, 0x02, 0x69, 0xe4, 0xf5,
+ 0x22, 0xf5, 0x47, 0x90, 0x04, 0x00, 0x74, 0x80, 0xf0, 0xd2, 0xaf,
+ 0x22, 0x75, 0x89, 0x02, 0xe4, 0xf5, 0x8c, 0xf5, 0x8a, 0xf5, 0x88,
+ 0xf5, 0xb8, 0xf5, 0xe8, 0x75, 0x90, 0x18, 0xd2, 0x8c, 0x75, 0xa8,
+ 0x05, 0x22, 0x30, 0x45, 0x03, 0x12, 0x10, 0x15, 0xe5, 0x20, 0x70,
+ 0x03, 0x20, 0x10, 0x03, 0x30, 0x11, 0x03, 0x43, 0x87, 0x01, 0x22,
+ 0xce, 0xef, 0xce, 0xee, 0x60, 0x08, 0x7f, 0xff, 0x12, 0x02, 0xc5,
+ 0x1e, 0x80, 0xf5, 0x22, 0x78, 0x7f, 0xe4, 0xf6, 0xd8, 0xfd, 0x75,
+ 0x81, 0x5f, 0x02, 0x01, 0x7a, 0x74, 0x14, 0x2e, 0xf5, 0x82, 0xe4,
+ 0x34, 0x70, 0xf5, 0x83, 0x22, 0xef, 0x90, 0x02, 0xc3, 0x93, 0x90,
+ 0x03, 0x00, 0x73, 0x0a, 0x18, 0xef, 0x60, 0x03, 0x1f, 0x80, 0xfa,
+ 0x22, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x26,
0x74, 0x03, 0xc0, 0xe0, 0xc0, 0x82, 0xc0, 0x83, 0x75, 0x26, 0x0a,
0x22, 0xc0, 0x26, 0x74, 0x03, 0xc0, 0xe0, 0xc0, 0x82, 0xc0, 0x83,
- 0x75, 0x26, 0x18, 0x22, 0x30, 0x45, 0x03, 0x12, 0x10, 0x15, 0xe5,
- 0x20, 0x70, 0x03, 0x20, 0x10, 0x03, 0x30, 0x11, 0x03, 0x43, 0x87,
- 0x01, 0x22, 0xce, 0xef, 0xce, 0xee, 0x60, 0x08, 0x7f, 0xff, 0x12,
- 0x02, 0xf8, 0x1e, 0x80, 0xf5, 0x22, 0xc8, 0xef, 0xc8, 0xe6, 0x60,
- 0x03, 0x16, 0xc3, 0x22, 0xed, 0x14, 0xf6, 0xd3, 0x22, 0xc8, 0xef,
- 0xc8, 0xe6, 0x60, 0x06, 0x16, 0xe6, 0x24, 0xff, 0xb3, 0x22, 0xc3,
- 0x22, 0x78, 0x7f, 0xe4, 0xf6, 0xd8, 0xfd, 0x75, 0x81, 0x5f, 0x02,
- 0x01, 0xc5, 0x74, 0x14, 0x2e, 0xf5, 0x82, 0xe4, 0x34, 0x70, 0xf5,
- 0x83, 0x22, 0xef, 0x90, 0x03, 0x7b, 0x93, 0x90, 0x03, 0x00, 0x73,
- 0x0a, 0x18, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x75, 0x26, 0x18, 0x22, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -2641,318 +2641,318 @@ static const uint8_t rt2860[] = {
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x10, 0x28, 0x02,
- 0x10, 0x3b, 0x02, 0x10, 0x3c, 0x02, 0x13, 0xbc, 0x02, 0x13, 0xbd,
- 0x02, 0x14, 0x72, 0x02, 0x14, 0x73, 0xc3, 0x22, 0xff, 0xff, 0x02,
- 0x19, 0x4a, 0x02, 0x1a, 0xf4, 0x02, 0x15, 0x6c, 0x02, 0x14, 0xa7,
- 0x30, 0x05, 0x06, 0x20, 0x0d, 0x03, 0x12, 0x01, 0x7a, 0x30, 0x06,
- 0x06, 0x20, 0x0e, 0x03, 0x12, 0x1c, 0x2e, 0x22, 0x22, 0x90, 0x04,
- 0x14, 0xe0, 0x20, 0xe7, 0x03, 0x02, 0x13, 0xbb, 0x90, 0x70, 0x12,
- 0xe0, 0xf5, 0x56, 0x90, 0x04, 0x04, 0xe0, 0x12, 0x02, 0x5c, 0x10,
- 0xfb, 0x30, 0x10, 0xd2, 0x31, 0x10, 0x93, 0x33, 0x10, 0xa1, 0x34,
- 0x10, 0xb4, 0x35, 0x10, 0xab, 0x36, 0x11, 0x09, 0x50, 0x11, 0x4e,
- 0x51, 0x11, 0x57, 0x52, 0x11, 0x57, 0x53, 0x11, 0x57, 0x54, 0x11,
- 0x93, 0x55, 0x11, 0xf0, 0x56, 0x12, 0x43, 0x70, 0x12, 0x69, 0x71,
- 0x12, 0x92, 0x72, 0x13, 0x3e, 0x73, 0x13, 0x61, 0x80, 0x13, 0x88,
- 0x83, 0x13, 0xa0, 0x84, 0x00, 0x00, 0x13, 0xbb, 0xd2, 0x18, 0xd2,
- 0x61, 0x75, 0x35, 0x2a, 0x75, 0x32, 0x0b, 0x75, 0x33, 0xb8, 0x22,
- 0xc2, 0x18, 0x90, 0x01, 0x14, 0xe0, 0x54, 0xfd, 0xf0, 0x22, 0x90,
- 0x70, 0x11, 0xe0, 0xf5, 0x3c, 0x02, 0x13, 0xb5, 0xe5, 0x55, 0xb4,
+ 0x10, 0x32, 0x02, 0x10, 0x33, 0x02, 0x14, 0xc2, 0x02, 0x14, 0xc3,
+ 0x02, 0x15, 0x8f, 0x02, 0x15, 0x90, 0xc3, 0x22, 0xff, 0xff, 0x02,
+ 0x1a, 0x6f, 0x02, 0x1b, 0xec, 0x02, 0x16, 0xbc, 0x02, 0x15, 0xf7,
+ 0x30, 0x05, 0x06, 0x20, 0x0d, 0x03, 0x12, 0x1d, 0x19, 0x22, 0x22,
+ 0x90, 0x04, 0x14, 0xe0, 0x20, 0xe7, 0x03, 0x02, 0x14, 0xc1, 0x90,
+ 0x70, 0x12, 0xe0, 0xf5, 0x56, 0x90, 0x04, 0x04, 0xe0, 0x12, 0x01,
+ 0xe4, 0x10, 0xda, 0x30, 0x10, 0xb1, 0x31, 0x10, 0x93, 0x35, 0x10,
+ 0x8a, 0x36, 0x10, 0xe7, 0x40, 0x10, 0xfe, 0x41, 0x11, 0x15, 0x50,
+ 0x11, 0x5a, 0x51, 0x11, 0x63, 0x52, 0x11, 0x63, 0x53, 0x11, 0x63,
+ 0x54, 0x11, 0x9f, 0x55, 0x11, 0xfc, 0x56, 0x12, 0x4f, 0x64, 0x12,
+ 0x6a, 0x72, 0x13, 0x1e, 0x73, 0x13, 0x42, 0x74, 0x14, 0x35, 0x80,
+ 0x14, 0xa5, 0x83, 0x14, 0x5c, 0x91, 0x00, 0x00, 0x14, 0xc1, 0x90,
+ 0x70, 0x11, 0xe0, 0xf5, 0x3c, 0x02, 0x14, 0xbb, 0xe5, 0x55, 0xb4,
0x02, 0x0f, 0xe5, 0x58, 0x30, 0xe0, 0x06, 0x90, 0x01, 0x0d, 0x74,
0x08, 0xf0, 0x7d, 0x01, 0x80, 0x02, 0x7d, 0x02, 0xaf, 0x56, 0x12,
- 0x02, 0x82, 0x02, 0x13, 0xb5, 0x20, 0x02, 0x03, 0x30, 0x03, 0x0a,
- 0x7d, 0x02, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x02, 0x13, 0xb5, 0xe5,
- 0x34, 0xd3, 0x94, 0x01, 0x40, 0x0c, 0x90, 0x01, 0x0c, 0xe0, 0x44,
+ 0x02, 0x0a, 0x02, 0x14, 0xbb, 0x20, 0x02, 0x03, 0x30, 0x03, 0x0a,
+ 0x7d, 0x02, 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x02, 0x14, 0xbb, 0xe5,
+ 0x30, 0xd3, 0x94, 0x01, 0x40, 0x0c, 0x90, 0x01, 0x0c, 0xe0, 0x44,
0x02, 0xf0, 0xa3, 0xe0, 0x44, 0x04, 0xf0, 0x85, 0x56, 0x41, 0xd2,
- 0x02, 0x22, 0x90, 0x70, 0x11, 0xe0, 0xf4, 0x70, 0x03, 0x02, 0x13,
- 0xbb, 0xe0, 0xf5, 0x30, 0x22, 0xe5, 0x34, 0xd3, 0x94, 0x01, 0x40,
- 0x07, 0xe5, 0x55, 0x60, 0x03, 0x02, 0x13, 0xbb, 0x90, 0x70, 0x10,
- 0xe0, 0x54, 0x7f, 0xff, 0xbf, 0x0a, 0x0d, 0x90, 0x70, 0x11, 0xe0,
- 0xb4, 0x08, 0x06, 0x75, 0x4e, 0x01, 0x75, 0x4f, 0x84, 0x90, 0x70,
- 0x10, 0xe0, 0x54, 0x7f, 0xff, 0xbf, 0x02, 0x12, 0x90, 0x70, 0x11,
- 0xe0, 0x64, 0x08, 0x60, 0x04, 0xe0, 0xb4, 0x20, 0x06, 0x75, 0x4e,
- 0x03, 0x75, 0x4f, 0x20, 0xe4, 0xf5, 0x27, 0x22, 0x90, 0x70, 0x11,
- 0xe0, 0x24, 0xff, 0x92, 0x47, 0x22, 0xe5, 0x34, 0xd3, 0x94, 0x01,
- 0x40, 0x07, 0xe5, 0x55, 0x60, 0x03, 0x02, 0x13, 0x49, 0x90, 0x04,
- 0x04, 0xe0, 0x25, 0xe0, 0x24, 0x5d, 0xf5, 0x57, 0x90, 0x70, 0x10,
- 0xe0, 0xff, 0x74, 0x47, 0x25, 0x57, 0xf8, 0xc6, 0xef, 0xc6, 0x90,
- 0x70, 0x11, 0xe0, 0xff, 0x74, 0x48, 0x25, 0x57, 0xf8, 0xc6, 0xef,
- 0xc6, 0xe4, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x02, 0x13, 0xb5,
- 0xe5, 0x34, 0xd3, 0x94, 0x01, 0x40, 0x07, 0xe5, 0x55, 0x60, 0x03,
- 0x02, 0x13, 0x49, 0xe5, 0x47, 0x64, 0x07, 0x60, 0x1d, 0xe5, 0x47,
- 0x64, 0x08, 0x60, 0x17, 0xe5, 0x47, 0x64, 0x09, 0x60, 0x11, 0xe5,
- 0x47, 0x64, 0x0a, 0x60, 0x0b, 0xe5, 0x47, 0x64, 0x0b, 0x60, 0x05,
- 0xe5, 0x47, 0xb4, 0x0c, 0x08, 0x90, 0x70, 0x11, 0xe0, 0x54, 0x0f,
- 0xf5, 0x3a, 0xe5, 0x47, 0xb4, 0x09, 0x08, 0xe5, 0x3a, 0xb4, 0x03,
- 0x03, 0xe4, 0xf5, 0x46, 0xe5, 0x47, 0xb4, 0x0a, 0x08, 0xe5, 0x3a,
- 0xb4, 0x01, 0x03, 0xe4, 0xf5, 0x46, 0xe4, 0xfd, 0xaf, 0x56, 0x12,
- 0x02, 0x82, 0xd2, 0x04, 0x22, 0x90, 0x70, 0x11, 0xe0, 0xf4, 0xff,
- 0x90, 0x70, 0x10, 0xe0, 0x5f, 0xff, 0x90, 0x70, 0x11, 0xe0, 0x55,
- 0x27, 0x4f, 0x90, 0x70, 0x18, 0xf0, 0x90, 0x70, 0x11, 0xe0, 0x90,
- 0x70, 0x19, 0xf0, 0xe4, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x30,
- 0x15, 0x03, 0xd2, 0x14, 0x22, 0x90, 0x70, 0x18, 0xe0, 0xf5, 0x27,
- 0x90, 0x02, 0x29, 0xe0, 0xff, 0x90, 0x70, 0x19, 0xe0, 0xfe, 0xef,
- 0x5e, 0x90, 0x02, 0x29, 0xf0, 0x30, 0x47, 0x04, 0xaf, 0x27, 0x80,
- 0x04, 0xe5, 0x27, 0xf4, 0xff, 0x90, 0x02, 0x28, 0xef, 0xf0, 0x22,
- 0xe5, 0x34, 0xd3, 0x94, 0x01, 0x40, 0x07, 0xe5, 0x55, 0x60, 0x03,
- 0x02, 0x13, 0x49, 0x90, 0x70, 0x10, 0xe0, 0xfe, 0x90, 0x70, 0x11,
- 0xe0, 0xfd, 0xed, 0xf8, 0xe6, 0xf5, 0x57, 0xfd, 0xaf, 0x56, 0x12,
- 0x02, 0x82, 0x02, 0x13, 0xb5, 0xe5, 0x34, 0xd3, 0x94, 0x01, 0x40,
- 0x07, 0xe5, 0x55, 0x60, 0x03, 0x02, 0x13, 0x49, 0x90, 0x70, 0x10,
- 0xe0, 0xfe, 0x90, 0x70, 0x11, 0xe0, 0xfd, 0xed, 0xf5, 0x82, 0x8e,
- 0x83, 0xe0, 0xf5, 0x57, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x02,
- 0x13, 0xb5, 0x90, 0x10, 0x00, 0xe0, 0xf5, 0x57, 0xe4, 0xf5, 0x58,
- 0xf5, 0x59, 0x90, 0x10, 0x03, 0xe0, 0xb4, 0x28, 0x05, 0x75, 0x58,
- 0x01, 0x80, 0x3c, 0x90, 0x10, 0x03, 0xe0, 0xb4, 0x30, 0x05, 0x75,
- 0x58, 0x02, 0x80, 0x30, 0x90, 0x10, 0x03, 0xe0, 0xb4, 0x33, 0x05,
- 0x75, 0x58, 0x04, 0x80, 0x24, 0x90, 0x10, 0x03, 0xe0, 0xb4, 0x35,
- 0x0c, 0x90, 0x10, 0x02, 0xe0, 0xb4, 0x72, 0x05, 0x75, 0x58, 0x08,
- 0x80, 0x11, 0x90, 0x10, 0x03, 0xe0, 0xb4, 0x35, 0x0a, 0x90, 0x10,
- 0x02, 0xe0, 0xb4, 0x93, 0x03, 0x75, 0x58, 0x10, 0xe5, 0x58, 0x30,
- 0xe1, 0x19, 0x90, 0x05, 0x08, 0xe0, 0x44, 0x01, 0xf0, 0xfd, 0x90,
- 0x05, 0x05, 0xe0, 0x54, 0xfb, 0xf0, 0x44, 0x04, 0xf0, 0xed, 0x54,
- 0xfe, 0x90, 0x05, 0x08, 0xf0, 0xe4, 0xf5, 0x4e, 0xf5, 0x4f, 0x75,
- 0x3a, 0xff, 0xc2, 0x1a, 0xc2, 0x18, 0xc2, 0x1b, 0xf5, 0x34, 0x90,
- 0x05, 0xa4, 0x74, 0x11, 0xf0, 0xa3, 0x74, 0xff, 0xf0, 0xa3, 0x74,
- 0x03, 0xf0, 0xe4, 0xf5, 0x30, 0xc2, 0x19, 0x90, 0x01, 0x0d, 0xe0,
- 0x44, 0x40, 0xf0, 0x75, 0x3c, 0xff, 0xad, 0x57, 0xaf, 0x56, 0x12,
- 0x02, 0x82, 0xe4, 0x90, 0x70, 0x32, 0xf0, 0x80, 0x77, 0xe5, 0x34,
- 0xd3, 0x94, 0x01, 0x40, 0x0b, 0xe5, 0x55, 0x60, 0x07, 0x7d, 0x03,
- 0xaf, 0x56, 0x02, 0x02, 0x82, 0x90, 0x70, 0x10, 0xe0, 0x24, 0xff,
- 0x92, 0x93, 0xe4, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x80, 0x54,
- 0xe5, 0x34, 0xd3, 0x94, 0x01, 0x40, 0x0d, 0xe5, 0x55, 0x60, 0x09,
- 0x7d, 0x03, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x80, 0x40, 0x90, 0x70,
- 0x10, 0xe0, 0x24, 0xff, 0x92, 0x4a, 0xd2, 0x05, 0xad, 0x57, 0xaf,
- 0x56, 0x12, 0x02, 0x82, 0x80, 0x2d, 0xe4, 0xf5, 0x34, 0xf5, 0x30,
- 0x90, 0x70, 0x10, 0xe0, 0xf4, 0x60, 0x03, 0xe0, 0xf5, 0x34, 0xad,
- 0x57, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x80, 0x15, 0xd2, 0x19, 0x05,
- 0x2f, 0xe5, 0x2f, 0xb4, 0x1a, 0x03, 0xe4, 0xf5, 0x2f, 0xd2, 0x04,
- 0xad, 0x57, 0xaf, 0x56, 0x12, 0x02, 0x82, 0x90, 0x04, 0x14, 0x74,
- 0x80, 0xf0, 0x22, 0x22, 0xe5, 0x34, 0xc3, 0x94, 0x03, 0x40, 0x17,
- 0xe5, 0x55, 0xb4, 0x02, 0x12, 0xe5, 0x30, 0x60, 0x0e, 0x30, 0x60,
- 0x0b, 0x74, 0xfd, 0x25, 0x46, 0xf5, 0x46, 0xd2, 0x04, 0xe4, 0xf5,
- 0x53, 0xe5, 0x53, 0x60, 0x03, 0x02, 0x14, 0x71, 0x30, 0x60, 0x21,
- 0xb2, 0x4d, 0x30, 0x4d, 0x1c, 0xe5, 0x34, 0xc3, 0x94, 0x03, 0x40,
- 0x11, 0xe5, 0x55, 0xb4, 0x02, 0x0c, 0xe5, 0x30, 0x60, 0x08, 0x74,
- 0x03, 0x25, 0x46, 0xf5, 0x46, 0x80, 0x02, 0x05, 0x46, 0xc2, 0x04,
- 0xe5, 0x4f, 0x45, 0x4e, 0x60, 0x08, 0xe5, 0x4f, 0x15, 0x4f, 0x70,
- 0x02, 0x15, 0x4e, 0x30, 0x1a, 0x49, 0x7f, 0x32, 0x7d, 0xb8, 0x7c,
- 0x0b, 0x12, 0x02, 0x35, 0x50, 0x06, 0x90, 0x04, 0x10, 0x74, 0x40,
- 0xf0, 0x7f, 0x35, 0x7d, 0x32, 0x12, 0x03, 0x3f, 0x50, 0x09, 0x90,
- 0x10, 0x04, 0xe0, 0x54, 0xf7, 0xf0, 0xd2, 0x06, 0xe5, 0x35, 0xd3,
- 0x94, 0x2d, 0x40, 0x30, 0x30, 0x1b, 0x2d, 0xc2, 0x1b, 0xa2, 0x18,
- 0x92, 0x1a, 0x20, 0x1a, 0x24, 0x90, 0x04, 0x09, 0xe0, 0x54, 0xdd,
- 0xf0, 0x90, 0x10, 0x04, 0xe0, 0x44, 0x08, 0xf0, 0xc2, 0x61, 0xd2,
- 0x03, 0x22, 0xe4, 0xf5, 0x35, 0xa2, 0x18, 0x92, 0x1a, 0x30, 0x1a,
- 0x07, 0x90, 0x04, 0x09, 0xe0, 0x44, 0x22, 0xf0, 0x22, 0x22, 0x30,
- 0x14, 0x30, 0x90, 0x70, 0x19, 0xe0, 0x55, 0x27, 0xff, 0x90, 0x70,
- 0x18, 0xe0, 0x4f, 0xf5, 0x27, 0x90, 0x02, 0x29, 0xe0, 0xff, 0x90,
- 0x70, 0x19, 0xe0, 0xfe, 0xef, 0x5e, 0x90, 0x02, 0x29, 0xf0, 0x30,
- 0x47, 0x04, 0xaf, 0x27, 0x80, 0x04, 0xe5, 0x27, 0xf4, 0xff, 0x90,
- 0x02, 0x28, 0xef, 0xf0, 0xc2, 0x14, 0x22, 0xc2, 0x4b, 0xc2, 0x4c,
- 0xe5, 0x44, 0x12, 0x02, 0x5c, 0x14, 0xc9, 0x00, 0x15, 0x57, 0x04,
- 0x15, 0x53, 0x08, 0x15, 0x33, 0x10, 0x14, 0xdd, 0x20, 0x14, 0xfd,
- 0x60, 0x15, 0x0e, 0xa0, 0x00, 0x00, 0x15, 0x59, 0x85, 0x48, 0x43,
- 0x85, 0x4a, 0x42, 0x85, 0x4c, 0x5e, 0xe5, 0x47, 0x64, 0x06, 0x60,
- 0x03, 0x02, 0x15, 0x59, 0x80, 0x1b, 0xe5, 0x48, 0xc4, 0x54, 0x0f,
- 0xf5, 0x43, 0xe5, 0x4a, 0xc4, 0x54, 0x0f, 0xf5, 0x42, 0xe5, 0x4c,
- 0xc4, 0x54, 0x0f, 0xf5, 0x5e, 0xe5, 0x47, 0x64, 0x06, 0x70, 0x61,
- 0x53, 0x43, 0x0f, 0x80, 0x5c, 0x85, 0x49, 0x43, 0x85, 0x4b, 0x42,
- 0x85, 0x4d, 0x5e, 0xe5, 0x47, 0x64, 0x06, 0x70, 0x4d, 0x80, 0x1b,
- 0xe5, 0x49, 0xc4, 0x54, 0x0f, 0xf5, 0x43, 0xe5, 0x4b, 0xc4, 0x54,
- 0x0f, 0xf5, 0x42, 0xe5, 0x4d, 0xc4, 0x54, 0x0f, 0xf5, 0x5e, 0xe5,
- 0x47, 0x64, 0x06, 0x70, 0x30, 0xe5, 0x43, 0x54, 0x0f, 0x44, 0x10,
- 0xf5, 0x43, 0x80, 0x26, 0xe5, 0x47, 0x64, 0x04, 0x60, 0x05, 0xe5,
- 0x47, 0xb4, 0x05, 0x06, 0x43, 0x5e, 0x04, 0x75, 0x42, 0x09, 0xe5,
- 0x47, 0xb4, 0x06, 0x10, 0xe5, 0x43, 0x54, 0x0f, 0x44, 0x30, 0xf5,
- 0x43, 0x80, 0x06, 0xd2, 0x4b, 0x80, 0x02, 0xd2, 0x4c, 0xe4, 0xf5,
- 0x2a, 0xe5, 0x42, 0xc4, 0x54, 0xf0, 0xff, 0xe5, 0x43, 0x54, 0x0f,
- 0x4f, 0xf5, 0x5f, 0xd2, 0x60, 0x22, 0xd2, 0x15, 0xe5, 0x47, 0x24,
- 0xf5, 0x60, 0x0b, 0x24, 0xcb, 0x60, 0x07, 0x24, 0x40, 0x70, 0x06,
- 0xc2, 0x15, 0x22, 0x12, 0x19, 0x15, 0x12, 0x15, 0x8e, 0xc2, 0x15,
- 0xc2, 0xaf, 0xc2, 0x04, 0xd2, 0xaf, 0x22, 0xc2, 0xaf, 0x90, 0x04,
- 0x14, 0xe0, 0x54, 0x0e, 0x60, 0x04, 0xd2, 0x1c, 0x80, 0x08, 0xe5,
- 0x4e, 0x45, 0x4f, 0x24, 0xff, 0x92, 0x1c, 0xd2, 0xaf, 0x90, 0x04,
- 0x14, 0xe0, 0xa2, 0xe4, 0x92, 0x1d, 0x74, 0x1e, 0xf0, 0xe5, 0x5f,
- 0x54, 0x0f, 0xf5, 0x2d, 0xe5, 0x2a, 0x70, 0x13, 0x30, 0x1c, 0x05,
- 0xe5, 0x5f, 0x20, 0xe5, 0x0b, 0x30, 0x1d, 0x29, 0xe5, 0x5f, 0x54,
- 0x30, 0x64, 0x30, 0x70, 0x21, 0xe5, 0x2a, 0x70, 0x15, 0xe5, 0x34,
- 0xc3, 0x94, 0x03, 0x40, 0x09, 0xe5, 0x30, 0x60, 0x05, 0x75, 0x2a,
- 0x05, 0x80, 0x07, 0x75, 0x2a, 0x0c, 0x80, 0x02, 0x15, 0x2a, 0xd2,
- 0x6c, 0xd2, 0x6d, 0x80, 0x0f, 0xe5, 0x5f, 0x30, 0xe6, 0x06, 0xc2,
- 0x6c, 0xd2, 0x6d, 0x80, 0x04, 0xd2, 0x6c, 0xc2, 0x6d, 0xe5, 0x47,
- 0x64, 0x03, 0x70, 0x21, 0x30, 0x4b, 0x06, 0xc2, 0x6c, 0xd2, 0x6d,
- 0x80, 0x18, 0xe5, 0x2a, 0x70, 0x03, 0x30, 0x4c, 0x11, 0xc2, 0x4c,
- 0xe5, 0x2a, 0x70, 0x05, 0x75, 0x2a, 0x07, 0x80, 0x02, 0x15, 0x2a,
- 0xd2, 0x6c, 0xd2, 0x6d, 0xe5, 0x47, 0xb4, 0x09, 0x14, 0xe5, 0x44,
- 0x20, 0xe3, 0x0b, 0xe5, 0x3a, 0x64, 0x02, 0x60, 0x05, 0xe5, 0x3a,
- 0xb4, 0x03, 0x04, 0xc2, 0x6c, 0xd2, 0x6d, 0xe5, 0x47, 0xb4, 0x0a,
- 0x13, 0xe5, 0x3a, 0xb4, 0x01, 0x06, 0xc2, 0x6c, 0xd2, 0x6d, 0x80,
- 0x08, 0xe5, 0x3a, 0x70, 0x04, 0xd2, 0x6c, 0xc2, 0x6d, 0x20, 0x69,
- 0x07, 0xe5, 0x5e, 0x20, 0xe0, 0x02, 0xb2, 0x68, 0x20, 0x6b, 0x07,
- 0xe5, 0x5e, 0x20, 0xe1, 0x02, 0xb2, 0x6a, 0x20, 0x6d, 0x07, 0xe5,
- 0x5e, 0x20, 0xe2, 0x02, 0xb2, 0x6c, 0x75, 0x2e, 0x40, 0x20, 0x69,
- 0x04, 0xa2, 0x68, 0x80, 0x45, 0x30, 0x68, 0x06, 0xe5, 0x46, 0xa2,
- 0xe2, 0x80, 0x3c, 0x30, 0x19, 0x1c, 0xe5, 0x5e, 0x20, 0xe0, 0x04,
- 0x7f, 0x01, 0x80, 0x02, 0x7f, 0x00, 0xe5, 0x2f, 0xb4, 0x19, 0x04,
- 0x7e, 0x01, 0x80, 0x02, 0x7e, 0x00, 0xee, 0x6f, 0x24, 0xff, 0x80,
- 0x1d, 0xe5, 0x5e, 0x20, 0xe0, 0x04, 0x7f, 0x01, 0x80, 0x02, 0x7f,
- 0x00, 0xe5, 0x46, 0x54, 0xf0, 0xfe, 0xbe, 0xf0, 0x04, 0x7e, 0x01,
- 0x80, 0x02, 0x7e, 0x00, 0xee, 0x6f, 0x24, 0xff, 0x92, 0x73, 0x92,
- 0x72, 0x20, 0x6b, 0x04, 0xa2, 0x6a, 0x80, 0x45, 0x30, 0x6a, 0x06,
- 0xe5, 0x46, 0xa2, 0xe2, 0x80, 0x3c, 0x30, 0x19, 0x1c, 0xe5, 0x5e,
- 0x20, 0xe1, 0x04, 0x7f, 0x01, 0x80, 0x02, 0x7f, 0x00, 0xe5, 0x2f,
- 0xb4, 0x19, 0x04, 0x7e, 0x01, 0x80, 0x02, 0x7e, 0x00, 0xee, 0x6f,
- 0x24, 0xff, 0x80, 0x1d, 0xe5, 0x5e, 0x20, 0xe1, 0x04, 0x7f, 0x01,
+ 0x02, 0x22, 0x90, 0x70, 0x11, 0xe0, 0xb4, 0x5a, 0x03, 0xc2, 0x4f,
+ 0x22, 0xd2, 0x4f, 0x22, 0xe5, 0x30, 0xd3, 0x94, 0x01, 0x50, 0x03,
+ 0x02, 0x14, 0xc1, 0x90, 0x01, 0x0c, 0xe0, 0x44, 0x02, 0xf0, 0xa3,
+ 0xe0, 0x44, 0x04, 0xf0, 0x22, 0xe5, 0x30, 0xd3, 0x94, 0x01, 0x50,
+ 0x03, 0x02, 0x14, 0xc1, 0x90, 0x01, 0x0c, 0xe0, 0x54, 0xfd, 0xf0,
+ 0xa3, 0xe0, 0x54, 0xfb, 0xf0, 0x22, 0xe5, 0x30, 0xd3, 0x94, 0x01,
+ 0x40, 0x07, 0xe5, 0x55, 0x60, 0x03, 0x02, 0x14, 0xc1, 0x90, 0x70,
+ 0x10, 0xe0, 0x54, 0x7f, 0xff, 0xbf, 0x0a, 0x0d, 0x90, 0x70, 0x11,
+ 0xe0, 0xb4, 0x08, 0x06, 0x75, 0x4e, 0x01, 0x75, 0x4f, 0x84, 0x90,
+ 0x70, 0x10, 0xe0, 0x54, 0x7f, 0xff, 0xbf, 0x02, 0x12, 0x90, 0x70,
+ 0x11, 0xe0, 0x64, 0x08, 0x60, 0x04, 0xe0, 0xb4, 0x20, 0x06, 0x75,
+ 0x4e, 0x03, 0x75, 0x4f, 0x20, 0xe4, 0xf5, 0x3f, 0x22, 0x90, 0x70,
+ 0x11, 0xe0, 0x24, 0xff, 0x92, 0x47, 0x22, 0xe5, 0x30, 0xd3, 0x94,
+ 0x01, 0x40, 0x07, 0xe5, 0x55, 0x60, 0x03, 0x02, 0x13, 0x29, 0x90,
+ 0x04, 0x04, 0xe0, 0x25, 0xe0, 0x24, 0x5d, 0xf5, 0x57, 0x90, 0x70,
+ 0x10, 0xe0, 0xff, 0x74, 0x47, 0x25, 0x57, 0xf8, 0xc6, 0xef, 0xc6,
+ 0x90, 0x70, 0x11, 0xe0, 0xff, 0x74, 0x48, 0x25, 0x57, 0xf8, 0xc6,
+ 0xef, 0xc6, 0xe4, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x02, 0x14,
+ 0xbb, 0xe5, 0x30, 0xd3, 0x94, 0x01, 0x40, 0x07, 0xe5, 0x55, 0x60,
+ 0x03, 0x02, 0x13, 0x29, 0xe5, 0x47, 0x64, 0x07, 0x60, 0x1d, 0xe5,
+ 0x47, 0x64, 0x08, 0x60, 0x17, 0xe5, 0x47, 0x64, 0x09, 0x60, 0x11,
+ 0xe5, 0x47, 0x64, 0x0a, 0x60, 0x0b, 0xe5, 0x47, 0x64, 0x0b, 0x60,
+ 0x05, 0xe5, 0x47, 0xb4, 0x0c, 0x08, 0x90, 0x70, 0x11, 0xe0, 0x54,
+ 0x0f, 0xf5, 0x3a, 0xe5, 0x47, 0xb4, 0x09, 0x08, 0xe5, 0x3a, 0xb4,
+ 0x03, 0x03, 0xe4, 0xf5, 0x46, 0xe5, 0x47, 0xb4, 0x0a, 0x08, 0xe5,
+ 0x3a, 0xb4, 0x01, 0x03, 0xe4, 0xf5, 0x46, 0xe4, 0xfd, 0xaf, 0x56,
+ 0x12, 0x02, 0x0a, 0xd2, 0x04, 0x22, 0x90, 0x70, 0x11, 0xe0, 0xf4,
+ 0xff, 0x90, 0x70, 0x10, 0xe0, 0x5f, 0xff, 0x90, 0x70, 0x11, 0xe0,
+ 0x55, 0x3f, 0x4f, 0x90, 0x70, 0x18, 0xf0, 0x90, 0x70, 0x11, 0xe0,
+ 0x90, 0x70, 0x19, 0xf0, 0xe4, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x0a,
+ 0x30, 0x15, 0x03, 0xd2, 0x14, 0x22, 0x90, 0x70, 0x18, 0xe0, 0xf5,
+ 0x3f, 0x90, 0x02, 0x29, 0xe0, 0xff, 0x90, 0x70, 0x19, 0xe0, 0xfe,
+ 0xef, 0x5e, 0x90, 0x02, 0x29, 0xf0, 0x30, 0x47, 0x04, 0xaf, 0x3f,
+ 0x80, 0x04, 0xe5, 0x3f, 0xf4, 0xff, 0x90, 0x02, 0x28, 0xef, 0xf0,
+ 0x22, 0x90, 0x70, 0x10, 0xe0, 0x24, 0xff, 0x92, 0x1a, 0x75, 0x32,
+ 0x03, 0x75, 0x33, 0x1f, 0xe4, 0xf5, 0x31, 0xad, 0x57, 0xaf, 0x56,
+ 0x12, 0x02, 0x0a, 0x02, 0x14, 0xbb, 0x90, 0x10, 0x00, 0xe0, 0xf5,
+ 0x57, 0xe4, 0xf5, 0x58, 0xf5, 0x59, 0x90, 0x10, 0x03, 0xe0, 0xb4,
+ 0x28, 0x05, 0x75, 0x58, 0x01, 0x80, 0x3c, 0x90, 0x10, 0x03, 0xe0,
+ 0xb4, 0x30, 0x05, 0x75, 0x58, 0x02, 0x80, 0x30, 0x90, 0x10, 0x03,
+ 0xe0, 0xb4, 0x33, 0x05, 0x75, 0x58, 0x04, 0x80, 0x24, 0x90, 0x10,
+ 0x03, 0xe0, 0xb4, 0x35, 0x0c, 0x90, 0x10, 0x02, 0xe0, 0xb4, 0x72,
+ 0x05, 0x75, 0x58, 0x08, 0x80, 0x11, 0x90, 0x10, 0x03, 0xe0, 0xb4,
+ 0x35, 0x0a, 0x90, 0x10, 0x02, 0xe0, 0xb4, 0x93, 0x03, 0x75, 0x58,
+ 0x10, 0xe5, 0x58, 0x30, 0xe1, 0x19, 0x90, 0x05, 0x08, 0xe0, 0x44,
+ 0x01, 0xf0, 0xfd, 0x90, 0x05, 0x05, 0xe0, 0x54, 0xfb, 0xf0, 0x44,
+ 0x04, 0xf0, 0xed, 0x54, 0xfe, 0x90, 0x05, 0x08, 0xf0, 0xe4, 0xf5,
+ 0x4e, 0xf5, 0x4f, 0x75, 0x3a, 0xff, 0xf5, 0x30, 0x90, 0x05, 0xa4,
+ 0x74, 0x11, 0xf0, 0xa3, 0x74, 0xff, 0xf0, 0xa3, 0x74, 0x03, 0xf0,
+ 0xd2, 0x4f, 0x90, 0x01, 0x0d, 0xe0, 0x44, 0x40, 0xf0, 0x75, 0x3c,
+ 0xff, 0xad, 0x57, 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x90, 0x70, 0x36,
+ 0x74, 0x37, 0xf0, 0xa3, 0x74, 0x32, 0xf0, 0x90, 0x04, 0x01, 0xe0,
+ 0x44, 0x01, 0xf0, 0xc2, 0x1a, 0xc2, 0x17, 0x02, 0x14, 0xbb, 0xe5,
+ 0x30, 0xd3, 0x94, 0x01, 0x40, 0x0b, 0xe5, 0x55, 0x60, 0x07, 0x7d,
+ 0x03, 0xaf, 0x56, 0x02, 0x02, 0x0a, 0x90, 0x70, 0x10, 0xe0, 0x24,
+ 0xff, 0x92, 0x93, 0xe4, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x02,
+ 0x14, 0xbb, 0x90, 0x10, 0x00, 0xe0, 0x90, 0x10, 0x2c, 0xf0, 0x90,
+ 0x10, 0x2f, 0x74, 0x40, 0xf0, 0x90, 0x70, 0x11, 0xe0, 0x54, 0x7f,
+ 0xf5, 0x57, 0xe0, 0x54, 0x80, 0x90, 0x70, 0x32, 0xf0, 0x90, 0x70,
+ 0x10, 0xe0, 0xff, 0xe5, 0x57, 0xd3, 0x9f, 0x40, 0x43, 0x90, 0x70,
+ 0x33, 0xe5, 0x57, 0xf0, 0x90, 0x70, 0x10, 0xe0, 0xff, 0x90, 0x70,
+ 0x33, 0xe0, 0xc3, 0x9f, 0xd3, 0x94, 0x04, 0x40, 0x73, 0xe0, 0x24,
+ 0xfc, 0xf0, 0xe0, 0xff, 0x90, 0x70, 0x32, 0xe0, 0x4f, 0x90, 0x05,
+ 0x00, 0xf0, 0xe5, 0x58, 0x54, 0x0f, 0x60, 0x04, 0x7f, 0x17, 0x80,
+ 0x02, 0x7f, 0x11, 0x90, 0x05, 0x01, 0xef, 0xf0, 0xa3, 0x74, 0x01,
+ 0xf0, 0x74, 0x03, 0xf0, 0xff, 0x12, 0x02, 0x94, 0x80, 0xc3, 0x90,
+ 0x70, 0x33, 0xe5, 0x57, 0xf0, 0x90, 0x70, 0x33, 0xe0, 0xff, 0x90,
+ 0x70, 0x10, 0xe0, 0xc3, 0x9f, 0xd3, 0x94, 0x04, 0x40, 0x30, 0x90,
+ 0x70, 0x33, 0xe0, 0x24, 0x04, 0xf0, 0xe0, 0xff, 0x90, 0x70, 0x32,
+ 0xe0, 0x4f, 0x90, 0x05, 0x00, 0xf0, 0xe5, 0x58, 0x54, 0x0f, 0x60,
+ 0x04, 0x7f, 0x17, 0x80, 0x02, 0x7f, 0x11, 0x90, 0x05, 0x01, 0xef,
+ 0xf0, 0xa3, 0x74, 0x01, 0xf0, 0x74, 0x03, 0xf0, 0xff, 0x12, 0x02,
+ 0x94, 0x80, 0xc0, 0x90, 0x70, 0x10, 0xe0, 0xff, 0x90, 0x70, 0x32,
+ 0xe0, 0x4f, 0x90, 0x05, 0x00, 0xf0, 0xe5, 0x58, 0x54, 0x0f, 0x60,
+ 0x04, 0x7f, 0x17, 0x80, 0x02, 0x7f, 0x11, 0x90, 0x05, 0x01, 0xef,
+ 0xf0, 0xa3, 0x74, 0x01, 0xf0, 0x74, 0x03, 0xf0, 0xff, 0x12, 0x02,
+ 0x94, 0x90, 0x10, 0x00, 0xe0, 0x90, 0x10, 0x2c, 0xf0, 0x90, 0x10,
+ 0x2f, 0x74, 0x7f, 0xf0, 0xe4, 0xfd, 0xaf, 0x56, 0x12, 0x02, 0x0a,
+ 0x02, 0x14, 0xbb, 0xe5, 0x30, 0xd3, 0x94, 0x01, 0x40, 0x0d, 0xe5,
+ 0x55, 0x60, 0x09, 0x7d, 0x03, 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x80,
+ 0x72, 0x90, 0x70, 0x10, 0xe0, 0x24, 0xff, 0x92, 0x4a, 0xd2, 0x05,
+ 0xad, 0x57, 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x80, 0x5f, 0x90, 0x70,
+ 0x11, 0xe0, 0x24, 0xff, 0x92, 0x17, 0x90, 0x70, 0x10, 0xe0, 0xf5,
+ 0x5d, 0xad, 0x57, 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x90, 0x04, 0x14,
+ 0x74, 0x80, 0xf0, 0x30, 0x17, 0x13, 0x90, 0x10, 0x00, 0xe0, 0x90,
+ 0x10, 0x2c, 0xf0, 0x90, 0x10, 0x2f, 0xe0, 0x54, 0xf0, 0xf5, 0x57,
+ 0x45, 0x5d, 0xf0, 0xe4, 0x90, 0x70, 0x13, 0xf0, 0xe5, 0x56, 0xf4,
+ 0x60, 0x2a, 0x90, 0x70, 0x25, 0xe0, 0x44, 0x01, 0xf0, 0x90, 0x02,
+ 0x2c, 0x74, 0xff, 0xf0, 0x22, 0xe4, 0xf5, 0x30, 0xd2, 0x4f, 0x90,
+ 0x70, 0x10, 0xe0, 0xf4, 0x60, 0x03, 0xe0, 0xf5, 0x30, 0xad, 0x57,
+ 0xaf, 0x56, 0x12, 0x02, 0x0a, 0x90, 0x04, 0x14, 0x74, 0x80, 0xf0,
+ 0x22, 0x22, 0xe5, 0x33, 0x45, 0x32, 0x60, 0x0a, 0xe5, 0x33, 0x15,
+ 0x33, 0x70, 0x0a, 0x15, 0x32, 0x80, 0x06, 0x75, 0x32, 0x03, 0x75,
+ 0x33, 0x1f, 0xe5, 0x33, 0x45, 0x32, 0x60, 0x03, 0x02, 0x15, 0x70,
+ 0x20, 0x1a, 0x03, 0x02, 0x15, 0x70, 0x74, 0xa0, 0x25, 0x31, 0xf5,
+ 0x82, 0xe4, 0x34, 0x4c, 0xf5, 0x83, 0xe0, 0x60, 0x7a, 0x7f, 0x7e,
+ 0x12, 0x15, 0xde, 0xef, 0x54, 0xfe, 0x44, 0x02, 0xfd, 0x7f, 0x7e,
+ 0x12, 0x15, 0xc4, 0xe5, 0x31, 0x7f, 0x00, 0x25, 0xe0, 0xfe, 0xef,
+ 0x24, 0x00, 0xf5, 0x82, 0x74, 0x4d, 0x3e, 0xaf, 0x82, 0x90, 0x4c,
+ 0xa8, 0xf0, 0xa3, 0xef, 0xf0, 0xe4, 0xf5, 0x56, 0xf5, 0x57, 0x7f,
+ 0x7f, 0x12, 0x15, 0xde, 0x90, 0x4c, 0xa8, 0xe0, 0xfa, 0xa3, 0xe0,
+ 0x25, 0x57, 0xf5, 0x82, 0xea, 0x35, 0x56, 0xf5, 0x83, 0xef, 0xf0,
+ 0x05, 0x57, 0xe5, 0x57, 0x70, 0x02, 0x05, 0x56, 0xc3, 0x94, 0x80,
+ 0xe5, 0x56, 0x94, 0x01, 0x40, 0xd8, 0x7f, 0x7e, 0x12, 0x15, 0xde,
+ 0xef, 0x44, 0x03, 0xfd, 0x7f, 0x7e, 0x12, 0x15, 0xc4, 0x74, 0xa0,
+ 0x25, 0x31, 0xf5, 0x82, 0xe4, 0x34, 0x4c, 0xf5, 0x83, 0xe4, 0xf0,
+ 0x05, 0x31, 0xe5, 0x31, 0xb4, 0x08, 0x03, 0xe4, 0xf5, 0x31, 0xe5,
+ 0x53, 0x70, 0x1a, 0x30, 0x60, 0x09, 0xb2, 0x4d, 0x30, 0x4d, 0x04,
+ 0x05, 0x46, 0xc2, 0x04, 0xe5, 0x4f, 0x45, 0x4e, 0x60, 0x08, 0xe5,
+ 0x4f, 0x15, 0x4f, 0x70, 0x02, 0x15, 0x4e, 0x22, 0x22, 0x30, 0x14,
+ 0x30, 0x90, 0x70, 0x19, 0xe0, 0x55, 0x3f, 0xff, 0x90, 0x70, 0x18,
+ 0xe0, 0x4f, 0xf5, 0x3f, 0x90, 0x02, 0x29, 0xe0, 0xff, 0x90, 0x70,
+ 0x19, 0xe0, 0xfe, 0xef, 0x5e, 0x90, 0x02, 0x29, 0xf0, 0x30, 0x47,
+ 0x04, 0xaf, 0x3f, 0x80, 0x04, 0xe5, 0x3f, 0xf4, 0xff, 0x90, 0x02,
+ 0x28, 0xef, 0xf0, 0xc2, 0x14, 0x22, 0x90, 0x10, 0x1c, 0xed, 0xf0,
+ 0xa3, 0xef, 0xf0, 0xa3, 0x74, 0x0a, 0xf0, 0x90, 0x10, 0x1c, 0xe0,
+ 0xf5, 0x58, 0x90, 0x10, 0x1e, 0xe0, 0x20, 0xe1, 0xf3, 0x22, 0x90,
+ 0x10, 0x1d, 0xef, 0xf0, 0xa3, 0x74, 0x0b, 0xf0, 0x90, 0x10, 0x1c,
+ 0xe0, 0xf5, 0x58, 0x90, 0x10, 0x1e, 0xe0, 0x20, 0xe1, 0xf3, 0xaf,
+ 0x58, 0x22, 0xc2, 0x4b, 0xc2, 0x4c, 0xe5, 0x44, 0x12, 0x01, 0xe4,
+ 0x16, 0x19, 0x00, 0x16, 0xa7, 0x04, 0x16, 0xa3, 0x08, 0x16, 0x83,
+ 0x10, 0x16, 0x2d, 0x20, 0x16, 0x4d, 0x60, 0x16, 0x5e, 0xa0, 0x00,
+ 0x00, 0x16, 0xa9, 0x85, 0x48, 0x43, 0x85, 0x4a, 0x42, 0x85, 0x4c,
+ 0x5e, 0xe5, 0x47, 0x64, 0x06, 0x60, 0x03, 0x02, 0x16, 0xa9, 0x80,
+ 0x1b, 0xe5, 0x48, 0xc4, 0x54, 0x0f, 0xf5, 0x43, 0xe5, 0x4a, 0xc4,
+ 0x54, 0x0f, 0xf5, 0x42, 0xe5, 0x4c, 0xc4, 0x54, 0x0f, 0xf5, 0x5e,
+ 0xe5, 0x47, 0x64, 0x06, 0x70, 0x61, 0x53, 0x43, 0x0f, 0x80, 0x5c,
+ 0x85, 0x49, 0x43, 0x85, 0x4b, 0x42, 0x85, 0x4d, 0x5e, 0xe5, 0x47,
+ 0x64, 0x06, 0x70, 0x4d, 0x80, 0x1b, 0xe5, 0x49, 0xc4, 0x54, 0x0f,
+ 0xf5, 0x43, 0xe5, 0x4b, 0xc4, 0x54, 0x0f, 0xf5, 0x42, 0xe5, 0x4d,
+ 0xc4, 0x54, 0x0f, 0xf5, 0x5e, 0xe5, 0x47, 0x64, 0x06, 0x70, 0x30,
+ 0xe5, 0x43, 0x54, 0x0f, 0x44, 0x10, 0xf5, 0x43, 0x80, 0x26, 0xe5,
+ 0x47, 0x64, 0x04, 0x60, 0x05, 0xe5, 0x47, 0xb4, 0x05, 0x06, 0x43,
+ 0x5e, 0x04, 0x75, 0x42, 0x09, 0xe5, 0x47, 0xb4, 0x06, 0x10, 0xe5,
+ 0x43, 0x54, 0x0f, 0x44, 0x30, 0xf5, 0x43, 0x80, 0x06, 0xd2, 0x4b,
+ 0x80, 0x02, 0xd2, 0x4c, 0xe4, 0xf5, 0x27, 0xe5, 0x42, 0xc4, 0x54,
+ 0xf0, 0xff, 0xe5, 0x43, 0x54, 0x0f, 0x4f, 0xf5, 0x5f, 0xd2, 0x60,
+ 0x22, 0xd2, 0x15, 0xe5, 0x47, 0x24, 0xf5, 0x60, 0x0b, 0x24, 0xcb,
+ 0x60, 0x07, 0x24, 0x40, 0x70, 0x06, 0xc2, 0x15, 0x22, 0x12, 0x1a,
+ 0x3a, 0x12, 0x16, 0xde, 0xc2, 0x15, 0xc2, 0xaf, 0xc2, 0x04, 0xd2,
+ 0xaf, 0x22, 0xc2, 0xaf, 0x90, 0x04, 0x14, 0xe0, 0x54, 0x0e, 0x60,
+ 0x04, 0xd2, 0x18, 0x80, 0x08, 0xe5, 0x4e, 0x45, 0x4f, 0x24, 0xff,
+ 0x92, 0x18, 0xd2, 0xaf, 0x90, 0x04, 0x14, 0xe0, 0xa2, 0xe4, 0x92,
+ 0x19, 0x74, 0x1e, 0xf0, 0xe5, 0x5f, 0x54, 0x0f, 0xf5, 0x2d, 0xe5,
+ 0x27, 0x70, 0x13, 0x30, 0x18, 0x05, 0xe5, 0x5f, 0x20, 0xe5, 0x0b,
+ 0x30, 0x19, 0x19, 0xe5, 0x5f, 0x54, 0x30, 0xff, 0xbf, 0x30, 0x11,
+ 0xe5, 0x27, 0x70, 0x05, 0x75, 0x27, 0x0c, 0x80, 0x02, 0x15, 0x27,
+ 0xd2, 0x6c, 0xd2, 0x6d, 0x80, 0x0f, 0xe5, 0x5f, 0x30, 0xe6, 0x06,
+ 0xc2, 0x6c, 0xd2, 0x6d, 0x80, 0x04, 0xd2, 0x6c, 0xc2, 0x6d, 0xe5,
+ 0x47, 0x64, 0x03, 0x70, 0x21, 0x30, 0x4b, 0x06, 0xc2, 0x6c, 0xd2,
+ 0x6d, 0x80, 0x18, 0xe5, 0x27, 0x70, 0x03, 0x30, 0x4c, 0x11, 0xc2,
+ 0x4c, 0xe5, 0x27, 0x70, 0x05, 0x75, 0x27, 0x07, 0x80, 0x02, 0x15,
+ 0x27, 0xd2, 0x6c, 0xd2, 0x6d, 0xe5, 0x47, 0xb4, 0x09, 0x14, 0xe5,
+ 0x44, 0x20, 0xe3, 0x0b, 0xe5, 0x3a, 0x64, 0x02, 0x60, 0x05, 0xe5,
+ 0x3a, 0xb4, 0x03, 0x04, 0xc2, 0x6c, 0xd2, 0x6d, 0xe5, 0x47, 0xb4,
+ 0x0a, 0x13, 0xe5, 0x3a, 0xb4, 0x01, 0x06, 0xc2, 0x6c, 0xd2, 0x6d,
+ 0x80, 0x08, 0xe5, 0x3a, 0x70, 0x04, 0xd2, 0x6c, 0xc2, 0x6d, 0x20,
+ 0x69, 0x07, 0xe5, 0x5e, 0x20, 0xe0, 0x02, 0xb2, 0x68, 0x20, 0x6b,
+ 0x07, 0xe5, 0x5e, 0x20, 0xe1, 0x02, 0xb2, 0x6a, 0x20, 0x6d, 0x07,
+ 0xe5, 0x5e, 0x20, 0xe2, 0x02, 0xb2, 0x6c, 0x75, 0x2e, 0x40, 0x20,
+ 0x69, 0x04, 0xa2, 0x68, 0x80, 0x26, 0x30, 0x68, 0x06, 0xe5, 0x46,
+ 0xa2, 0xe2, 0x80, 0x1d, 0xe5, 0x5e, 0x20, 0xe0, 0x04, 0x7f, 0x01,
0x80, 0x02, 0x7f, 0x00, 0xe5, 0x46, 0x54, 0xf0, 0xfe, 0xbe, 0xf0,
0x04, 0x7e, 0x01, 0x80, 0x02, 0x7e, 0x00, 0xee, 0x6f, 0x24, 0xff,
- 0x92, 0x75, 0x92, 0x74, 0x20, 0x6d, 0x04, 0xa2, 0x6c, 0x80, 0x26,
- 0xe5, 0x47, 0x64, 0x0a, 0x70, 0x22, 0x30, 0x6c, 0x06, 0xe5, 0x46,
- 0xa2, 0xe3, 0x80, 0x17, 0xe5, 0x3a, 0xb4, 0x01, 0x06, 0xe5, 0x46,
- 0xa2, 0xe3, 0x80, 0x53, 0xe5, 0x46, 0x20, 0xe4, 0x03, 0x30, 0xe5,
- 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x80, 0x45, 0x30, 0x6c, 0x06, 0xe5,
- 0x46, 0xa2, 0xe2, 0x80, 0x3c, 0x30, 0x19, 0x1c, 0xe5, 0x5e, 0x20,
- 0xe2, 0x04, 0x7f, 0x01, 0x80, 0x02, 0x7f, 0x00, 0xe5, 0x2f, 0xb4,
- 0x19, 0x04, 0x7e, 0x01, 0x80, 0x02, 0x7e, 0x00, 0xee, 0x6f, 0x24,
- 0xff, 0x80, 0x1d, 0xe5, 0x5e, 0x20, 0xe2, 0x04, 0x7f, 0x01, 0x80,
- 0x02, 0x7f, 0x00, 0xe5, 0x46, 0x54, 0xf0, 0xfe, 0xbe, 0xf0, 0x04,
- 0x7e, 0x01, 0x80, 0x02, 0x7e, 0x00, 0xee, 0x6f, 0x24, 0xff, 0x92,
- 0x71, 0x92, 0x70, 0x90, 0x10, 0x00, 0xe0, 0x90, 0x10, 0x2c, 0xf0,
- 0x90, 0x10, 0x03, 0xe0, 0xc3, 0x94, 0x30, 0x40, 0x14, 0xa2, 0x71,
- 0x92, 0x77, 0xa2, 0x70, 0x92, 0x76, 0xe5, 0x2e, 0x13, 0x13, 0x54,
- 0x3f, 0xf5, 0x2e, 0xc2, 0x77, 0xd2, 0x76, 0x90, 0x10, 0x2f, 0xe5,
- 0x2e, 0xf0, 0xe5, 0x47, 0x64, 0x06, 0x70, 0x39, 0x90, 0x02, 0x29,
- 0xe0, 0x54, 0xfe, 0xf0, 0xe5, 0x43, 0xc4, 0x54, 0x0f, 0x14, 0x60,
- 0x0c, 0x24, 0xfe, 0x60, 0x0c, 0x24, 0x03, 0x70, 0x13, 0xc2, 0x38,
- 0x80, 0x0f, 0xd2, 0x38, 0x80, 0x0b, 0xe5, 0x46, 0x30, 0xe2, 0x03,
- 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x38, 0x30, 0x47, 0x05, 0xaf, 0x27,
- 0x02, 0x19, 0x0f, 0xe5, 0x27, 0xf4, 0xff, 0x02, 0x19, 0x0f, 0xe5,
- 0x47, 0x64, 0x07, 0x60, 0x0f, 0xe5, 0x47, 0x64, 0x08, 0x60, 0x09,
- 0xe5, 0x47, 0x64, 0x09, 0x60, 0x03, 0x02, 0x18, 0x8e, 0x90, 0x02,
- 0x29, 0xe0, 0x54, 0xfc, 0xf0, 0xe5, 0x3a, 0x14, 0x60, 0x22, 0x14,
- 0x60, 0x25, 0x14, 0x60, 0x2d, 0x24, 0xfc, 0x60, 0x49, 0x24, 0xf9,
- 0x60, 0x14, 0x24, 0x0e, 0x70, 0x50, 0xe5, 0x46, 0x13, 0x13, 0x54,
- 0x3f, 0x75, 0xf0, 0x03, 0x84, 0xe5, 0xf0, 0x24, 0xff, 0x80, 0x3a,
- 0xd2, 0x39, 0xc2, 0x38, 0x80, 0x3e, 0xe5, 0x46, 0x30, 0xe2, 0x03,
- 0xd3, 0x80, 0x1d, 0xc3, 0x80, 0x1a, 0xe5, 0x46, 0x30, 0xe2, 0x0d,
- 0x54, 0x38, 0xc3, 0x94, 0x30, 0x50, 0x06, 0x7e, 0x00, 0x7f, 0x01,
- 0x80, 0x04, 0x7e, 0x00, 0x7f, 0x00, 0xee, 0x4f, 0x24, 0xff, 0x92,
- 0x38, 0xc2, 0x39, 0x80, 0x13, 0xe5, 0x46, 0x30, 0xe2, 0x03, 0xd3,
- 0x80, 0x01, 0xc3, 0x92, 0x39, 0xc2, 0x38, 0x80, 0x04, 0xc2, 0x38,
- 0xc2, 0x39, 0x30, 0x47, 0x04, 0xaf, 0x27, 0x80, 0x04, 0xe5, 0x27,
- 0xf4, 0xff, 0x02, 0x19, 0x0f, 0xe5, 0x47, 0x64, 0x0c, 0x60, 0x06,
- 0xe5, 0x47, 0x64, 0x0b, 0x70, 0x7a, 0x90, 0x02, 0x29, 0xe0, 0x54,
- 0xfd, 0xf0, 0xe5, 0x3a, 0x14, 0x60, 0x20, 0x14, 0x60, 0x21, 0x14,
- 0x60, 0x2b, 0x24, 0xfc, 0x60, 0x45, 0x24, 0xf9, 0x60, 0x12, 0x24,
- 0x0e, 0x70, 0x4a, 0xe5, 0x46, 0x13, 0x13, 0x54, 0x3f, 0x75, 0xf0,
- 0x03, 0x84, 0xe5, 0xf0, 0x80, 0x29, 0xd2, 0x39, 0x80, 0x3a, 0xe5,
- 0x46, 0x30, 0xe2, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x39, 0x80,
- 0x2d, 0xe5, 0x46, 0x30, 0xe2, 0x0d, 0x54, 0x38, 0xc3, 0x94, 0x30,
- 0x50, 0x06, 0x7e, 0x00, 0x7f, 0x01, 0x80, 0x04, 0x7e, 0x00, 0x7f,
- 0x00, 0xee, 0x4f, 0x24, 0xff, 0x92, 0x39, 0x80, 0x0f, 0xe5, 0x46,
- 0x30, 0xe2, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x92, 0x39, 0x80, 0x02,
- 0xc2, 0x39, 0x30, 0x47, 0x04, 0xaf, 0x27, 0x80, 0x04, 0xe5, 0x27,
- 0xf4, 0xff, 0x90, 0x02, 0x28, 0xef, 0xf0, 0x22, 0xe5, 0x47, 0xb4,
- 0x0b, 0x10, 0x90, 0x02, 0x29, 0xe0, 0x54, 0xeb, 0xf0, 0xe5, 0x27,
- 0x54, 0xeb, 0x45, 0x45, 0xf5, 0x27, 0x22, 0xe4, 0x90, 0x02, 0x29,
- 0xf0, 0x30, 0x47, 0x04, 0xaf, 0x45, 0x80, 0x04, 0xe5, 0x45, 0xf4,
- 0xff, 0x90, 0x02, 0x28, 0xef, 0xf0, 0x22, 0x8f, 0x50, 0xd2, 0x59,
- 0x22, 0x8f, 0x54, 0xd2, 0x58, 0x22, 0xe4, 0xf5, 0x37, 0xc2, 0xaf,
- 0xe5, 0x51, 0x14, 0x60, 0x4a, 0x14, 0x60, 0x6b, 0x24, 0x02, 0x60,
- 0x03, 0x02, 0x1a, 0xd5, 0xd2, 0x59, 0x75, 0x55, 0x01, 0x20, 0x1a,
- 0x1c, 0x90, 0x02, 0x08, 0xe0, 0x54, 0xfe, 0xf0, 0xe0, 0x20, 0xe1,
- 0x23, 0x90, 0x04, 0x34, 0xe0, 0xb4, 0x02, 0x1c, 0xa3, 0xe0, 0xb4,
- 0x02, 0x17, 0xa3, 0xe0, 0xb4, 0x02, 0x12, 0x7f, 0x20, 0x12, 0x19,
- 0x40, 0x90, 0x10, 0x04, 0xe0, 0x54, 0xf3, 0xf0, 0x75, 0x51, 0x01,
- 0x02, 0x1a, 0xd5, 0xe5, 0x50, 0x70, 0x06, 0x75, 0x37, 0x03, 0x02,
- 0x1a, 0xd5, 0x90, 0x12, 0x00, 0xe0, 0x54, 0x03, 0x70, 0x15, 0x7f,
- 0x20, 0x12, 0x19, 0x40, 0x20, 0x1a, 0x07, 0x90, 0x02, 0x08, 0xe0,
- 0x54, 0xfb, 0xf0, 0x75, 0x51, 0x02, 0x02, 0x1a, 0xd5, 0xe5, 0x50,
- 0x70, 0x03, 0x02, 0x1a, 0xd0, 0x20, 0x1a, 0x15, 0x90, 0x02, 0x08,
- 0xe0, 0x30, 0xe3, 0x03, 0x02, 0x1a, 0xcc, 0x90, 0x04, 0x37, 0xe0,
- 0x64, 0x22, 0x60, 0x03, 0x02, 0x1a, 0xcc, 0x90, 0x12, 0x04, 0x74,
- 0x0a, 0xf0, 0xe5, 0x58, 0x30, 0xe3, 0x15, 0xe4, 0x90, 0x05, 0x00,
+ 0x92, 0x73, 0x92, 0x72, 0x20, 0x6b, 0x04, 0xa2, 0x6a, 0x80, 0x26,
+ 0x30, 0x6a, 0x06, 0xe5, 0x46, 0xa2, 0xe2, 0x80, 0x1d, 0xe5, 0x5e,
+ 0x20, 0xe1, 0x04, 0x7f, 0x01, 0x80, 0x02, 0x7f, 0x00, 0xe5, 0x46,
+ 0x54, 0xf0, 0xfe, 0xbe, 0xf0, 0x04, 0x7e, 0x01, 0x80, 0x02, 0x7e,
+ 0x00, 0xee, 0x6f, 0x24, 0xff, 0x92, 0x75, 0x92, 0x74, 0x20, 0x6d,
+ 0x04, 0xa2, 0x6c, 0x80, 0x26, 0xe5, 0x47, 0x64, 0x0a, 0x70, 0x22,
+ 0x30, 0x6c, 0x06, 0xe5, 0x46, 0xa2, 0xe3, 0x80, 0x17, 0xe5, 0x3a,
+ 0xb4, 0x01, 0x06, 0xe5, 0x46, 0xa2, 0xe3, 0x80, 0x34, 0xe5, 0x46,
+ 0x20, 0xe4, 0x03, 0x30, 0xe5, 0x03, 0xd3, 0x80, 0x01, 0xc3, 0x80,
+ 0x26, 0x30, 0x6c, 0x06, 0xe5, 0x46, 0xa2, 0xe2, 0x80, 0x1d, 0xe5,
+ 0x5e, 0x20, 0xe2, 0x04, 0x7f, 0x01, 0x80, 0x02, 0x7f, 0x00, 0xe5,
+ 0x46, 0x54, 0xf0, 0xfe, 0xbe, 0xf0, 0x04, 0x7e, 0x01, 0x80, 0x02,
+ 0x7e, 0x00, 0xee, 0x6f, 0x24, 0xff, 0x92, 0x71, 0x92, 0x70, 0x90,
+ 0x10, 0x00, 0xe0, 0x90, 0x10, 0x2c, 0xf0, 0x90, 0x10, 0x03, 0xe0,
+ 0xc3, 0x94, 0x30, 0x40, 0x19, 0xe0, 0x64, 0x32, 0x60, 0x14, 0xa2,
+ 0x71, 0x92, 0x77, 0xa2, 0x70, 0x92, 0x76, 0xe5, 0x2e, 0x13, 0x13,
+ 0x54, 0x3f, 0xf5, 0x2e, 0xc2, 0x77, 0xd2, 0x76, 0x30, 0x17, 0x0d,
+ 0x53, 0x2e, 0xf0, 0xe5, 0x2e, 0x45, 0x5d, 0x90, 0x10, 0x2f, 0xf0,
+ 0x80, 0x06, 0x90, 0x10, 0x2f, 0xe5, 0x2e, 0xf0, 0xe5, 0x47, 0x64,
+ 0x06, 0x70, 0x47, 0x90, 0x02, 0x28, 0xe0, 0x30, 0x47, 0x03, 0xff,
+ 0x80, 0x02, 0xf4, 0xff, 0x8f, 0x3f, 0x90, 0x02, 0x29, 0xe0, 0x54,
+ 0xfe, 0xf0, 0xe5, 0x43, 0xc4, 0x54, 0x0f, 0x14, 0x60, 0x0c, 0x24,
+ 0xfe, 0x60, 0x0c, 0x24, 0x03, 0x70, 0x13, 0xc2, 0xf8, 0x80, 0x0f,
+ 0xd2, 0xf8, 0x80, 0x0b, 0xe5, 0x46, 0x30, 0xe2, 0x03, 0xd3, 0x80,
+ 0x01, 0xc3, 0x92, 0xf8, 0x30, 0x47, 0x05, 0xaf, 0x3f, 0x02, 0x1a,
+ 0x34, 0xe5, 0x3f, 0xf4, 0xff, 0x02, 0x1a, 0x34, 0xe5, 0x47, 0x64,
+ 0x07, 0x60, 0x0f, 0xe5, 0x47, 0x64, 0x08, 0x60, 0x09, 0xe5, 0x47,
+ 0x64, 0x09, 0x60, 0x03, 0x02, 0x19, 0xa2, 0x90, 0x02, 0x28, 0xe0,
+ 0x30, 0x47, 0x03, 0xff, 0x80, 0x02, 0xf4, 0xff, 0x8f, 0x3f, 0x90,
+ 0x02, 0x29, 0xe0, 0x54, 0xfc, 0xf0, 0xe5, 0x3a, 0x14, 0x60, 0x22,
+ 0x14, 0x60, 0x25, 0x14, 0x60, 0x2d, 0x24, 0xfc, 0x60, 0x49, 0x24,
+ 0xf9, 0x60, 0x14, 0x24, 0x0e, 0x70, 0x50, 0xe5, 0x46, 0x13, 0x13,
+ 0x54, 0x3f, 0x75, 0xf0, 0x03, 0x84, 0xe5, 0xf0, 0x24, 0xff, 0x80,
+ 0x3a, 0xd2, 0xf9, 0xc2, 0xf8, 0x80, 0x3e, 0xe5, 0x46, 0x30, 0xe2,
+ 0x03, 0xd3, 0x80, 0x1d, 0xc3, 0x80, 0x1a, 0xe5, 0x46, 0x30, 0xe2,
+ 0x0d, 0x54, 0x38, 0xc3, 0x94, 0x30, 0x50, 0x06, 0x7e, 0x00, 0x7f,
+ 0x01, 0x80, 0x04, 0x7e, 0x00, 0x7f, 0x00, 0xee, 0x4f, 0x24, 0xff,
+ 0x92, 0xf8, 0xc2, 0xf9, 0x80, 0x13, 0xe5, 0x46, 0x30, 0xe2, 0x03,
+ 0xd3, 0x80, 0x01, 0xc3, 0x92, 0xf9, 0xc2, 0xf8, 0x80, 0x04, 0xc2,
+ 0xf8, 0xc2, 0xf9, 0x30, 0x47, 0x04, 0xaf, 0x3f, 0x80, 0x04, 0xe5,
+ 0x3f, 0xf4, 0xff, 0x02, 0x1a, 0x34, 0xe5, 0x47, 0x64, 0x0c, 0x60,
+ 0x09, 0xe5, 0x47, 0x64, 0x0b, 0x60, 0x03, 0x02, 0x1a, 0x39, 0x90,
+ 0x02, 0x28, 0xe0, 0x30, 0x47, 0x03, 0xff, 0x80, 0x02, 0xf4, 0xff,
+ 0x8f, 0x3f, 0x90, 0x02, 0x29, 0xe0, 0x54, 0xfd, 0xf0, 0xe5, 0x3a,
+ 0x14, 0x60, 0x20, 0x14, 0x60, 0x21, 0x14, 0x60, 0x2b, 0x24, 0xfc,
+ 0x60, 0x45, 0x24, 0xf9, 0x60, 0x12, 0x24, 0x0e, 0x70, 0x4a, 0xe5,
+ 0x46, 0x13, 0x13, 0x54, 0x3f, 0x75, 0xf0, 0x03, 0x84, 0xe5, 0xf0,
+ 0x80, 0x29, 0xd2, 0xf9, 0x80, 0x3a, 0xe5, 0x46, 0x30, 0xe2, 0x03,
+ 0xd3, 0x80, 0x01, 0xc3, 0x92, 0xf9, 0x80, 0x2d, 0xe5, 0x46, 0x30,
+ 0xe2, 0x0d, 0x54, 0x38, 0xc3, 0x94, 0x30, 0x50, 0x06, 0x7e, 0x00,
+ 0x7f, 0x01, 0x80, 0x04, 0x7e, 0x00, 0x7f, 0x00, 0xee, 0x4f, 0x24,
+ 0xff, 0x92, 0xf9, 0x80, 0x0f, 0xe5, 0x46, 0x30, 0xe2, 0x03, 0xd3,
+ 0x80, 0x01, 0xc3, 0x92, 0xf9, 0x80, 0x02, 0xc2, 0xf9, 0x30, 0x47,
+ 0x04, 0xaf, 0x3f, 0x80, 0x04, 0xe5, 0x3f, 0xf4, 0xff, 0x90, 0x02,
+ 0x28, 0xef, 0xf0, 0x22, 0xe5, 0x47, 0xb4, 0x0b, 0x10, 0x90, 0x02,
+ 0x29, 0xe0, 0x54, 0xeb, 0xf0, 0xe5, 0x3f, 0x54, 0xeb, 0x45, 0x45,
+ 0xf5, 0x3f, 0x22, 0xe4, 0x90, 0x02, 0x29, 0xf0, 0x30, 0x47, 0x04,
+ 0xaf, 0x45, 0x80, 0x04, 0xe5, 0x45, 0xf4, 0xff, 0x90, 0x02, 0x28,
+ 0xef, 0xf0, 0x22, 0x8f, 0x50, 0xd2, 0x59, 0x22, 0x8f, 0x54, 0xd2,
+ 0x58, 0x22, 0xe4, 0xf5, 0x25, 0xc2, 0xaf, 0xe5, 0x51, 0x14, 0x60,
+ 0x4a, 0x14, 0x60, 0x6b, 0x24, 0x02, 0x60, 0x03, 0x02, 0x1b, 0xd0,
+ 0xd2, 0x59, 0x75, 0x55, 0x01, 0x90, 0x02, 0x08, 0xe0, 0x54, 0xfe,
+ 0xf0, 0xe0, 0x20, 0xe1, 0x23, 0x90, 0x04, 0x34, 0xe0, 0xb4, 0x02,
+ 0x1c, 0xa3, 0xe0, 0xb4, 0x02, 0x17, 0xa3, 0xe0, 0xb4, 0x02, 0x12,
+ 0x7f, 0x20, 0x12, 0x1a, 0x65, 0x90, 0x10, 0x04, 0xe0, 0x54, 0xf3,
+ 0xf0, 0x75, 0x51, 0x01, 0x02, 0x1b, 0xd0, 0xe5, 0x50, 0x60, 0x03,
+ 0x02, 0x1b, 0xd0, 0x75, 0x25, 0x03, 0x02, 0x1b, 0xd0, 0x90, 0x12,
+ 0x00, 0xe0, 0x54, 0x03, 0x70, 0x12, 0x7f, 0x20, 0x12, 0x1a, 0x65,
+ 0x90, 0x02, 0x08, 0xe0, 0x54, 0xfb, 0xf0, 0x75, 0x51, 0x02, 0x02,
+ 0x1b, 0xd0, 0xe5, 0x50, 0x60, 0x03, 0x02, 0x1b, 0xd0, 0x02, 0x1b,
+ 0xcb, 0x90, 0x02, 0x08, 0xe0, 0x30, 0xe3, 0x03, 0x02, 0x1b, 0xc7,
+ 0x90, 0x04, 0x37, 0xe0, 0x64, 0x22, 0x60, 0x03, 0x02, 0x1b, 0xc7,
+ 0x90, 0x12, 0x04, 0x74, 0x0a, 0xf0, 0xe5, 0x58, 0x30, 0xe3, 0x1c,
+ 0x90, 0x00, 0x02, 0xe0, 0x30, 0xe0, 0x15, 0xe4, 0x90, 0x05, 0x00,
0xf0, 0xa3, 0x74, 0x08, 0xf0, 0xa3, 0x74, 0x01, 0xf0, 0x74, 0x03,
- 0xf0, 0x7f, 0x01, 0x12, 0x03, 0x30, 0x90, 0x13, 0x28, 0xe0, 0x90,
+ 0xf0, 0x7f, 0x01, 0x12, 0x02, 0x94, 0x90, 0x13, 0x28, 0xe0, 0x90,
0x70, 0x1a, 0xf0, 0x90, 0x13, 0x29, 0xe0, 0x90, 0x70, 0x1b, 0xf0,
0x90, 0x13, 0x2b, 0xe0, 0x90, 0x70, 0x22, 0xf0, 0x90, 0x13, 0x28,
0xe0, 0x54, 0xf0, 0xf0, 0xa3, 0xe0, 0x54, 0xf0, 0xf0, 0x90, 0x13,
0x2b, 0xe0, 0x54, 0xcc, 0xf0, 0xe5, 0x58, 0x30, 0xe3, 0x17, 0xe5,
- 0x34, 0x70, 0x13, 0xe5, 0x3c, 0xf4, 0x90, 0x13, 0x2a, 0x60, 0x05,
+ 0x30, 0x70, 0x13, 0xe5, 0x3c, 0xf4, 0x90, 0x13, 0x2a, 0x60, 0x05,
0xe0, 0x54, 0xf3, 0x80, 0x11, 0xe0, 0x54, 0xfb, 0xf0, 0x80, 0x14,
0xe5, 0x3c, 0xf4, 0x90, 0x13, 0x2a, 0x60, 0x08, 0xe0, 0x54, 0xf2,
- 0x45, 0x3c, 0xf0, 0x80, 0x04, 0xe0, 0x54, 0xfa, 0xf0, 0x20, 0x1a,
- 0x07, 0x90, 0x04, 0x01, 0xe0, 0x44, 0x10, 0xf0, 0xe5, 0x34, 0xd3,
- 0x94, 0x01, 0x40, 0x09, 0xe5, 0x30, 0x70, 0x05, 0x75, 0x8c, 0x40,
- 0x80, 0x03, 0x75, 0x8c, 0x80, 0x90, 0x04, 0x01, 0xe0, 0x54, 0xfd,
- 0xf0, 0x20, 0x1a, 0x07, 0x90, 0x12, 0x04, 0xe0, 0x44, 0x04, 0xf0,
- 0xe5, 0x58, 0x30, 0xe0, 0x06, 0x90, 0x01, 0x0d, 0xe0, 0xf5, 0x31,
- 0xe5, 0x34, 0xd3, 0x94, 0x01, 0x40, 0x2c, 0x90, 0x01, 0x0d, 0xe0,
- 0x44, 0x01, 0xf0, 0xe5, 0x58, 0x20, 0xe3, 0x0c, 0xe5, 0x34, 0xb4,
- 0x03, 0x07, 0x90, 0x12, 0x04, 0xe0, 0x54, 0xfd, 0xf0, 0x20, 0x02,
- 0x11, 0x20, 0x03, 0x0e, 0x90, 0x01, 0x0d, 0xe0, 0x54, 0xfb, 0xf0,
- 0x90, 0x01, 0x0c, 0xe0, 0x54, 0xfd, 0xf0, 0x75, 0x37, 0x01, 0x75,
- 0x55, 0x02, 0xe4, 0xf5, 0x51, 0x80, 0x09, 0xe5, 0x50, 0x70, 0x05,
- 0x75, 0x37, 0x03, 0xf5, 0x51, 0xe5, 0x37, 0x60, 0x18, 0xc2, 0x01,
- 0xe4, 0xf5, 0x51, 0xc2, 0x59, 0x20, 0x1a, 0x0e, 0xad, 0x37, 0xaf,
- 0x40, 0x12, 0x1b, 0xfa, 0xe5, 0x37, 0xb4, 0x03, 0x02, 0xd2, 0x03,
- 0xd2, 0xaf, 0x22, 0xc2, 0xaf, 0x30, 0x01, 0x0e, 0xe4, 0xf5, 0x51,
- 0xc2, 0x59, 0xc2, 0x01, 0x7d, 0x02, 0xaf, 0x40, 0x12, 0x1b, 0xfa,
- 0xe5, 0x52, 0x14, 0x60, 0x56, 0x14, 0x60, 0x33, 0x24, 0x02, 0x60,
- 0x03, 0x02, 0x1b, 0xf7, 0xe5, 0x34, 0xd3, 0x94, 0x01, 0x40, 0x1f,
- 0x90, 0x01, 0x0c, 0xe0, 0x44, 0x02, 0xf0, 0xa3, 0xe0, 0x44, 0x04,
- 0xf0, 0x90, 0x12, 0x04, 0xe0, 0x44, 0x02, 0xf0, 0x7f, 0x32, 0x12,
- 0x03, 0x30, 0x90, 0x01, 0x0d, 0xe0, 0x54, 0xfe, 0xf0, 0x75, 0x52,
- 0x02, 0x75, 0x55, 0x03, 0xe5, 0x58, 0x30, 0xe0, 0x06, 0x90, 0x01,
- 0x0d, 0xe5, 0x31, 0xf0, 0x90, 0x12, 0x04, 0xe0, 0x54, 0xfb, 0xf0,
- 0x7f, 0x20, 0x12, 0x19, 0x45, 0x75, 0x52, 0x01, 0x75, 0x55, 0x03,
- 0x02, 0x1b, 0xf7, 0xe5, 0x54, 0x60, 0x03, 0x02, 0x1b, 0xf7, 0x90,
- 0x04, 0x01, 0xe0, 0x44, 0x0e, 0xf0, 0x20, 0x1a, 0x04, 0xe0, 0x54,
+ 0x45, 0x3c, 0xf0, 0x80, 0x04, 0xe0, 0x54, 0xfa, 0xf0, 0x90, 0x04,
+ 0x01, 0xe0, 0x44, 0x10, 0xf0, 0x75, 0x8c, 0x80, 0xe0, 0x54, 0xfd,
+ 0xf0, 0x90, 0x12, 0x04, 0xe0, 0x44, 0x04, 0xf0, 0xe5, 0x58, 0x30,
+ 0xe0, 0x06, 0x90, 0x01, 0x0d, 0xe0, 0xf5, 0x2f, 0xe5, 0x30, 0xd3,
+ 0x94, 0x01, 0x40, 0x17, 0x20, 0x02, 0x14, 0x20, 0x03, 0x11, 0x30,
+ 0x4f, 0x0e, 0x90, 0x01, 0x0d, 0xe0, 0x54, 0xfb, 0xf0, 0x90, 0x01,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 17:41:25 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 095F4D82;
Wed, 11 Feb 2015 17:41:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 CFC7AC7;
Wed, 11 Feb 2015 17:41:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BHfOaX021821;
Wed, 11 Feb 2015 17:41:24 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BHfOq9021820;
Wed, 11 Feb 2015 17:41:24 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502111741.t1BHfOq9021820@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 17:41:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278588 -
projects/release-install-debug/usr.sbin/bsdinstall/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 17:41:25 -0000
Author: gjb
Date: Wed Feb 11 17:41:23 2015
New Revision: 278588
URL: https://svnweb.freebsd.org/changeset/base/278588
Log:
The bsdinstall(8) 'distfetch' command uses an all-or-nothing
success/failure case, derived from DISTRIBUTIONS set in the
environment.
Since the debugging distribution sets will always be remote,
and failure to fetch *-dbg.txz should not prevent the system
from being installed, recommend deselecting the debugging sets
when informing of fetch failures.
In theory, 'bsdinstall distfetch' can iterate through the
selected distributions to fetch them independently, but that
would be a far too intrusive approach for now.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Wed Feb 11 17:27:37 2015 (r278587)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Wed Feb 11 17:41:23 2015 (r278588)
@@ -161,6 +161,7 @@ esac
if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
ALL_DISTRIBUTIONS="$DISTRIBUTIONS"
+ WANT_DEBUG=false
# Download to a directory in the new system as scratch space
BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"
@@ -177,7 +178,39 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
fi
export FTP_PASSIVE_MODE=YES
- bsdinstall distfetch || error "Failed to fetch remote distribution"
+ # Iterate through the distribution list and set a flag if debugging
+ # distributions have been selected.
+ for _DISTRIBUTION in $DISTRIBUTIONS; do
+ case $_DISTRIBUTION in
+ *-dbg.*)
+ WANT_DEBUG=true
+ DEBUG_LIST="\n$DEBUG_LIST\n$_DISTRIBUTION"
+ ;;
+ *)
+ ;;
+ esac
+ done
+
+ # Fetch the distributions.
+ bsdinstall distfetch
+ rc=$?
+
+ if [ $rc -ne 0 ]; then
+ # If unable to fetch the remote distributions, recommend
+ # deselecting the debugging distributions, and retrying the
+ # installation, since failure to fetch *-dbg.txz should not
+ # be considered a fatal installation error.
+ msg="Failed to fetch remote distribution"
+ if [ $WANT_DEBUG ]; then
+ # Trim leading and trailing newlines.
+ DEBUG_LIST="${DEBUG_LIST%%\n}"
+ DEBUG_LIST="${DEBUG_LIST##\n}"
+ msg="$msg\n\nPlease deselect the following distributions"
+ msg="$msg and retry the installation:"
+ msg="$msg\n$DEBUG_LIST"
+ fi
+ error "$msg"
+ fi
export DISTRIBUTIONS="$ALL_DISTRIBUTIONS"
fi
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 18:59:52 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 2E8B76CC;
Wed, 11 Feb 2015 18:59:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 15F02AD3;
Wed, 11 Feb 2015 18:59:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BIxprg056069;
Wed, 11 Feb 2015 18:59:51 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BIxmdn056047;
Wed, 11 Feb 2015 18:59:48 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502111859.t1BIxmdn056047@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 18:59:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278591 - in projects/release-arm-redux: .
cddl/contrib/opensolaris/lib/libdtrace/arm
cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib cddl/lib/libdtrace
cddl/usr.sbin contrib/binutils/l...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 18:59:52 -0000
Author: gjb
Date: Wed Feb 11 18:59:46 2015
New Revision: 278591
URL: https://svnweb.freebsd.org/changeset/base/278591
Log:
MFH: r278202,r278205-r278590
Sponsored by: The FreeBSD Foundation
Added:
projects/release-arm-redux/cddl/contrib/opensolaris/lib/libdtrace/arm/
- copied from r278590, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/lzma12.h
- copied unchanged from r278590, head/contrib/xz/src/liblzma/api/lzma/lzma12.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_buffer_encoder.h
- copied unchanged from r278590, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/hardware_cputhreads.c
- copied unchanged from r278590, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/memcmplen.h
- copied unchanged from r278590, head/contrib/xz/src/liblzma/common/memcmplen.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/outqueue.c
- copied unchanged from r278590, head/contrib/xz/src/liblzma/common/outqueue.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/outqueue.h
- copied unchanged from r278590, head/contrib/xz/src/liblzma/common/outqueue.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/stream_encoder_mt.c
- copied unchanged from r278590, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c
projects/release-arm-redux/contrib/xz/src/liblzma/liblzma.map
- copied unchanged from r278590, head/contrib/xz/src/liblzma/liblzma.map
projects/release-arm-redux/contrib/xz/src/liblzma/validate_map.sh
- copied unchanged from r278590, head/contrib/xz/src/liblzma/validate_map.sh
projects/release-arm-redux/contrib/xz/src/xz/mytime.c
- copied unchanged from r278590, head/contrib/xz/src/xz/mytime.c
projects/release-arm-redux/contrib/xz/src/xz/mytime.h
- copied unchanged from r278590, head/contrib/xz/src/xz/mytime.h
projects/release-arm-redux/lib/libdevctl/
- copied from r278590, head/lib/libdevctl/
projects/release-arm-redux/release/doc/share/xml/errata.xml
- copied unchanged from r278590, head/release/doc/share/xml/errata.xml
projects/release-arm-redux/release/doc/share/xml/security.xml
- copied unchanged from r278590, head/release/doc/share/xml/security.xml
projects/release-arm-redux/sys/arm/broadcom/bcm2835/bcm2835_audio.c
- copied unchanged from r278590, head/sys/arm/broadcom/bcm2835/bcm2835_audio.c
projects/release-arm-redux/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
- copied unchanged from r278590, head/sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h
projects/release-arm-redux/sys/cddl/contrib/opensolaris/uts/arm/
- copied from r278590, head/sys/cddl/contrib/opensolaris/uts/arm/
projects/release-arm-redux/sys/cddl/dev/dtrace/arm/
- copied from r278590, head/sys/cddl/dev/dtrace/arm/
projects/release-arm-redux/sys/cddl/dev/fbt/arm/
- copied from r278590, head/sys/cddl/dev/fbt/arm/
projects/release-arm-redux/sys/contrib/vchiq/
- copied from r278590, head/sys/contrib/vchiq/
projects/release-arm-redux/sys/dev/cxgbe/if_cxl.c
- copied unchanged from r278590, head/sys/dev/cxgbe/if_cxl.c
projects/release-arm-redux/sys/dev/wpi/if_wpi_debug.h
- copied unchanged from r278590, head/sys/dev/wpi/if_wpi_debug.h
projects/release-arm-redux/sys/modules/cxgbe/if_cxl/
- copied from r278590, head/sys/modules/cxgbe/if_cxl/
projects/release-arm-redux/sys/modules/dtb/rpi/
- copied from r278590, head/sys/modules/dtb/rpi/
projects/release-arm-redux/tools/tools/qrndtest/
- copied from r278590, head/tools/tools/qrndtest/
projects/release-arm-redux/usr.sbin/devctl/
- copied from r278590, head/usr.sbin/devctl/
projects/release-arm-redux/usr.sbin/pw/tests/pw_usernext.sh
- copied unchanged from r278590, head/usr.sbin/pw/tests/pw_usernext.sh
Deleted:
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/lzma.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/stream_encoder.h
projects/release-arm-redux/share/info/
projects/release-arm-redux/sys/powerpc/conf/WII
projects/release-arm-redux/sys/powerpc/wii/
Modified:
projects/release-arm-redux/Makefile.inc1
projects/release-arm-redux/ObsoleteFiles.inc
projects/release-arm-redux/UPDATING
projects/release-arm-redux/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
projects/release-arm-redux/cddl/lib/Makefile
projects/release-arm-redux/cddl/lib/libdtrace/Makefile
projects/release-arm-redux/cddl/usr.sbin/Makefile
projects/release-arm-redux/contrib/binutils/ld/scripttempl/elf.sc
projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf.h
projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
projects/release-arm-redux/contrib/mdocml/lib.in
projects/release-arm-redux/contrib/top/utils.c
projects/release-arm-redux/contrib/xz/ChangeLog
projects/release-arm-redux/contrib/xz/FREEBSD-upgrade
projects/release-arm-redux/contrib/xz/THANKS
projects/release-arm-redux/contrib/xz/TODO
projects/release-arm-redux/contrib/xz/src/common/mythread.h
projects/release-arm-redux/contrib/xz/src/common/sysdefs.h
projects/release-arm-redux/contrib/xz/src/common/tuklib_cpucores.c
projects/release-arm-redux/contrib/xz/src/common/tuklib_physmem.c
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/base.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/block.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/container.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/filter.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/hardware.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/index.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/index_hash.h
projects/release-arm-redux/contrib/xz/src/liblzma/api/lzma/version.h
projects/release-arm-redux/contrib/xz/src/liblzma/check/check.h
projects/release-arm-redux/contrib/xz/src/liblzma/check/sha256.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/alone_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/alone_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/alone_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/auto_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_buffer_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_buffer_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_header_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_header_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/block_util.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/common.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/common.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/easy_buffer_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/easy_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_buffer_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_buffer_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_common.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_common.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/filter_flags_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/index.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/index_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/index_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/index_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/index_hash.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/stream_buffer_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/stream_buffer_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/stream_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/common/stream_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/common/stream_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/delta/delta_common.c
projects/release-arm-redux/contrib/xz/src/liblzma/delta/delta_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/delta/delta_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/delta/delta_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/delta/delta_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/delta/delta_private.h
projects/release-arm-redux/contrib/xz/src/liblzma/liblzma.pc.in
projects/release-arm-redux/contrib/xz/src/liblzma/lz/lz_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/lz/lz_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/lz/lz_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/lz/lz_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/lz/lz_encoder_mf.c
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/fastpos.h
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma2_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma2_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_common.h
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_encoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_encoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
projects/release-arm-redux/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
projects/release-arm-redux/contrib/xz/src/liblzma/rangecoder/range_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/simple/arm.c
projects/release-arm-redux/contrib/xz/src/liblzma/simple/armthumb.c
projects/release-arm-redux/contrib/xz/src/liblzma/simple/ia64.c
projects/release-arm-redux/contrib/xz/src/liblzma/simple/powerpc.c
projects/release-arm-redux/contrib/xz/src/liblzma/simple/simple_coder.c
projects/release-arm-redux/contrib/xz/src/liblzma/simple/simple_coder.h
projects/release-arm-redux/contrib/xz/src/liblzma/simple/simple_decoder.c
projects/release-arm-redux/contrib/xz/src/liblzma/simple/simple_decoder.h
projects/release-arm-redux/contrib/xz/src/liblzma/simple/simple_private.h
projects/release-arm-redux/contrib/xz/src/liblzma/simple/sparc.c
projects/release-arm-redux/contrib/xz/src/liblzma/simple/x86.c
projects/release-arm-redux/contrib/xz/src/xz/args.c
projects/release-arm-redux/contrib/xz/src/xz/args.h
projects/release-arm-redux/contrib/xz/src/xz/coder.c
projects/release-arm-redux/contrib/xz/src/xz/coder.h
projects/release-arm-redux/contrib/xz/src/xz/file_io.c
projects/release-arm-redux/contrib/xz/src/xz/file_io.h
projects/release-arm-redux/contrib/xz/src/xz/hardware.c
projects/release-arm-redux/contrib/xz/src/xz/hardware.h
projects/release-arm-redux/contrib/xz/src/xz/list.c
projects/release-arm-redux/contrib/xz/src/xz/main.c
projects/release-arm-redux/contrib/xz/src/xz/message.c
projects/release-arm-redux/contrib/xz/src/xz/options.c
projects/release-arm-redux/contrib/xz/src/xz/private.h
projects/release-arm-redux/contrib/xz/src/xz/signals.c
projects/release-arm-redux/contrib/xz/src/xz/suffix.c
projects/release-arm-redux/contrib/xz/src/xz/xz.1
projects/release-arm-redux/etc/Makefile
projects/release-arm-redux/etc/devd.conf
projects/release-arm-redux/etc/rc.d/Makefile
projects/release-arm-redux/etc/rc.d/jail
projects/release-arm-redux/etc/rc.d/netif
projects/release-arm-redux/etc/rc.d/routing
projects/release-arm-redux/games/fortune/datfiles/freebsd-tips
projects/release-arm-redux/include/Makefile
projects/release-arm-redux/lib/Makefile
projects/release-arm-redux/lib/clang/clang.build.mk
projects/release-arm-redux/lib/csu/powerpc64/Makefile
projects/release-arm-redux/lib/libc/gen/disklabel.c
projects/release-arm-redux/lib/libc/gen/getgrent.c
projects/release-arm-redux/lib/libc/gen/getpwent.c
projects/release-arm-redux/lib/libc/nls/msgcat.c
projects/release-arm-redux/lib/libc/stdlib/tdelete.c
projects/release-arm-redux/lib/libc/sys/setresuid.2
projects/release-arm-redux/lib/libdevinfo/devinfo.h
projects/release-arm-redux/lib/liblzma/Makefile
projects/release-arm-redux/lib/liblzma/Symbol.map
projects/release-arm-redux/lib/liblzma/Versions.def
projects/release-arm-redux/lib/liblzma/config.h
projects/release-arm-redux/lib/libnetgraph/debug.c
projects/release-arm-redux/lib/libproc/proc_bkpt.c
projects/release-arm-redux/lib/libproc/proc_regs.c
projects/release-arm-redux/lib/libthr/thread/thr_barrier.c
projects/release-arm-redux/lib/msun/src/s_scalbln.c
projects/release-arm-redux/release/Makefile
projects/release-arm-redux/release/Makefile.vm
projects/release-arm-redux/release/doc/en_US.ISO8859-1/errata/article.xml
projects/release-arm-redux/release/doc/en_US.ISO8859-1/relnotes/article.xml
projects/release-arm-redux/release/doc/share/xml/release.ent
projects/release-arm-redux/release/release.sh
projects/release-arm-redux/release/scripts/mk-vmimage.sh
projects/release-arm-redux/rescue/rescue/Makefile
projects/release-arm-redux/sbin/ipfw/ipfw2.c
projects/release-arm-redux/share/examples/Makefile
projects/release-arm-redux/share/man/man4/Makefile
projects/release-arm-redux/share/man/man4/ral.4
projects/release-arm-redux/share/man/man4/witness.4
projects/release-arm-redux/share/man/man5/nullfs.5
projects/release-arm-redux/share/man/man9/Makefile
projects/release-arm-redux/share/misc/Makefile
projects/release-arm-redux/share/mk/bsd.libnames.mk
projects/release-arm-redux/share/mk/bsd.mkopt.mk
projects/release-arm-redux/share/mk/bsd.own.mk
projects/release-arm-redux/share/mk/src.libnames.mk
projects/release-arm-redux/sys/amd64/amd64/apic_vector.S
projects/release-arm-redux/sys/amd64/amd64/genassym.c
projects/release-arm-redux/sys/amd64/amd64/mp_machdep.c
projects/release-arm-redux/sys/amd64/include/cpufunc.h
projects/release-arm-redux/sys/amd64/vmm/vmm_support.S
projects/release-arm-redux/sys/arm/arm/cpufunc.c
projects/release-arm-redux/sys/arm/arm/cpufunc_asm_armv7.S
projects/release-arm-redux/sys/arm/arm/db_trace.c
projects/release-arm-redux/sys/arm/arm/elf_trampoline.c
projects/release-arm-redux/sys/arm/arm/exception.S
projects/release-arm-redux/sys/arm/arm/identcpu.c
projects/release-arm-redux/sys/arm/arm/trap.c
projects/release-arm-redux/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
projects/release-arm-redux/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
projects/release-arm-redux/sys/arm/broadcom/bcm2835/files.bcm2835
projects/release-arm-redux/sys/arm/conf/BEAGLEBONE
projects/release-arm-redux/sys/arm/conf/RPI-B
projects/release-arm-redux/sys/arm/include/armreg.h
projects/release-arm-redux/sys/arm/include/cpufunc.h
projects/release-arm-redux/sys/arm/ti/ti_gpio.c
projects/release-arm-redux/sys/arm/xscale/ixp425/if_npe.c
projects/release-arm-redux/sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu
projects/release-arm-redux/sys/boot/amd64/boot1.efi/generate-fat.sh
projects/release-arm-redux/sys/boot/amd64/efi/main.c
projects/release-arm-redux/sys/boot/arm/ixp425/boot2/ixp425_board.c
projects/release-arm-redux/sys/boot/efi/include/efiapi.h
projects/release-arm-redux/sys/boot/forth/beastie.4th
projects/release-arm-redux/sys/boot/forth/brand.4th
projects/release-arm-redux/sys/boot/pc98/boot2/Makefile
projects/release-arm-redux/sys/cam/cam_ccb.h
projects/release-arm-redux/sys/cam/cam_xpt.c
projects/release-arm-redux/sys/cam/cam_xpt_internal.h
projects/release-arm-redux/sys/cam/ctl/ctl.c
projects/release-arm-redux/sys/cam/ctl/ctl.h
projects/release-arm-redux/sys/cam/ctl/ctl_frontend_iscsi.c
projects/release-arm-redux/sys/cam/ctl/ctl_frontend_iscsi.h
projects/release-arm-redux/sys/cam/ctl/ctl_ioctl.h
projects/release-arm-redux/sys/cam/ctl/ctl_private.h
projects/release-arm-redux/sys/cam/scsi/scsi_all.h
projects/release-arm-redux/sys/cam/scsi/scsi_xpt.c
projects/release-arm-redux/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/release-arm-redux/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
projects/release-arm-redux/sys/cddl/dev/lockstat/lockstat.c
projects/release-arm-redux/sys/cddl/dev/profile/profile.c
projects/release-arm-redux/sys/conf/dtb.mk
projects/release-arm-redux/sys/conf/files
projects/release-arm-redux/sys/conf/files.powerpc
projects/release-arm-redux/sys/conf/kern.mk
projects/release-arm-redux/sys/conf/kern.opts.mk
projects/release-arm-redux/sys/conf/kern.pre.mk
projects/release-arm-redux/sys/conf/options
projects/release-arm-redux/sys/conf/options.powerpc
projects/release-arm-redux/sys/contrib/dev/acpica/include/actbl2.h
projects/release-arm-redux/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
projects/release-arm-redux/sys/contrib/dev/ral/microcode.h
projects/release-arm-redux/sys/contrib/dev/ral/rt2860.fw.uu
projects/release-arm-redux/sys/dev/acpica/acpi.c
projects/release-arm-redux/sys/dev/cxgb/cxgb_osdep.h
projects/release-arm-redux/sys/dev/cxgbe/adapter.h
projects/release-arm-redux/sys/dev/cxgbe/common/t4_hw.c
projects/release-arm-redux/sys/dev/cxgbe/iw_cxgbe/device.c
projects/release-arm-redux/sys/dev/cxgbe/offload.h
projects/release-arm-redux/sys/dev/cxgbe/t4_main.c
projects/release-arm-redux/sys/dev/cxgbe/tom/t4_listen.c
projects/release-arm-redux/sys/dev/cxgbe/tom/t4_tom.c
projects/release-arm-redux/sys/dev/drm2/radeon/ni.c
projects/release-arm-redux/sys/dev/drm2/radeon/si.c
projects/release-arm-redux/sys/dev/ed/if_ed.c
projects/release-arm-redux/sys/dev/hwpmc/hwpmc_armv7.c
projects/release-arm-redux/sys/dev/ipmi/ipmi.c
projects/release-arm-redux/sys/dev/ipmi/ipmi_kcs.c
projects/release-arm-redux/sys/dev/ipmi/ipmi_smic.c
projects/release-arm-redux/sys/dev/ipmi/ipmi_ssif.c
projects/release-arm-redux/sys/dev/ipmi/ipmivars.h
projects/release-arm-redux/sys/dev/iscsi/icl.c
projects/release-arm-redux/sys/dev/iscsi/icl.h
projects/release-arm-redux/sys/dev/iscsi/icl_conn_if.m
projects/release-arm-redux/sys/dev/iscsi/icl_soft.c
projects/release-arm-redux/sys/dev/iscsi/icl_wrappers.h
projects/release-arm-redux/sys/dev/iscsi/iscsi.c
projects/release-arm-redux/sys/dev/iscsi/iscsi.h
projects/release-arm-redux/sys/dev/iscsi/iscsi_ioctl.h
projects/release-arm-redux/sys/dev/malo/if_malo.c
projects/release-arm-redux/sys/dev/mwl/if_mwl.c
projects/release-arm-redux/sys/dev/pci/pci.c
projects/release-arm-redux/sys/dev/ral/if_ral_pci.c
projects/release-arm-redux/sys/dev/ral/rt2860.c
projects/release-arm-redux/sys/dev/ral/rt2860reg.h
projects/release-arm-redux/sys/dev/sfxge/common/efsys.h
projects/release-arm-redux/sys/dev/sfxge/sfxge.c
projects/release-arm-redux/sys/dev/sfxge/sfxge.h
projects/release-arm-redux/sys/dev/sfxge/sfxge_ev.c
projects/release-arm-redux/sys/dev/sfxge/sfxge_mcdi.c
projects/release-arm-redux/sys/dev/sfxge/sfxge_port.c
projects/release-arm-redux/sys/dev/sfxge/sfxge_rx.c
projects/release-arm-redux/sys/dev/sfxge/sfxge_tx.c
projects/release-arm-redux/sys/dev/sfxge/sfxge_tx.h
projects/release-arm-redux/sys/dev/sound/usb/uaudio.c
projects/release-arm-redux/sys/dev/uart/uart_bus_pci.c
projects/release-arm-redux/sys/dev/usb/controller/xhci.c
projects/release-arm-redux/sys/dev/usb/serial/u3g.c
projects/release-arm-redux/sys/dev/usb/usbdevs
projects/release-arm-redux/sys/dev/vt/hw/vga/vt_vga.c
projects/release-arm-redux/sys/dev/wpi/if_wpi.c
projects/release-arm-redux/sys/dev/wpi/if_wpireg.h
projects/release-arm-redux/sys/dev/wpi/if_wpivar.h
projects/release-arm-redux/sys/fs/autofs/autofs.c
projects/release-arm-redux/sys/fs/autofs/autofs_ioctl.h
projects/release-arm-redux/sys/i386/i386/apic_vector.s
projects/release-arm-redux/sys/i386/i386/genassym.c
projects/release-arm-redux/sys/i386/i386/mp_machdep.c
projects/release-arm-redux/sys/i386/include/cpufunc.h
projects/release-arm-redux/sys/kern/init_main.c
projects/release-arm-redux/sys/kern/kern_clock.c
projects/release-arm-redux/sys/kern/kern_clocksource.c
projects/release-arm-redux/sys/kern/kern_sig.c
projects/release-arm-redux/sys/kern/kern_timeout.c
projects/release-arm-redux/sys/kern/subr_bus.c
projects/release-arm-redux/sys/kern/subr_hints.c
projects/release-arm-redux/sys/kern/uipc_shm.c
projects/release-arm-redux/sys/kern/vfs_mount.c
projects/release-arm-redux/sys/modules/Makefile
projects/release-arm-redux/sys/modules/cxgbe/Makefile
projects/release-arm-redux/sys/modules/dtrace/Makefile
projects/release-arm-redux/sys/modules/dtrace/dtrace/Makefile
projects/release-arm-redux/sys/modules/wpi/Makefile
projects/release-arm-redux/sys/netinet/if_ether.c
projects/release-arm-redux/sys/netinet/in.c
projects/release-arm-redux/sys/netinet6/in6.c
projects/release-arm-redux/sys/netinet6/nd6.c
projects/release-arm-redux/sys/netpfil/ipfw/ip_fw_iface.c (contents, props changed)
projects/release-arm-redux/sys/netpfil/ipfw/ip_fw_nat.c
projects/release-arm-redux/sys/netpfil/ipfw/ip_fw_private.h
projects/release-arm-redux/sys/netpfil/ipfw/ip_fw_table.c
projects/release-arm-redux/sys/netpfil/ipfw/ip_fw_table_algo.c
projects/release-arm-redux/sys/powerpc/aim/locore32.S
projects/release-arm-redux/sys/powerpc/aim/machdep.c
projects/release-arm-redux/sys/powerpc/aim/mmu_oea.c
projects/release-arm-redux/sys/powerpc/conf/NOTES
projects/release-arm-redux/sys/powerpc/include/cpu.h
projects/release-arm-redux/sys/powerpc/ofw/ofw_syscons.c
projects/release-arm-redux/sys/powerpc/powerpc/swtch64.S
projects/release-arm-redux/sys/powerpc/pseries/mmu_phyp.c
projects/release-arm-redux/sys/powerpc/pseries/platform_chrp.c
projects/release-arm-redux/sys/powerpc/pseries/xics.c
projects/release-arm-redux/sys/sys/bitset.h
projects/release-arm-redux/sys/sys/bus.h
projects/release-arm-redux/sys/sys/callout.h
projects/release-arm-redux/sys/sys/cdefs.h
projects/release-arm-redux/sys/sys/copyright.h
projects/release-arm-redux/sys/sys/cpuset.h
projects/release-arm-redux/sys/sys/param.h
projects/release-arm-redux/sys/sys/systm.h
projects/release-arm-redux/sys/ufs/ffs/ffs_softdep.c
projects/release-arm-redux/sys/x86/acpica/madt.c
projects/release-arm-redux/sys/x86/include/apicreg.h
projects/release-arm-redux/sys/x86/include/apicvar.h
projects/release-arm-redux/sys/x86/include/specialreg.h
projects/release-arm-redux/sys/x86/x86/io_apic.c
projects/release-arm-redux/sys/x86/x86/local_apic.c
projects/release-arm-redux/sys/x86/xen/xen_apic.c
projects/release-arm-redux/tools/build/mk/OptionalObsoleteFiles.inc
projects/release-arm-redux/tools/tools/makeroot/makeroot.8
projects/release-arm-redux/tools/tools/makeroot/makeroot.sh
projects/release-arm-redux/usr.bin/ctlstat/ctlstat.c
projects/release-arm-redux/usr.bin/iscsictl/iscsi.conf.5
projects/release-arm-redux/usr.bin/iscsictl/iscsictl.c
projects/release-arm-redux/usr.bin/iscsictl/iscsictl.h
projects/release-arm-redux/usr.bin/iscsictl/parse.y
projects/release-arm-redux/usr.bin/iscsictl/token.l
projects/release-arm-redux/usr.bin/ktrdump/ktrdump.8
projects/release-arm-redux/usr.bin/ktrdump/ktrdump.c
projects/release-arm-redux/usr.bin/w/w.c
projects/release-arm-redux/usr.bin/wc/wc.c
projects/release-arm-redux/usr.bin/xz/Makefile
projects/release-arm-redux/usr.sbin/Makefile
projects/release-arm-redux/usr.sbin/bluetooth/hccontrol/hccontrol.8
projects/release-arm-redux/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
projects/release-arm-redux/usr.sbin/bsdconfig/console/INDEX
projects/release-arm-redux/usr.sbin/bsdconfig/includes/INDEX
projects/release-arm-redux/usr.sbin/bsdconfig/networking/share/device.subr
projects/release-arm-redux/usr.sbin/bsdconfig/share/dialog.subr
projects/release-arm-redux/usr.sbin/bsdconfig/share/keymap.subr
projects/release-arm-redux/usr.sbin/bsdconfig/timezone/share/continents.subr
projects/release-arm-redux/usr.sbin/bsdconfig/timezone/share/countries.subr
projects/release-arm-redux/usr.sbin/bsdconfig/timezone/timezone
projects/release-arm-redux/usr.sbin/bsdconfig/usermgmt/share/user.subr
projects/release-arm-redux/usr.sbin/ctladm/ctladm.c
projects/release-arm-redux/usr.sbin/ctld/ctl.conf.5
projects/release-arm-redux/usr.sbin/ctld/ctld.c
projects/release-arm-redux/usr.sbin/ctld/ctld.h
projects/release-arm-redux/usr.sbin/ctld/discovery.c
projects/release-arm-redux/usr.sbin/ctld/kernel.c
projects/release-arm-redux/usr.sbin/ctld/login.c
projects/release-arm-redux/usr.sbin/ctld/parse.y
projects/release-arm-redux/usr.sbin/ctld/token.l
projects/release-arm-redux/usr.sbin/devinfo/devinfo.c
projects/release-arm-redux/usr.sbin/flowctl/flowctl.c
projects/release-arm-redux/usr.sbin/freebsd-update/freebsd-update.sh
projects/release-arm-redux/usr.sbin/iscsid/iscsid.c
projects/release-arm-redux/usr.sbin/iscsid/iscsid.h
projects/release-arm-redux/usr.sbin/iscsid/login.c
projects/release-arm-redux/usr.sbin/jail/command.c
projects/release-arm-redux/usr.sbin/jail/config.c
projects/release-arm-redux/usr.sbin/jail/jail.8
projects/release-arm-redux/usr.sbin/jail/jail.c
projects/release-arm-redux/usr.sbin/jail/jailp.h
projects/release-arm-redux/usr.sbin/mountd/mountd.c
projects/release-arm-redux/usr.sbin/pw/tests/Makefile
projects/release-arm-redux/usr.sbin/syslogd/syslogd.c
Directory Properties:
projects/release-arm-redux/ (props changed)
projects/release-arm-redux/cddl/ (props changed)
projects/release-arm-redux/cddl/contrib/opensolaris/ (props changed)
projects/release-arm-redux/contrib/binutils/ (props changed)
projects/release-arm-redux/contrib/elftoolchain/ (props changed)
projects/release-arm-redux/contrib/mdocml/ (props changed)
projects/release-arm-redux/contrib/top/ (props changed)
projects/release-arm-redux/contrib/xz/ (props changed)
projects/release-arm-redux/etc/ (props changed)
projects/release-arm-redux/include/ (props changed)
projects/release-arm-redux/lib/libc/ (props changed)
projects/release-arm-redux/sbin/ (props changed)
projects/release-arm-redux/sbin/ipfw/ (props changed)
projects/release-arm-redux/share/ (props changed)
projects/release-arm-redux/share/man/man4/ (props changed)
projects/release-arm-redux/sys/ (props changed)
projects/release-arm-redux/sys/amd64/vmm/ (props changed)
projects/release-arm-redux/sys/boot/ (props changed)
projects/release-arm-redux/sys/cddl/contrib/opensolaris/ (props changed)
projects/release-arm-redux/sys/conf/ (props changed)
projects/release-arm-redux/sys/contrib/dev/acpica/ (props changed)
projects/release-arm-redux/sys/contrib/dev/acpica/include/ (props changed)
projects/release-arm-redux/usr.sbin/jail/ (props changed)
Modified: projects/release-arm-redux/Makefile.inc1
==============================================================================
--- projects/release-arm-redux/Makefile.inc1 Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/Makefile.inc1 Wed Feb 11 18:59:46 2015 (r278591)
@@ -50,10 +50,6 @@
.include <bsd.arch.inc.mk>
.include <bsd.compiler.mk>
-# We must do share/info early so that installation of info `dir'
-# entries works correctly. Do it first since it is less likely to
-# grow dependencies on include and lib than vice versa.
-#
# We must do lib/ and libexec/ before bin/, because if installworld
# installs a new /bin/sh, the 'make' command will *immediately*
# use that new version. And the new (dynamically-linked) /bin/sh
@@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
-SUBDIR= share/info lib libexec
+SUBDIR= lib libexec
SUBDIR+=bin
.if ${MK_GAMES} != "no"
SUBDIR+=games
@@ -823,7 +819,7 @@ EXTRA_DISTRIBUTIONS+= tests
DEBUG_DISTRIBUTIONS=
.if ${MK_DEBUG_FILES} != "no"
-DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
.endif
MTREE_MAGIC?= mtree 2.0
@@ -1671,6 +1667,7 @@ _lib_libcapsicum=lib/libcapsicum
lib/libcapsicum__L: lib/libnv__L
lib/libpjdlog__L: lib/libutil__L
+lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
.for _DIR in ${LOCAL_LIB_DIRS}
Modified: projects/release-arm-redux/ObsoleteFiles.inc
==============================================================================
--- projects/release-arm-redux/ObsoleteFiles.inc Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/ObsoleteFiles.inc Wed Feb 11 18:59:46 2015 (r278591)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150209: liblzma header
+OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
OLD_FILES+=usr/share/man/man9/spl.9
OLD_FILES+=usr/share/man/man9/spl0.9
Modified: projects/release-arm-redux/UPDATING
==============================================================================
--- projects/release-arm-redux/UPDATING Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/UPDATING Wed Feb 11 18:59:46 2015 (r278591)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150210:
+ The autofs(4) ABI was changed in order to restore binary compatibility
+ with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work
+ with the new kernel.
+
20150131:
The powerpc64 kernel has been changed to a position-independent
executable. This can only be booted with a new version of loader(8),
@@ -287,6 +292,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
The lindev device has been removed since /dev/full has been made a
standard device. __FreeBSD_version has been bumped.
+20140424:
+ The knob WITHOUT_VI was added to the base system, which controls
+ building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1)
+ in order to reorder files share/termcap and didn't build ex(1) as a
+ build tool, so building/installing with WITH_VI is highly advised for
+ build hosts for older releases.
+
+ This issue has been fixed in stable/9 and stable/10 in r277022 and
+ r276991, respectively.
+
20140418:
The YES_HESIOD knob has been removed. It has been obsolete for
a decade. Please move to using WITH_HESIOD instead or your builds
Modified: projects/release-arm-redux/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/release-arm-redux/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Wed Feb 11 18:59:46 2015 (r278591)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
{
ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
- ctf_buf_write(b, &id, sizeof (id));
-
if (target_requires_swap) {
SWAP_16(id);
}
+ ctf_buf_write(b, &id, sizeof (id));
+
debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
}
Modified: projects/release-arm-redux/cddl/lib/Makefile
==============================================================================
--- projects/release-arm-redux/cddl/lib/Makefile Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/cddl/lib/Makefile Wed Feb 11 18:59:46 2015 (r278591)
@@ -27,7 +27,8 @@ _libzpool= libzpool
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+ ${MACHINE_CPUARCH} == "arm"
_drti= drti
_libdtrace= libdtrace
.endif
Modified: projects/release-arm-redux/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/release-arm-redux/cddl/lib/libdtrace/Makefile Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/cddl/lib/libdtrace/Makefile Wed Feb 11 18:59:46 2015 (r278591)
@@ -81,6 +81,10 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/ut
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
.elif ${MACHINE_CPUARCH} == "powerpc"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc
Modified: projects/release-arm-redux/cddl/usr.sbin/Makefile
==============================================================================
--- projects/release-arm-redux/cddl/usr.sbin/Makefile Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/cddl/usr.sbin/Makefile Wed Feb 11 18:59:46 2015 (r278591)
@@ -30,6 +30,12 @@ _plockstat= plockstat
.endif
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace= dtrace
+_dtruss= dtruss
+_lockstat= lockstat
+.endif
+
.if ${MACHINE_CPUARCH} == "mips"
_dtrace= dtrace
.endif
Modified: projects/release-arm-redux/contrib/binutils/ld/scripttempl/elf.sc
==============================================================================
--- projects/release-arm-redux/contrib/binutils/ld/scripttempl/elf.sc Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/contrib/binutils/ld/scripttempl/elf.sc Wed Feb 11 18:59:46 2015 (r278591)
@@ -402,8 +402,8 @@ cat <<EOF
.fini_array ${RELOCATING-0} :
{
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
- KEEP (*(.fini_array))
KEEP (*(SORT(.fini_array.*)))
+ KEEP (*(.fini_array))
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
}
${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}
Modified: projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf.h Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf.h Wed Feb 11 18:59:46 2015 (r278591)
@@ -439,6 +439,7 @@ enum Dwarf_ISA {
DW_ISA_SPARC,
DW_ISA_X86,
DW_ISA_X86_64,
+ DW_ISA_AARCH64,
DW_ISA_MAX
};
Modified: projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Wed Feb 11 18:59:46 2015 (r278591)
@@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
assert(dbg != NULL);
switch (dbg->dbgp_isa) {
+ case DW_ISA_AARCH64:
+ return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
case DW_ISA_X86:
return (R_386_32);
case DW_ISA_X86_64:
@@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
switch (dbg->dbg_machine) {
case EM_NONE:
break;
+ case EM_AARCH64:
+ if (rel_type == R_AARCH64_ABS32)
+ return (4);
+ else if (rel_type == R_AARCH64_ABS64)
+ return (8);
+ break;
case EM_ARM:
if (rel_type == R_ARM_ABS32)
return (4);
Modified: projects/release-arm-redux/contrib/mdocml/lib.in
==============================================================================
--- projects/release-arm-redux/contrib/mdocml/lib.in Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/contrib/mdocml/lib.in Wed Feb 11 18:59:46 2015 (r278591)
@@ -41,6 +41,7 @@ LINE("libcrypt", "Crypt Library (libcryp
LINE("libcurses", "Curses Library (libcurses, \\-lcurses)")
LINE("libcuse", "Userland Character Device Library (libcuse, \\-lcuse)")
LINE("libdevattr", "Device attribute and event library (libdevattr, \\-ldevattr)")
+LINE("libdevctl", "Device Control Library (libdevctl, \\-ldevctl)")
LINE("libdevinfo", "Device and Resource Information Utility Library (libdevinfo, \\-ldevinfo)")
LINE("libdevstat", "Device Statistics Library (libdevstat, \\-ldevstat)")
LINE("libdisk", "Interface to Slice and Partition Labels Library (libdisk, \\-ldisk)")
Modified: projects/release-arm-redux/contrib/top/utils.c
==============================================================================
--- projects/release-arm-redux/contrib/top/utils.c Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/contrib/top/utils.c Wed Feb 11 18:59:46 2015 (r278591)
@@ -58,6 +58,7 @@ char *str;
* ever convert will be 2^32-1, which is 10
* digits.
*/
+_Static_assert(sizeof(int) <= 4, "buffer too small for this sized int");
char *itoa(val)
Modified: projects/release-arm-redux/contrib/xz/ChangeLog
==============================================================================
--- projects/release-arm-redux/contrib/xz/ChangeLog Wed Feb 11 17:56:24 2015 (r278590)
+++ projects/release-arm-redux/contrib/xz/ChangeLog Wed Feb 11 18:59:46 2015 (r278591)
@@ -1,66 +1,923 @@
-commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af
+commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 20:44:32 +0300
+Date: 2014-12-21 20:48:37 +0200
- Bump version and soname for 5.0.7.
+ DOS: Update Makefile.
+
+ dos/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 19:50:38 +0200
+
+ Windows: Fix bin_i486 to bin_i686 in build.bash.
+
+ windows/build.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cbafa710918195dbba3db02c3fab4f0538235206
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:58:44 +0200
+
+ Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c.
+
+ doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 4 deletions(-)
+
+commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:56:44 +0200
+
+ Docs: Update docs/examples/00_README.txt.
+
+ doc/examples/00_README.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:11:17 +0200
+
+ Bump version and soname for 5.2.0.
+
+ I know that soname != app version, but I skip AGE=1
+ in -version-info to make the soname match the liblzma
+ version anyway. It doesn't hurt anything as long as
+ it doesn't conflict with library versioning rules.
src/liblzma/Makefile.am | 2 +-
- src/liblzma/api/lzma/version.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/liblzma/api/lzma/version.h | 6 +++---
+ src/liblzma/liblzma.map | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3e8bd1d15e417f2d588e9be50ce027ee3d48b2da
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:05:03 +0200
+
+ Avoid variable-length arrays in the debug programs.
+
+ debug/full_flush.c | 3 ++-
+ debug/sync_flush.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 72f7307cfdceb941aeb2bf30d424cc0d13621786
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:01:45 +0200
+
+ Build: Include 04_compress_easy_mt.c in the tarball.
+
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2cb82ff21c62def11f3683a8bb0aaf363102aaa0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:00:38 +0200
+
+ Fix build when --disable-threads is used.
+
+ src/common/mythread.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9b9e3536e458ef958f66b0e8982efc9d36de4d17
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:56:15 +0100
+
+ po/fr: improve wording for help for --lzma1/--lzma2.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a8b6b569e7fadbf5b5b9139d53bc764015c15027
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:55:48 +0100
+
+ po/fr: missing line in translation of --extreme.
+
+ po/fr.po | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f168a6fd1a888cf4f0caaddcafcb21dadc6ab6e9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:33 +0200
+
+ Update NEWS for 5.2.0.
+
+ NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+
+commit cec2ee863b3a88f4bf039cb00f73c4a4fc93a429
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:22 +0200
+
+ Update NEWS for 5.0.8.
+
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 42e97a32649bf53ce43be2258b902a417c6e7fa1
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:07:54 +0200
+
+ xz: Fix a comment.
+
+ src/xz/options.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 29b95d5d6665cedffa6a9d6d3d914f981e852182
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:43:14 +0200
+
+ Update INSTALL about the dependencies of the scripts.
+
+ INSTALL | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit 3af91040bb42c21afbb81f5568c3313125e61192
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:42:33 +0200
+
+ Windows: Update build instructions.
+
+ INSTALL | 15 +++++++++------
+ windows/INSTALL-Windows.txt | 44 +++++++++++++++++++++-----------------------
+ 2 files changed, 30 insertions(+), 29 deletions(-)
+
+commit 0152f72bf6289d744823dc6c849538f3a139ad70
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:41:48 +0200
+
+ Windows: Update the build script and README-Windows.txt.
+
+ The 32-bit build is now for i686 or newer because the
+ prebuilt MinGW-w64 toolchains include i686 code in the
+ executables even if one uses -march=i486.
+
+ The build script builds 32-bit SSE2 enabled version too.
+ Run-time detection of SSE2 support would be nice (on any OS)
+ but it's not implemented in XZ Utils yet.
+
+ windows/README-Windows.txt | 30 ++++++++++++++++--------------
+ windows/build.bash | 23 ++++++++++++++---------
+ 2 files changed, 30 insertions(+), 23 deletions(-)
+
+commit 4a1f6133ee5533cee8d91e06fcc22443e5f1881a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-19 15:51:50 +0200
+
+ Windows: Define TUKLIB_SYMBOL_PREFIX in config.h.
+
+ It is to keep all symbols in the lzma_ namespace.
+
+ windows/config.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 7f7d093de79eee0c7dbfd7433647e46302f19f82
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 21:00:09 +0200
+
+ xz: Update the man page about --threads.
+
+ src/xz/xz.1 | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 009823448b82aa5f465668878a544c5842885407
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 20:57:43 +0200
+
+ xz: Update the man page about --block-size.
+
+ src/xz/xz.1 | 41 +++++++++++++++++++++++++++++++++--------
+ 1 file changed, 33 insertions(+), 8 deletions(-)
+
+commit 7dddfbeb499e528940bc12047355c184644aafe9
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:26:57 +0100
+
+ po/fr: several more translation updates: reword and handle --ignore-check.
+
+ po/fr.po | 50 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+commit 6eca5be40e04ddc4b738d493e4e56835956d8b69
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:23:01 +0100
+
+ po/fr: yet another place where my email address had to be updated.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d1003673e92ba47edd6aeeb3dbea05c18269d0e7
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:22:20 +0100
+
+ po/fr: fix several typos that have been around since the beginning.
+
+ po/fr.po | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+commit 4c5aa911a0df027e46171e368debc543d2fa72b2
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:02:31 +0100
+
+ po/fr: last batch of new translations for now.
+
+ Four new error messages.
+
+ po/fr.po | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 3e3099e36d27059499e7996fb38a62e8ab01d356
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:01:32 +0100
+
+ po/fr: translations for --threads, --block-size and --block-list.
+
+ po/fr.po | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit e7d96a5933eec4e9d4a62569ee88df0ebb0f1d53
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:00:53 +0100
+
+ po/fr: remove fuzzy marker for error messages that will be kept in English.
+
+ The following is a copy of a comment inside fr.po:
+
+ Note from translator on "file status flags".
+ The following entry is kept un-translated on purpose. It is difficult to
+ translate and should only happen in exceptional circumstances which means
+ that translating would:
+ - lose some of the meaning
+ - make it more difficult to look up in search engines; it might happen one
+ in
+ a million times, if we dilute the error message in 20 languages, it will be
+ almost impossible to find an explanation and support for the error.
+
+ po/fr.po | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+commit 46cbb9033af8a21fafe543302d6919746e0d72af
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:58:25 +0100
+
+ po/fr: several minor updates and better wording.
+
+ Meaning doesn't change at all: it's only for better wording and/or
+ formatting of a few strings.
+
+ po/fr.po | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 7ce49d444f04e73145f79c832eb4d510594b074a
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:56:12 +0100
+
+ po/fr: update my email address and copyright years.
+
+ po/fr.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 214c553ebc3047cd720da1ce5c80cf7c38118d3c
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-11-26 10:08:26 +0100
+
+ fr.po: commit file after only "update-po" so actual is readable.
+
+ po/fr.po | 311 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 199 insertions(+), 112 deletions(-)
+
+commit 1190c641af09cde85f8bd0fbe5c4906f4a29431b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-02 20:04:07 +0200
+
+ liblzma: Document how lzma_mt.block_size affects memory usage.
+
+ src/liblzma/api/lzma/container.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e4fc1d2f9571fba79ce383595be2ea2a9257def0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-28 20:07:18 +0200
+
+ Update INSTALL about a "make check" failure in test_scripts.sh.
+
+ INSTALL | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+commit 34f9e40a0a0c3bd2c2730cdb9cd550bbb8a3f2fe
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:12:27 +0200
+
+ Remove LZMA_UNSTABLE macro.
+
+ src/liblzma/api/lzma/container.h | 4 ----
+ src/liblzma/common/common.h | 2 --
+ src/xz/private.h | 1 -
+ 3 files changed, 7 deletions(-)
+
+commit 6d9c0ce9f2677b159e32b224aba5b535b304a705
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:10:33 +0200
+
+ liblzma: Update lzma_stream_encoder_mt() API docs.
+
+ src/liblzma/api/lzma/container.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 2301f3f05dd9742f42cda8f0f318864f5dc39ab3
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-25 12:32:05 +0200
+
+ liblzma: Verify the filter chain in threaded encoder initialization.
+
+ This way an invalid filter chain is detected at the Stream
+ encoder initialization instead of delaying it to the first
+ call to lzma_code() which triggers the initialization of
+ the actual filter encoder(s).
+
+ src/liblzma/common/stream_encoder_mt.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 107a263d5bb63cd3593fd6a5c938706539f84523
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 19:11:49 +0200
+
+ Build: Update m4/ax_pthread.m4 from Autoconf Archive.
+
+ m4/ax_pthread.m4 | 71 +++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 47 insertions(+), 24 deletions(-)
+
+commit b13a781833399ff5726cfc997f3cb2f0acbdbf31
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:52:21 +0200
+
+ Build: Replace obsolete AC_HELP_STRING with AS_HELP_STRING.
+
+ configure.ac | 36 ++++++++++++++++++------------------
+ m4/tuklib_integer.m4 | 2 +-
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 542cac122ed3550148a2af0033af22b757491378
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:43:19 +0200
+
+ Build: Fix Autoconf warnings about escaped backquotes.
+
+ Thanks to Daniel Richard G. for pointing out that it's
+ good to sometimes run autoreconf -fi with -Wall.
+
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 7b03a15cea8cd4f19ed680b51c4bcbae3ce4142f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:54:40 +0200
+
+ xzdiff: Use mkdir if mktemp isn't available.
+
+ src/scripts/xzdiff.in | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+commit f8c13e5e3609581d5dd9f8777985ca07f2390ad7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:45:01 +0200
+
+ xzdiff: Create a temporary directory to hold a temporary file.
+
+ This avoids the possibility of "File name too long" when
+ creating a temp file when the input file name is very long.
+
+ This also means that other users on the system can no longer
+ see the input file names in /tmp (or whatever $TMPDIR is)
+ since the temporary directory will have a generic name. This
+ usually doesn't matter since on many systems one can see
+ the arguments given to all processes anyway.
+
+ The number X chars to mktemp where increased from 6 to 10.
+
+ Note that with some shells temp files or dirs won't be used at all.
+
+ src/scripts/xzdiff.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 7716dcf9df7f457500cb657314e7a9aea5fedb06
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 15:38:47 +0200
+
+ liblzma: Fix lzma_mt.preset in lzma_stream_encoder_mt_memusage().
+
+ It read the filter chain from a wrong variable. This is a similar
+ bug that was fixed in 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e.
+
+ src/liblzma/common/stream_encoder_mt.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 230fa4a605542c84b4178a57381695a0af4e779b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 14:49:55 +0200
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4e4ae08bc7c1711e399c9f2d26eb375d39d08101
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:28:25 +0200
+
+ Update .gitignore files.
+
+ .gitignore | 2 ++
+ m4/.gitignore | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit c923b140b27d1a055db6284e10fd546ad1a7fcdb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:15:35 +0200
+
+ Build: Prepare to support Automake's subdir-objects.
+
+ Due to a bug in Automake, subdir-objects won't be enabled
+ for now.
+
+ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+
+ Thanks to Daniel Richard G. for the original patches.
+
+ configure.ac | 7 ++++++-
+ src/Makefile.am | 22 +++++++++++++++++++++-
+ src/liblzma/Makefile.am | 4 ++--
+ src/lzmainfo/Makefile.am | 4 ++--
+ src/xz/Makefile.am | 10 +++++-----
+ src/xzdec/Makefile.am | 8 ++++----
+ 6 files changed, 40 insertions(+), 15 deletions(-)
+
+commit 08c2aa16bea0df82828f665d51fba2e0a5e8997f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-24 20:09:29 +0300
+
+ Translations: Update the Italian translation.
+
+ Thanks to Milo Casagrande.
+
+ po/it.po | 452 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 275 insertions(+), 177 deletions(-)
+
+commit 2f9f61aa83539c54ff6c118a2693890f0519b3dd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-18 18:51:45 +0300
+
+ Translations: Update the Polish translation.
+
+ Thanks to Jakub Bogusz.
+
+ po/pl.po | 332 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 214 insertions(+), 118 deletions(-)
+
+commit 4f9d233f67aea25e532824d11b7642cf7dee7a76
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:30 +0200
+
+ l10n: de.po: Change translator email address.
+
+ Although the old address is still working, the new one should
+ be preferred. So this commit changes all three places in de.po
+ accordingly.
+
+ Signed-off-by: Andre Noll <maan@tuebingen.mpg.de>
+
+ po/de.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 00502b2bedad43f0cc167ac17ae0608837ee196b
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:29 +0200
+
+ l10n: de.po: Update German translation
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 531 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 281 insertions(+), 250 deletions(-)
+
+commit 706b0496753fb609e69f1570ec603f11162189d1
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:28 +0200
+
+ l10n: de.po: Fix typo: Schießen -> Schließen.
+
+ That's a funny one since "schießen" means to shoot :)
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7c32e6a935c3d7ee366abad1679bd5f322f0c7d4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:42:26 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 076258cc458f1e705041ac7a729b15ffe8c5214a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:41:51 +0300
+
+ Add support for AmigaOS/AROS to tuklib_physmem().
+
+ Thanks to Fredrik Wikstrom.
+
+ m4/tuklib_physmem.m4 | 3 ++-
+ src/common/tuklib_physmem.c | 7 +++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit efa7b0a210e1baa8e128fc98c5443a944c39ad24
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 18:42:14 +0300
+
+ xzgrep: Avoid passing both -q and -l to grep.
+
+ The behavior of grep -ql varies:
+ - GNU grep behaves like grep -q.
+ - OpenBSD grep behaves like grep -l.
+
+ POSIX doesn't make it 100 % clear what behavior is expected.
+ Anyway, using both -q and -l at the same time makes no sense
+ so both options simply should never be used at the same time.
+
+ Thanks to Christian Weisgerber.
+
+ src/scripts/xzgrep.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 9c5f76098c9986b48d2fc574a0b764f4cde0c538
+Author: Trần Ngá»c Quân <vnwildman@gmail.com>
+Date: 2014-09-25 09:22:45 +0700
+
+ l10n: vi.po: Update Vietnamese translation
+
+ Signed-off-by: Trần Ngá»c Quân <vnwildman@gmail.com>
+
+ po/vi.po | 136 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 84 insertions(+), 52 deletions(-)
+
+commit c4911f2db36d811896c73c008b4218d8fa9a4730
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-25 18:38:48 +0300
+
+ Build: Detect supported compiler warning flags better.
+
+ Clang and nowadays also GCC accept any -Wfoobar option
+ but then may give a warning that an unknown warning option
+ was specified. To avoid adding unsupported warning options,
+ the options are now tested with -Werror.
+
+ Thanks to Charles Diza.
+
+ configure.ac | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 76e75522ed6f5c228d55587dee5a997893f6e474
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-20 21:01:21 +0300
+
+ Update NEWS for 5.0.7.
+
+ NEWS | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+commit d62028b4c1174fc67b6929f126f5eb24c018c700
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-20 19:42:56 +0300
+
+ liblzma: Fix a portability problem in Makefile.am.
+
+ POSIX supports $< only in inference rules (suffix rules).
+ Using it elsewhere is a GNU make extension and doesn't
+ work e.g. with OpenBSD make.
+
+ Thanks to Christian Weisgerber for the patch.
+
+ src/liblzma/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c35de31d4283edad3e57d37ffe939406542cb7bb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:54:09 +0300
+
+ Bump the version number to 5.1.4beta.
+
+ src/liblzma/api/lzma/version.h | 4 ++--
+ src/liblzma/liblzma.map | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+commit e9e097e22cacdaa23e5414fea7913535449cb340
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:50:13 +0300
+
+ Update NEWS for 5.0.6 and 5.1.4beta.
+
+ NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 50 insertions(+)
+
+commit 642f856bb8562ab66704b1e01ac7bc08b6d0a663
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-09-14 21:02:41 +0300
+
+ Update TODO.
+
+ TODO | 38 ++++++++++++++++++++++++++++++++++----
+ 1 file changed, 34 insertions(+), 4 deletions(-)
+
+commit 6b5e3b9eff5b8cedb2aac5f524d4d60fc8a48124
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:32:36 +0300
+
+ xz: Add --ignore-check.
+
+ src/xz/args.c | 7 +++++++
+ src/xz/args.h | 1 +
+ src/xz/coder.c | 10 +++++++++-
+ src/xz/message.c | 2 ++
+ src/xz/xz.1 | 19 +++++++++++++++++++
+ 5 files changed, 38 insertions(+), 1 deletion(-)
+
+commit 9adbc2ff373f979c917cdfd3679ce0ebd59f1040
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:15:07 +0300
+
+ liblzma: Add support for LZMA_IGNORE_CHECK.
+
+ src/liblzma/api/lzma/container.h | 24 ++++++++++++++++++++++++
+ src/liblzma/common/common.h | 1 +
+ src/liblzma/common/stream_decoder.c | 14 ++++++++++++--
+ 3 files changed, 37 insertions(+), 2 deletions(-)
+
+commit 0e0f34b8e4f1c60ecaec15c2105982381cc9c3e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-05 22:03:30 +0300
+
+ liblzma: Add support for lzma_block.ignore_check.
+
+ Note that this slightly changes how lzma_block_header_decode()
+ has been documented. Earlier it said that the .version is set
+ to the lowest required value, but now it says that the .version
+ field is kept unchanged if possible. In practice this doesn't
+ affect any old code, because before this commit the only
+ possible .version was 0.
+
+ src/liblzma/api/lzma/block.h | 50 ++++++++++++++++++++++++-------
+ src/liblzma/common/block_buffer_encoder.c | 2 +-
+ src/liblzma/common/block_decoder.c | 18 ++++++++---
+ src/liblzma/common/block_encoder.c | 2 +-
+ src/liblzma/common/block_header_decoder.c | 12 ++++++--
+ src/liblzma/common/block_header_encoder.c | 2 +-
+ src/liblzma/common/block_util.c | 2 +-
+ 7 files changed, 68 insertions(+), 20 deletions(-)
+
+commit 71e1437ab585b46f7a25f5a131557d3d1c0cbaa2
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-04 19:25:58 +0300
+
+ liblzma: Use lzma_memcmplen() in the BT3 match finder.
+
+ I had missed this when writing the commit
+ 5db75054e900fa06ef5ade5f2c21dffdd5d16141.
+
+ Thanks to Jun I Jin.
+
+ src/liblzma/lz/lz_encoder_mf.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+commit 41dc9ea06e1414ebe8ef52afc8fc15b6e3282b04
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-04 00:25:44 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 5dcffdbcc23a68abc3ac3539b30be71bc9b5af84
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 21:32:25 +0300
+
+ liblzma: SHA-256: Optimize the Maj macro slightly.
+
+ The Maj macro is used where multiple things are added
+ together, so making Maj a sum of two expressions allows
+ some extra freedom for the compiler to schedule the
+ instructions.
+
+ I learned this trick from
+ <http://www.hackersdelight.org/corres.txt>.
+
+ src/liblzma/check/sha256.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a9477d1e0c6fd0e47e637d051e7b9e2a5d9af517
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 21:08:12 +0300
+
+ liblzma: SHA-256: Optimize the way rotations are done.
+
+ This looks weird because the rotations become sequential,
+ but it helps quite a bit on both 32-bit and 64-bit x86:
+
+ - It requires fewer instructions on two-operand
+ instruction sets like x86.
+
+ - It requires one register less which matters especially
+ on 32-bit x86.
+
+ I hope this doesn't hurt other archs.
+
+ I didn't invent this idea myself, but I don't remember where
+ I saw it first.
+
+ src/liblzma/check/sha256.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+commit 5a76c7c8ee9a0afbeedb1c211db9224260404347
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 20:38:13 +0300
+
+ liblzma: SHA-256: Remove the GCC #pragma that became unneeded.
+
+ The unrolling in the previous commit should avoid the
+ situation where a compiler may think that an uninitialized
+ variable might be accessed.
+
+ src/liblzma/check/sha256.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 9a096f8e57509775c331950b8351bbca77bdcfa8
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 20:33:38 +0300
+
+ liblzma: SHA-256: Unroll a little more.
+
+ This way a branch isn't needed for each operation
+ to choose between blk0 and blk2, and still the code
+ doesn't grow as much as it would with full unrolling.
+
+ src/liblzma/check/sha256.c | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+commit bc7650d87bf27f85f1a2a806dc2db1780e09e6a5
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-08-03 19:56:43 +0300
+
+ liblzma: SHA-256: Do the byteswapping without a temporary buffer.
+
+ src/liblzma/check/sha256.c | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+commit 544aaa3d13554e8640f9caf7db717a96360ec0f6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-07-25 22:38:28 +0300
+
+ liblzma: Use lzma_memcmplen() in normal mode of LZMA.
+
+ Two locations were not changed yet because the simplest change
+ assumes that the initial "len" may be greater than "limit".
+
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 20:25:24 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 9A27EE61;
Wed, 11 Feb 2015 20:25:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 8526A641;
Wed, 11 Feb 2015 20:25:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BKPOtq000915;
Wed, 11 Feb 2015 20:25:24 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BKPM59000897;
Wed, 11 Feb 2015 20:25:22 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502112025.t1BKPM59000897@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 20:25:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278595 - in projects/release-arm-redux/release: . arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 20:25:24 -0000
Author: gjb
Date: Wed Feb 11 20:25:21 2015
New Revision: 278595
URL: https://svnweb.freebsd.org/changeset/base/278595
Log:
Initial restructure for FreeBSD/arm release builds.
Sponsored by: The FreeBSD Foundation
Added:
projects/release-arm-redux/release/Makefile.arm (contents, props changed)
projects/release-arm-redux/release/arm/Makefile.BEAGLEBONE (contents, props changed)
projects/release-arm-redux/release/arm/Makefile.PANDABOARD (contents, props changed)
projects/release-arm-redux/release/arm/Makefile.RPI-B (contents, props changed)
projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD (contents, props changed)
projects/release-arm-redux/release/arm/Makefile.ZEDBOARD (contents, props changed)
Modified:
projects/release-arm-redux/release/Makefile
Modified: projects/release-arm-redux/release/Makefile
==============================================================================
--- projects/release-arm-redux/release/Makefile Wed Feb 11 19:57:38 2015 (r278594)
+++ projects/release-arm-redux/release/Makefile Wed Feb 11 20:25:21 2015 (r278595)
@@ -316,3 +316,4 @@ release-install:
cd ${DESTDIR} && md5 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.MD5
.include "${.CURDIR}/Makefile.vm"
+.include "${.CURDIR}/Makefile.arm"
Added: projects/release-arm-redux/release/Makefile.arm
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-arm-redux/release/Makefile.arm Wed Feb 11 20:25:21 2015 (r278595)
@@ -0,0 +1,36 @@
+#
+# $FreeBSD$
+#
+
+BOARDS?= BEAGLEBONE \
+ RPI-B \
+ PANDABOARD \
+ WANDBOARD-QUAD \
+ ZEDBOARD \
+ NUCLEUS
+
+ARMTARGETS?=
+ARMSIZE?= 1G
+ARMPORTS?=
+CLEANFILES+= arm-all
+WITH_ARM_IMAGES?=1
+
+.if defined(WITH_ARM_IMAGES) && !empty(WITH_ARM_IMAGES) && !empty(BOARDS)
+. for BOARD in ${BOARDS}
+ARMTARGETS+= arm-${BOARD:tl}
+CLEANDIRS+= arm-${BOARD:tl}
+CLEANFILES+= arm-${BOARD:tu}.img \
+ arm-${BOARD:tu}.raw \
+ build-arm-${BOARD:tl}
+. if exists(${.CURDIR}/arm/Makefile.${BOARD})
+. include "${.CURDIR}/arm/Makefile.${BOARD}"
+. endif
+
+arm-${BOARD:tl}:
+ ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} build-${.TARGET}
+. endfor
+.endif # !WITH_ARM_IMAGES
+
+
+arm-all: ${ARMTARGETS}
+ touch ${.TARGET}
Added: projects/release-arm-redux/release/arm/Makefile.BEAGLEBONE
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-arm-redux/release/arm/Makefile.BEAGLEBONE Wed Feb 11 20:25:21 2015 (r278595)
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD= BEAGLEBONE
+
+build-arm-${BOARD:tl}:
+ touch ${.TARGET}
Added: projects/release-arm-redux/release/arm/Makefile.PANDABOARD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-arm-redux/release/arm/Makefile.PANDABOARD Wed Feb 11 20:25:21 2015 (r278595)
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD= PANDABOARD
+
+build-arm-${BOARD:tl}:
+ touch ${.TARGET}
Added: projects/release-arm-redux/release/arm/Makefile.RPI-B
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-arm-redux/release/arm/Makefile.RPI-B Wed Feb 11 20:25:21 2015 (r278595)
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD= RPI-B
+
+build-arm-${BOARD:tl}:
+ touch ${.TARGET}
Added: projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD Wed Feb 11 20:25:21 2015 (r278595)
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD= WANDBOARD-QUAD
+
+build-arm-${BOARD:tl}:
+ touch ${.TARGET}
Added: projects/release-arm-redux/release/arm/Makefile.ZEDBOARD
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-arm-redux/release/arm/Makefile.ZEDBOARD Wed Feb 11 20:25:21 2015 (r278595)
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD= ZEDBOARD
+
+build-arm-${BOARD:tl}:
+ touch ${.TARGET}
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 20:50:27 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id B8993BE7;
Wed, 11 Feb 2015 20:50:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 A3828BB1;
Wed, 11 Feb 2015 20:50:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BKoRRP013705;
Wed, 11 Feb 2015 20:50:27 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BKoQcA013701;
Wed, 11 Feb 2015 20:50:26 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502112050.t1BKoQcA013701@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 20:50:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278596 - in projects/release-arm-redux/release: . arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 20:50:27 -0000
Author: gjb
Date: Wed Feb 11 20:50:25 2015
New Revision: 278596
URL: https://svnweb.freebsd.org/changeset/base/278596
Log:
Add CROSS_TOOLCHAIN for arm builds.
Remove a BOARDS entry left in while testing.
Add build-arm-ports${BOARD} target as a prerequisite when
ARMPORTS is set.
Add build-arm-KERNCONF and build-arm-ports to CLEANFILES.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-arm-redux/release/Makefile.arm
projects/release-arm-redux/release/arm/Makefile.BEAGLEBONE
projects/release-arm-redux/release/arm/Makefile.RPI-B
projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD
Modified: projects/release-arm-redux/release/Makefile.arm
==============================================================================
--- projects/release-arm-redux/release/Makefile.arm Wed Feb 11 20:25:21 2015 (r278595)
+++ projects/release-arm-redux/release/Makefile.arm Wed Feb 11 20:50:25 2015 (r278596)
@@ -6,14 +6,15 @@ BOARDS?= BEAGLEBONE \
RPI-B \
PANDABOARD \
WANDBOARD-QUAD \
- ZEDBOARD \
- NUCLEUS
+ ZEDBOARD
ARMTARGETS?=
ARMSIZE?= 1G
+ARM_WFLAGS?= CROSS_TOOLCHAIN=armv6-gcc
ARMPORTS?=
-CLEANFILES+= arm-all
+
WITH_ARM_IMAGES?=1
+CLEANFILES+= arm-all
.if defined(WITH_ARM_IMAGES) && !empty(WITH_ARM_IMAGES) && !empty(BOARDS)
. for BOARD in ${BOARDS}
@@ -21,7 +22,8 @@ ARMTARGETS+= arm-${BOARD:tl}
CLEANDIRS+= arm-${BOARD:tl}
CLEANFILES+= arm-${BOARD:tu}.img \
arm-${BOARD:tu}.raw \
- build-arm-${BOARD:tl}
+ build-arm-${BOARD:tl} \
+ build-arm-ports${BOARD:tl}
. if exists(${.CURDIR}/arm/Makefile.${BOARD})
. include "${.CURDIR}/arm/Makefile.${BOARD}"
. endif
@@ -31,6 +33,16 @@ arm-${BOARD:tl}:
. endfor
.endif # !WITH_ARM_IMAGES
-
arm-all: ${ARMTARGETS}
touch ${.TARGET}
+
+build-arm-ports${BOARD:tl}:
+.if defined(ARMPORTS) && !empty(ARMPORTS)
+. if !exists(${PORTSDIR}/Makefile)
+. error "Ports tree (${PORTSDIR}) is required."
+. endif
+. for AP in ${ARMPORTS}
+ @echo ${MAKE} -C ${PORTSDIR}/${AP} all install clean distclean
+. endfor
+.endif
+ touch ${.TARGET}
Modified: projects/release-arm-redux/release/arm/Makefile.BEAGLEBONE
==============================================================================
--- projects/release-arm-redux/release/arm/Makefile.BEAGLEBONE Wed Feb 11 20:25:21 2015 (r278595)
+++ projects/release-arm-redux/release/arm/Makefile.BEAGLEBONE Wed Feb 11 20:50:25 2015 (r278596)
@@ -3,6 +3,7 @@
#
BOARD= BEAGLEBONE
+ARMPORTS= sysutils/u-boot-beaglebone
-build-arm-${BOARD:tl}:
+build-arm-${BOARD:tl}: build-arm-ports${BOARD:tl}
touch ${.TARGET}
Modified: projects/release-arm-redux/release/arm/Makefile.RPI-B
==============================================================================
--- projects/release-arm-redux/release/arm/Makefile.RPI-B Wed Feb 11 20:25:21 2015 (r278595)
+++ projects/release-arm-redux/release/arm/Makefile.RPI-B Wed Feb 11 20:50:25 2015 (r278596)
@@ -3,6 +3,7 @@
#
BOARD= RPI-B
+ARMPORTS= sysutils/u-boot-rpi
-build-arm-${BOARD:tl}:
+build-arm-${BOARD:tl}: build-arm-ports${BOARD:tl}
touch ${.TARGET}
Modified: projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD
==============================================================================
--- projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD Wed Feb 11 20:25:21 2015 (r278595)
+++ projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD Wed Feb 11 20:50:25 2015 (r278596)
@@ -3,6 +3,7 @@
#
BOARD= WANDBOARD-QUAD
+ARMPORTS= sysutils/u-boot-wandboard
-build-arm-${BOARD:tl}:
+build-arm-${BOARD:tl}: build-arm-ports
touch ${.TARGET}
From owner-svn-src-projects@FreeBSD.ORG Wed Feb 11 20:51:59 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4849CDB6;
Wed, 11 Feb 2015 20:51:59 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 33EF6C4D;
Wed, 11 Feb 2015 20:51:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1BKpxW0014954;
Wed, 11 Feb 2015 20:51:59 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1BKpxum014953;
Wed, 11 Feb 2015 20:51:59 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502112051.t1BKpxum014953@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 20:51:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278597 - projects/release-arm-redux/release/arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2015 20:51:59 -0000
Author: gjb
Date: Wed Feb 11 20:51:58 2015
New Revision: 278597
URL: https://svnweb.freebsd.org/changeset/base/278597
Log:
Fix build-arm-ports target for WANDBOARD-QUAD.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD
Modified: projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD
==============================================================================
--- projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD Wed Feb 11 20:50:25 2015 (r278596)
+++ projects/release-arm-redux/release/arm/Makefile.WANDBOARD-QUAD Wed Feb 11 20:51:58 2015 (r278597)
@@ -5,5 +5,5 @@
BOARD= WANDBOARD-QUAD
ARMPORTS= sysutils/u-boot-wandboard
-build-arm-${BOARD:tl}: build-arm-ports
+build-arm-${BOARD:tl}: build-arm-ports${BOARD:tl}
touch ${.TARGET}
From owner-svn-src-projects@FreeBSD.ORG Thu Feb 12 00:50:55 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id AD397703;
Thu, 12 Feb 2015 00:50:55 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 9882687D;
Thu, 12 Feb 2015 00:50:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1C0otY3028892;
Thu, 12 Feb 2015 00:50:55 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1C0otpi028891;
Thu, 12 Feb 2015 00:50:55 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502120050.t1C0otpi028891@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 12 Feb 2015 00:50:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278610 - projects/release-arm-redux/release/arm
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2015 00:50:55 -0000
Author: gjb
Date: Thu Feb 12 00:50:54 2015
New Revision: 278610
URL: https://svnweb.freebsd.org/changeset/base/278610
Log:
Add a ROADMAP file for FreeBSD/arm release builds, which
will make final documentation much easier when done.
Sponsored by: The FreeBSD Foundation
Added:
projects/release-arm-redux/release/arm/ROADMAP (contents, props changed)
Added: projects/release-arm-redux/release/arm/ROADMAP
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/release-arm-redux/release/arm/ROADMAP Thu Feb 12 00:50:54 2015 (r278610)
@@ -0,0 +1,18 @@
+#
+# $FreeBSD$
+#
+
+== WORKFLOW
+=====================================================================
+
+- buildworld [1]
+- buildkernel [1]
+- ports build [2]
+- md(4) device creation, mount, installworld, installkernel
+- u-boot magic [2]
+- rc.conf edits (gpart resize, sshd, etc.)
+- ???
+- profit.
+
+[1]: Requires CROSS_TOOLCHAIN
+[2]: If necessary
From owner-svn-src-projects@FreeBSD.ORG Thu Feb 12 15:34:23 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id F34D6B5E;
Thu, 12 Feb 2015 15:34:22 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 D9E5714C;
Thu, 12 Feb 2015 15:34:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1CFYMCq044923;
Thu, 12 Feb 2015 15:34:22 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1CFYHkG044893;
Thu, 12 Feb 2015 15:34:17 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502121534.t1CFYHkG044893@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 12 Feb 2015 15:34:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278624 - in projects/release-pkg: . bin/pkill/tests
cddl/contrib/opensolaris/lib/libdtrace/arm
cddl/contrib/opensolaris/tools/ctf/cvt cddl/lib cddl/lib/libdtrace
cddl/usr.sbin contrib/...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2015 15:34:23 -0000
Author: bapt
Date: Thu Feb 12 15:34:16 2015
New Revision: 278624
URL: https://svnweb.freebsd.org/changeset/base/278624
Log:
Merge from HEAD
Added:
projects/release-pkg/cddl/contrib/opensolaris/lib/libdtrace/arm/
- copied from r278623, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/lzma12.h
- copied unchanged from r278623, head/contrib/xz/src/liblzma/api/lzma/lzma12.h
projects/release-pkg/contrib/xz/src/liblzma/common/block_buffer_encoder.h
- copied unchanged from r278623, head/contrib/xz/src/liblzma/common/block_buffer_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/hardware_cputhreads.c
- copied unchanged from r278623, head/contrib/xz/src/liblzma/common/hardware_cputhreads.c
projects/release-pkg/contrib/xz/src/liblzma/common/memcmplen.h
- copied unchanged from r278623, head/contrib/xz/src/liblzma/common/memcmplen.h
projects/release-pkg/contrib/xz/src/liblzma/common/outqueue.c
- copied unchanged from r278623, head/contrib/xz/src/liblzma/common/outqueue.c
projects/release-pkg/contrib/xz/src/liblzma/common/outqueue.h
- copied unchanged from r278623, head/contrib/xz/src/liblzma/common/outqueue.h
projects/release-pkg/contrib/xz/src/liblzma/common/stream_encoder_mt.c
- copied unchanged from r278623, head/contrib/xz/src/liblzma/common/stream_encoder_mt.c
projects/release-pkg/contrib/xz/src/liblzma/liblzma.map
- copied unchanged from r278623, head/contrib/xz/src/liblzma/liblzma.map
projects/release-pkg/contrib/xz/src/liblzma/validate_map.sh
- copied unchanged from r278623, head/contrib/xz/src/liblzma/validate_map.sh
projects/release-pkg/contrib/xz/src/xz/mytime.c
- copied unchanged from r278623, head/contrib/xz/src/xz/mytime.c
projects/release-pkg/contrib/xz/src/xz/mytime.h
- copied unchanged from r278623, head/contrib/xz/src/xz/mytime.h
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/arm/
- copied from r278623, head/sys/cddl/contrib/opensolaris/uts/arm/
projects/release-pkg/sys/cddl/dev/dtrace/arm/
- copied from r278623, head/sys/cddl/dev/dtrace/arm/
projects/release-pkg/sys/cddl/dev/fbt/arm/
- copied from r278623, head/sys/cddl/dev/fbt/arm/
projects/release-pkg/usr.sbin/pw/tests/pw_usernext.sh
- copied unchanged from r278623, head/usr.sbin/pw/tests/pw_usernext.sh
Deleted:
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/lzma.h
projects/release-pkg/contrib/xz/src/liblzma/common/stream_encoder.h
projects/release-pkg/sys/powerpc/conf/WII
projects/release-pkg/sys/powerpc/wii/
Modified:
projects/release-pkg/Makefile.inc1
projects/release-pkg/ObsoleteFiles.inc
projects/release-pkg/UPDATING
projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh
projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
projects/release-pkg/cddl/lib/Makefile
projects/release-pkg/cddl/lib/libdtrace/Makefile
projects/release-pkg/cddl/usr.sbin/Makefile
projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc
projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h
projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c
projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c
projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h
projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh
projects/release-pkg/contrib/top/utils.c
projects/release-pkg/contrib/xz/ChangeLog
projects/release-pkg/contrib/xz/FREEBSD-upgrade
projects/release-pkg/contrib/xz/THANKS
projects/release-pkg/contrib/xz/TODO
projects/release-pkg/contrib/xz/src/common/mythread.h
projects/release-pkg/contrib/xz/src/common/sysdefs.h
projects/release-pkg/contrib/xz/src/common/tuklib_cpucores.c
projects/release-pkg/contrib/xz/src/common/tuklib_physmem.c
projects/release-pkg/contrib/xz/src/liblzma/api/lzma.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/base.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/block.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/container.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/filter.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/hardware.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/index.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/index_hash.h
projects/release-pkg/contrib/xz/src/liblzma/api/lzma/version.h
projects/release-pkg/contrib/xz/src/liblzma/check/check.h
projects/release-pkg/contrib/xz/src/liblzma/check/sha256.c
projects/release-pkg/contrib/xz/src/liblzma/common/alone_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/alone_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/alone_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/auto_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/block_buffer_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/block_buffer_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/block_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/block_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/block_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/block_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/block_header_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/block_header_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/block_util.c
projects/release-pkg/contrib/xz/src/liblzma/common/common.c
projects/release-pkg/contrib/xz/src/liblzma/common/common.h
projects/release-pkg/contrib/xz/src/liblzma/common/easy_buffer_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/easy_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/filter_buffer_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/filter_buffer_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/filter_common.c
projects/release-pkg/contrib/xz/src/liblzma/common/filter_common.h
projects/release-pkg/contrib/xz/src/liblzma/common/filter_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/filter_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/filter_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/filter_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/filter_flags_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/index.c
projects/release-pkg/contrib/xz/src/liblzma/common/index_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/index_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/index_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/index_hash.c
projects/release-pkg/contrib/xz/src/liblzma/common/stream_buffer_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/stream_buffer_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/stream_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/common/stream_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/common/stream_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/delta/delta_common.c
projects/release-pkg/contrib/xz/src/liblzma/delta/delta_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/delta/delta_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/delta/delta_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/delta/delta_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/delta/delta_private.h
projects/release-pkg/contrib/xz/src/liblzma/liblzma.pc.in
projects/release-pkg/contrib/xz/src/liblzma/lz/lz_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/lz/lz_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/lz/lz_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/lz/lz_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/lz/lz_encoder_mf.c
projects/release-pkg/contrib/xz/src/liblzma/lzma/fastpos.h
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma2_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_common.h
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder.c
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder.h
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_fast.c
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder_optimum_normal.c
projects/release-pkg/contrib/xz/src/liblzma/lzma/lzma_encoder_private.h
projects/release-pkg/contrib/xz/src/liblzma/rangecoder/range_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/simple/arm.c
projects/release-pkg/contrib/xz/src/liblzma/simple/armthumb.c
projects/release-pkg/contrib/xz/src/liblzma/simple/ia64.c
projects/release-pkg/contrib/xz/src/liblzma/simple/powerpc.c
projects/release-pkg/contrib/xz/src/liblzma/simple/simple_coder.c
projects/release-pkg/contrib/xz/src/liblzma/simple/simple_coder.h
projects/release-pkg/contrib/xz/src/liblzma/simple/simple_decoder.c
projects/release-pkg/contrib/xz/src/liblzma/simple/simple_decoder.h
projects/release-pkg/contrib/xz/src/liblzma/simple/simple_private.h
projects/release-pkg/contrib/xz/src/liblzma/simple/sparc.c
projects/release-pkg/contrib/xz/src/liblzma/simple/x86.c
projects/release-pkg/contrib/xz/src/xz/args.c
projects/release-pkg/contrib/xz/src/xz/args.h
projects/release-pkg/contrib/xz/src/xz/coder.c
projects/release-pkg/contrib/xz/src/xz/coder.h
projects/release-pkg/contrib/xz/src/xz/file_io.c
projects/release-pkg/contrib/xz/src/xz/file_io.h
projects/release-pkg/contrib/xz/src/xz/hardware.c
projects/release-pkg/contrib/xz/src/xz/hardware.h
projects/release-pkg/contrib/xz/src/xz/list.c
projects/release-pkg/contrib/xz/src/xz/main.c
projects/release-pkg/contrib/xz/src/xz/message.c
projects/release-pkg/contrib/xz/src/xz/options.c
projects/release-pkg/contrib/xz/src/xz/private.h
projects/release-pkg/contrib/xz/src/xz/signals.c
projects/release-pkg/contrib/xz/src/xz/suffix.c
projects/release-pkg/contrib/xz/src/xz/xz.1
projects/release-pkg/etc/devd.conf
projects/release-pkg/etc/login.conf
projects/release-pkg/etc/master.passwd
projects/release-pkg/etc/mtree/BSD.debug.dist
projects/release-pkg/etc/mtree/BSD.usr.dist
projects/release-pkg/etc/rc.d/Makefile
projects/release-pkg/etc/rc.d/jail
projects/release-pkg/etc/rc.d/netif
projects/release-pkg/etc/root/dot.cshrc
projects/release-pkg/etc/root/dot.login
projects/release-pkg/etc/root/dot.profile
projects/release-pkg/games/Makefile.inc
projects/release-pkg/games/caesar/rot13.sh
projects/release-pkg/games/fortune/datfiles/Makefile
projects/release-pkg/games/fortune/datfiles/freebsd-tips
projects/release-pkg/include/stdio.h
projects/release-pkg/lib/Makefile
projects/release-pkg/lib/libc/nls/msgcat.c
projects/release-pkg/lib/liblzma/Makefile
projects/release-pkg/lib/liblzma/Symbol.map
projects/release-pkg/lib/liblzma/Versions.def
projects/release-pkg/lib/liblzma/config.h
projects/release-pkg/lib/libproc/proc_bkpt.c
projects/release-pkg/lib/libproc/proc_regs.c
projects/release-pkg/release/Makefile
projects/release-pkg/release/Makefile.vm
projects/release-pkg/release/scripts/make-manifest.sh
projects/release-pkg/release/scripts/mk-vmimage.sh
projects/release-pkg/rescue/rescue/Makefile
projects/release-pkg/share/man/man4/led.4
projects/release-pkg/share/man/man4/ral.4
projects/release-pkg/share/man/man5/nullfs.5
projects/release-pkg/share/man/man6/intro.6
projects/release-pkg/share/man/man7/hier.7
projects/release-pkg/share/mk/bsd.mkopt.mk
projects/release-pkg/share/mk/bsd.own.mk
projects/release-pkg/share/mk/bsd.prog.mk
projects/release-pkg/share/mk/src.libnames.mk
projects/release-pkg/share/skel/dot.cshrc
projects/release-pkg/share/skel/dot.login
projects/release-pkg/share/skel/dot.profile
projects/release-pkg/sys/amd64/amd64/apic_vector.S
projects/release-pkg/sys/amd64/amd64/genassym.c
projects/release-pkg/sys/amd64/amd64/mp_machdep.c
projects/release-pkg/sys/amd64/include/cpufunc.h
projects/release-pkg/sys/amd64/vmm/vmm_support.S
projects/release-pkg/sys/arm/arm/cpufunc.c
projects/release-pkg/sys/arm/arm/cpufunc_asm_armv7.S
projects/release-pkg/sys/arm/arm/db_trace.c
projects/release-pkg/sys/arm/arm/elf_trampoline.c
projects/release-pkg/sys/arm/arm/exception.S
projects/release-pkg/sys/arm/arm/identcpu.c
projects/release-pkg/sys/arm/arm/trap.c
projects/release-pkg/sys/arm/conf/BEAGLEBONE
projects/release-pkg/sys/arm/include/armreg.h
projects/release-pkg/sys/arm/include/cpufunc.h
projects/release-pkg/sys/arm/xscale/ixp425/if_npe.c
projects/release-pkg/sys/boot/arm/ixp425/boot2/ixp425_board.c
projects/release-pkg/sys/boot/pc98/boot2/Makefile
projects/release-pkg/sys/cam/ctl/ctl.c
projects/release-pkg/sys/cam/ctl/ctl.h
projects/release-pkg/sys/cam/ctl/ctl_backend_block.c
projects/release-pkg/sys/cam/ctl/ctl_frontend_iscsi.c
projects/release-pkg/sys/cam/ctl/ctl_frontend_iscsi.h
projects/release-pkg/sys/cam/ctl/ctl_private.h
projects/release-pkg/sys/cam/scsi/scsi_all.h
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
projects/release-pkg/sys/cddl/dev/lockstat/lockstat.c
projects/release-pkg/sys/cddl/dev/profile/profile.c
projects/release-pkg/sys/conf/dtb.mk
projects/release-pkg/sys/conf/files.powerpc
projects/release-pkg/sys/conf/kern.opts.mk
projects/release-pkg/sys/conf/kern.pre.mk
projects/release-pkg/sys/conf/options.powerpc
projects/release-pkg/sys/contrib/dev/acpica/include/actbl2.h
projects/release-pkg/sys/contrib/dev/ral/microcode.h
projects/release-pkg/sys/contrib/dev/ral/rt2860.fw.uu
projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
projects/release-pkg/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.h
projects/release-pkg/sys/dev/cxgbe/common/t4_hw.c
projects/release-pkg/sys/dev/cxgbe/t4_main.c
projects/release-pkg/sys/dev/drm2/radeon/ni.c
projects/release-pkg/sys/dev/drm2/radeon/si.c
projects/release-pkg/sys/dev/hwpmc/hwpmc_armv7.c
projects/release-pkg/sys/dev/iscsi/icl_conn_if.m
projects/release-pkg/sys/dev/iscsi/icl_soft.c
projects/release-pkg/sys/dev/iscsi/icl_wrappers.h
projects/release-pkg/sys/dev/iscsi/iscsi.c
projects/release-pkg/sys/dev/iscsi/iscsi.h
projects/release-pkg/sys/dev/malo/if_malo.c
projects/release-pkg/sys/dev/mwl/if_mwl.c
projects/release-pkg/sys/dev/ral/if_ral_pci.c
projects/release-pkg/sys/dev/ral/rt2860.c
projects/release-pkg/sys/dev/ral/rt2860reg.h
projects/release-pkg/sys/dev/sound/usb/uaudio.c
projects/release-pkg/sys/dev/usb/controller/xhci.c
projects/release-pkg/sys/fs/autofs/autofs.c
projects/release-pkg/sys/fs/autofs/autofs_ioctl.h
projects/release-pkg/sys/i386/i386/apic_vector.s
projects/release-pkg/sys/i386/i386/genassym.c
projects/release-pkg/sys/i386/i386/mp_machdep.c
projects/release-pkg/sys/i386/include/cpufunc.h
projects/release-pkg/sys/kern/kern_sig.c
projects/release-pkg/sys/kern/kern_timeout.c
projects/release-pkg/sys/kern/uipc_shm.c
projects/release-pkg/sys/kern/vfs_mount.c
projects/release-pkg/sys/modules/dtrace/Makefile
projects/release-pkg/sys/modules/dtrace/dtrace/Makefile
projects/release-pkg/sys/netinet/if_ether.c
projects/release-pkg/sys/netinet/in.c
projects/release-pkg/sys/netinet6/in6.c
projects/release-pkg/sys/netinet6/nd6.c
projects/release-pkg/sys/powerpc/aim/locore32.S
projects/release-pkg/sys/powerpc/aim/machdep.c
projects/release-pkg/sys/powerpc/aim/mmu_oea.c
projects/release-pkg/sys/powerpc/conf/NOTES
projects/release-pkg/sys/powerpc/include/cpu.h
projects/release-pkg/sys/powerpc/ofw/ofw_syscons.c
projects/release-pkg/sys/powerpc/powerpc/swtch64.S
projects/release-pkg/sys/powerpc/pseries/mmu_phyp.c
projects/release-pkg/sys/powerpc/pseries/platform_chrp.c
projects/release-pkg/sys/powerpc/pseries/xics.c
projects/release-pkg/sys/sys/bitset.h
projects/release-pkg/sys/sys/callout.h
projects/release-pkg/sys/sys/copyright.h
projects/release-pkg/sys/sys/cpuset.h
projects/release-pkg/sys/sys/param.h
projects/release-pkg/sys/x86/acpica/madt.c
projects/release-pkg/sys/x86/include/apicreg.h
projects/release-pkg/sys/x86/include/apicvar.h
projects/release-pkg/sys/x86/include/specialreg.h
projects/release-pkg/sys/x86/iommu/intel_drv.c
projects/release-pkg/sys/x86/iommu/intel_reg.h
projects/release-pkg/sys/x86/iommu/intel_utils.c
projects/release-pkg/sys/x86/x86/io_apic.c
projects/release-pkg/sys/x86/x86/local_apic.c
projects/release-pkg/sys/x86/xen/xen_apic.c
projects/release-pkg/tools/build/mk/OptionalObsoleteFiles.inc
projects/release-pkg/tools/tools/nanobsd/gateworks/Files/root/.profile
projects/release-pkg/tools/tools/nanobsd/pcengines/Files/root/.cshrc
projects/release-pkg/tools/tools/nanobsd/pcengines/Files/root/.login
projects/release-pkg/tools/tools/nanobsd/rescue/Files/root/.cshrc
projects/release-pkg/usr.bin/svn/svn/Makefile
projects/release-pkg/usr.bin/w/w.c
projects/release-pkg/usr.bin/wc/wc.c
projects/release-pkg/usr.bin/whereis/pathnames.h
projects/release-pkg/usr.bin/whereis/whereis.1
projects/release-pkg/usr.bin/whereis/whereis.c
projects/release-pkg/usr.bin/xz/Makefile
projects/release-pkg/usr.sbin/bsdconfig/console/INDEX
projects/release-pkg/usr.sbin/bsdconfig/include/messages.subr
projects/release-pkg/usr.sbin/bsdconfig/includes/INDEX
projects/release-pkg/usr.sbin/bsdconfig/networking/share/device.subr
projects/release-pkg/usr.sbin/bsdconfig/share/dialog.subr
projects/release-pkg/usr.sbin/bsdconfig/share/keymap.subr
projects/release-pkg/usr.sbin/bsdconfig/timezone/share/continents.subr
projects/release-pkg/usr.sbin/bsdconfig/timezone/share/countries.subr
projects/release-pkg/usr.sbin/bsdconfig/timezone/timezone
projects/release-pkg/usr.sbin/bsdconfig/usermgmt/share/user.subr
projects/release-pkg/usr.sbin/ctladm/ctladm.8
projects/release-pkg/usr.sbin/ctld/ctl.conf.5
projects/release-pkg/usr.sbin/ctld/ctld.c
projects/release-pkg/usr.sbin/ctld/ctld.h
projects/release-pkg/usr.sbin/ctld/keys.c
projects/release-pkg/usr.sbin/flowctl/flowctl.c
projects/release-pkg/usr.sbin/iscsid/iscsid.h
projects/release-pkg/usr.sbin/iscsid/keys.c
projects/release-pkg/usr.sbin/mountd/mountd.c
projects/release-pkg/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
projects/release-pkg/usr.sbin/pw/tests/Makefile
Directory Properties:
projects/release-pkg/ (props changed)
projects/release-pkg/cddl/ (props changed)
projects/release-pkg/cddl/contrib/opensolaris/ (props changed)
projects/release-pkg/contrib/binutils/ (props changed)
projects/release-pkg/contrib/elftoolchain/ (props changed)
projects/release-pkg/contrib/top/ (props changed)
projects/release-pkg/contrib/xz/ (props changed)
projects/release-pkg/etc/ (props changed)
projects/release-pkg/include/ (props changed)
projects/release-pkg/lib/libc/ (props changed)
projects/release-pkg/share/ (props changed)
projects/release-pkg/share/man/man4/ (props changed)
projects/release-pkg/sys/ (props changed)
projects/release-pkg/sys/amd64/vmm/ (props changed)
projects/release-pkg/sys/boot/ (props changed)
projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed)
projects/release-pkg/sys/conf/ (props changed)
projects/release-pkg/sys/contrib/dev/acpica/ (props changed)
projects/release-pkg/sys/contrib/dev/acpica/include/ (props changed)
Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1 Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/Makefile.inc1 Thu Feb 12 15:34:16 2015 (r278624)
@@ -204,9 +204,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX}
OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
-# /usr/games added for fortune which depend on strfile
-BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
-XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
+XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
@@ -825,9 +824,6 @@ ITOOLS+=makewhatis
# Non-base distributions produced by the base system
EXTRA_DISTRIBUTIONS= doc
-.if ${MK_GAMES} != "no"
-EXTRA_DISTRIBUTIONS+= games
-.endif
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
EXTRA_DISTRIBUTIONS+= lib32
.endif
@@ -837,7 +833,7 @@ EXTRA_DISTRIBUTIONS+= tests
DEBUG_DISTRIBUTIONS=
.if ${MK_DEBUG_FILES} != "no"
-DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
.endif
MTREE_MAGIC?= mtree 2.0
@@ -1751,6 +1747,7 @@ _lib_libcapsicum=lib/libcapsicum
lib/libcapsicum__L: lib/libnv__L
lib/libpjdlog__L: lib/libutil__L
+lib/liblzma__L: lib/libthr__L
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
.for _DIR in ${LOCAL_LIB_DIRS}
Modified: projects/release-pkg/ObsoleteFiles.inc
==============================================================================
--- projects/release-pkg/ObsoleteFiles.inc Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/ObsoleteFiles.inc Thu Feb 12 15:34:16 2015 (r278624)
@@ -38,6 +38,24 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150212: /usr/games moving into /usr/bin
+OLD_FILES+=usr/games/bcd
+OLD_FILES+=usr/games/caesar
+OLD_FILES+=usr/games/factor
+OLD_FILES+=usr/games/fortune
+OLD_FILES+=usr/games/grdc
+OLD_FILES+=usr/games/morse
+OLD_FILES+=usr/games/number
+OLD_FILES+=usr/games/pom
+OLD_FILES+=usr/games/ppt
+OLD_FILES+=usr/games/primes
+OLD_FILES+=usr/games/random
+OLD_FILES+=usr/games/rot13
+OLD_FILES+=usr/games/strfile
+OLD_FILES+=usr/games/unstr
+OLD_DIRS+=usr/games
+# 20150209: liblzma header
+OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
OLD_FILES+=usr/share/man/man9/spl.9
OLD_FILES+=usr/share/man/man9/spl0.9
Modified: projects/release-pkg/UPDATING
==============================================================================
--- projects/release-pkg/UPDATING Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/UPDATING Thu Feb 12 15:34:16 2015 (r278624)
@@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20150210:
+ The autofs(4) ABI was changed in order to restore binary compatibility
+ with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work
+ with the new kernel.
+
20150131:
The powerpc64 kernel has been changed to a position-independent
executable. This can only be booted with a new version of loader(8),
@@ -287,6 +292,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
The lindev device has been removed since /dev/full has been made a
standard device. __FreeBSD_version has been bumped.
+20140424:
+ The knob WITHOUT_VI was added to the base system, which controls
+ building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1)
+ in order to reorder files share/termcap and didn't build ex(1) as a
+ build tool, so building/installing with WITH_VI is highly advised for
+ build hosts for older releases.
+
+ This issue has been fixed in stable/9 and stable/10 in r277022 and
+ r276991, respectively.
+
20140418:
The YES_HESIOD knob has been removed. It has been obsolete for
a decade. Please move to using WITH_HESIOD instead or your builds
Modified: projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/bin/pkill/tests/pgrep-j_test.sh Thu Feb 12 15:34:16 2015 (r278624)
@@ -40,7 +40,7 @@ if [ `id -u` -eq 0 ]; then
if [ "$pid1" = "$pid2" ]; then
echo "ok 1 - $name"
else
- echo "not ok 1 - $name"
+ echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
@@ -66,7 +66,7 @@ if [ `id -u` -eq 0 ]; then
if [ "$pid1" = "$pid2" ]; then
echo "ok 2 - $name"
else
- echo "not ok 2 - $name"
+ echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
@@ -87,7 +87,7 @@ if [ `id -u` -eq 0 ]; then
if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
echo "ok 3 - $name"
else
- echo "not ok 3 - $name"
+ echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
rm -f $sleep
[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
Modified: projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Thu Feb 12 15:34:16 2015 (r278624)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
{
ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
- ctf_buf_write(b, &id, sizeof (id));
-
if (target_requires_swap) {
SWAP_16(id);
}
+ ctf_buf_write(b, &id, sizeof (id));
+
debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
}
Modified: projects/release-pkg/cddl/lib/Makefile
==============================================================================
--- projects/release-pkg/cddl/lib/Makefile Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/cddl/lib/Makefile Thu Feb 12 15:34:16 2015 (r278624)
@@ -27,7 +27,8 @@ _libzpool= libzpool
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+ ${MACHINE_CPUARCH} == "arm"
_drti= drti
_libdtrace= libdtrace
.endif
Modified: projects/release-pkg/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/release-pkg/cddl/lib/libdtrace/Makefile Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/cddl/lib/libdtrace/Makefile Thu Feb 12 15:34:16 2015 (r278624)
@@ -81,6 +81,10 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/ut
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
.elif ${MACHINE_CPUARCH} == "powerpc"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc
Modified: projects/release-pkg/cddl/usr.sbin/Makefile
==============================================================================
--- projects/release-pkg/cddl/usr.sbin/Makefile Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/cddl/usr.sbin/Makefile Thu Feb 12 15:34:16 2015 (r278624)
@@ -30,6 +30,12 @@ _plockstat= plockstat
.endif
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace= dtrace
+_dtruss= dtruss
+_lockstat= lockstat
+.endif
+
.if ${MACHINE_CPUARCH} == "mips"
_dtrace= dtrace
.endif
Modified: projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc
==============================================================================
--- projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/binutils/ld/scripttempl/elf.sc Thu Feb 12 15:34:16 2015 (r278624)
@@ -402,8 +402,8 @@ cat <<EOF
.fini_array ${RELOCATING-0} :
{
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
- KEEP (*(.fini_array))
KEEP (*(SORT(.fini_array.*)))
+ KEEP (*(.fini_array))
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
}
${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}
Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 12 15:34:16 2015 (r278624)
@@ -49,7 +49,7 @@
struct _libdwarf_globals {
Dwarf_Handler errhand;
Dwarf_Ptr errarg;
- int applyrela;
+ int applyreloc;
};
extern struct _libdwarf_globals _libdwarf;
Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_reloc.c Thu Feb 12 15:34:16 2015 (r278624)
@@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply)
{
int oldapply;
- oldapply = _libdwarf.applyrela;
- _libdwarf.applyrela = apply;
+ oldapply = _libdwarf.applyreloc;
+ _libdwarf.applyreloc = apply;
return (oldapply);
}
Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Thu Feb 12 15:34:16 2015 (r278624)
@@ -24,7 +24,7 @@
.\"
.\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $
.\"
-.Dd June 26, 2011
+.Dd February 11, 2015
.Os
.Dt DWARF_SET_RELOC_APPLICATION 3
.Sh NAME
@@ -47,6 +47,8 @@ handled by the DWARF(3) library.
If the argument
.Ar apply
holds a non-zero value, the library will process all the relevant
+.Dq ".rel"
+and
.Dq ".rela"
relocation sections and will apply the relocation records found to
their corresponding DWARF sections.
Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.c Thu Feb 12 15:34:16 2015 (r278624)
@@ -31,5 +31,5 @@ ELFTC_VCSID("$Id: libdwarf.c 2070 2011-1
struct _libdwarf_globals _libdwarf = {
.errhand = NULL,
.errarg = NULL,
- .applyrela = 1
+ .applyreloc = 1
};
Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf.h Thu Feb 12 15:34:16 2015 (r278624)
@@ -439,6 +439,7 @@ enum Dwarf_ISA {
DW_ISA_SPARC,
DW_ISA_X86,
DW_ISA_X86_64,
+ DW_ISA_AARCH64,
DW_ISA_MAX
};
Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Thu Feb 12 15:34:16 2015 (r278624)
@@ -50,32 +50,46 @@ static const char *debug_name[] = {
};
static void
-_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
- Elf_Data *symtab_data, int endian)
+_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian,
+ void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend)
{
- Dwarf_Unsigned type;
- GElf_Rela rela;
GElf_Sym sym;
- size_t symndx;
- uint64_t offset;
- int size, j;
+ int size;
- j = 0;
- while (gelf_getrela(rel_data, j++, &rela) != NULL) {
- symndx = GELF_R_SYM(rela.r_info);
- type = GELF_R_TYPE(rela.r_info);
+ if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), &sym) == NULL)
+ return;
+ if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0)
+ return; /* Unknown or non-absolute relocation. */
+ if (endian == ELFDATA2MSB)
+ _dwarf_write_msb(buf, &offset, sym.st_value + r_addend, size);
+ else
+ _dwarf_write_lsb(buf, &offset, sym.st_value + r_addend, size);
+}
- if (gelf_getsym(symtab_data, symndx, &sym) == NULL)
- continue;
+static void
+_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rel rel;
+ int j;
- offset = rela.r_offset;
- size = _dwarf_get_reloc_size(dbg, type);
+ j = 0;
+ while (gelf_getrel(rel_data, j++, &rel) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rel.r_offset, rel.r_info, 0);
+}
- if (endian == ELFDATA2MSB)
- _dwarf_write_msb(buf, &offset, rela.r_addend, size);
- else
- _dwarf_write_lsb(buf, &offset, rela.r_addend, size);
- }
+static void
+_dwarf_elf_apply_rela_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rela rela;
+ int j;
+
+ j = 0;
+ while (gelf_getrela(rel_data, j++, &rela) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rela.r_offset, rela.r_info, rela.r_addend);
}
static int
@@ -104,7 +118,8 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
return (DW_DLE_ELF);
}
- if (sh.sh_type != SHT_RELA || sh.sh_size == 0)
+ if ((sh.sh_type != SHT_REL && sh.sh_type != SHT_RELA) ||
+ sh.sh_size == 0)
continue;
if (sh.sh_info == shndx && sh.sh_link == symtab) {
@@ -125,8 +140,12 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
}
memcpy(ed->ed_alloc, ed->ed_data->d_buf,
ed->ed_data->d_size);
- _dwarf_elf_apply_reloc(dbg, ed->ed_alloc, rel,
- symtab_data, eh.e_ident[EI_DATA]);
+ if (sh.sh_type == SHT_REL)
+ _dwarf_elf_apply_rel_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
+ else
+ _dwarf_elf_apply_rela_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
return (DW_DLE_NONE);
}
@@ -282,7 +301,7 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *el
}
}
- if (_libdwarf.applyrela) {
+ if (_libdwarf.applyreloc) {
if (_dwarf_elf_relocate(dbg, elf,
&e->eo_data[j], elf_ndxscn(scn), symtab_ndx,
symtab_data, error) != DW_DLE_NONE)
Modified: projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Thu Feb 12 15:34:16 2015 (r278624)
@@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
assert(dbg != NULL);
switch (dbg->dbgp_isa) {
+ case DW_ISA_AARCH64:
+ return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
case DW_ISA_X86:
return (R_386_32);
case DW_ISA_X86_64:
@@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
switch (dbg->dbg_machine) {
case EM_NONE:
break;
+ case EM_AARCH64:
+ if (rel_type == R_AARCH64_ABS32)
+ return (4);
+ else if (rel_type == R_AARCH64_ABS64)
+ return (8);
+ break;
case EM_ARM:
if (rel_type == R_ARM_ABS32)
return (4);
Modified: projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh
==============================================================================
--- projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 15:34:16 2015 (r278624)
@@ -27,13 +27,13 @@
expect() {
echo "${2}" >expout
- atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+ atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1}
}
atf_test_case overflow
overflow_head() {
atf_set "descr" "Tests for overflow conditions"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
overflow_body() {
expect '8675309' '8675309: 8675309'
@@ -44,7 +44,7 @@ atf_test_case loop
loop_head() {
atf_set "descr" "Tests some cases that once locked the program" \
"in an infinite loop"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
loop_body() {
expect '99999999999991' '99999999999991: 7 13 769231 1428571'
Modified: projects/release-pkg/contrib/top/utils.c
==============================================================================
--- projects/release-pkg/contrib/top/utils.c Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/top/utils.c Thu Feb 12 15:34:16 2015 (r278624)
@@ -58,6 +58,7 @@ char *str;
* ever convert will be 2^32-1, which is 10
* digits.
*/
+_Static_assert(sizeof(int) <= 4, "buffer too small for this sized int");
char *itoa(val)
Modified: projects/release-pkg/contrib/xz/ChangeLog
==============================================================================
--- projects/release-pkg/contrib/xz/ChangeLog Thu Feb 12 13:31:08 2015 (r278623)
+++ projects/release-pkg/contrib/xz/ChangeLog Thu Feb 12 15:34:16 2015 (r278624)
@@ -1,66 +1,923 @@
-commit 495aaf3a5b7200a5d2bf449bbbcc0e18834607af
+commit a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
Author: Lasse Collin <lasse.collin@tukaani.org>
-Date: 2014-09-20 20:44:32 +0300
+Date: 2014-12-21 20:48:37 +0200
- Bump version and soname for 5.0.7.
+ DOS: Update Makefile.
+
+ dos/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit b85ee0905ec4ab7656d22e63519fdd3bedb21f2e
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 19:50:38 +0200
+
+ Windows: Fix bin_i486 to bin_i686 in build.bash.
+
+ windows/build.bash | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit cbafa710918195dbba3db02c3fab4f0538235206
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:58:44 +0200
+
+ Docs: Use lzma_cputhreads() in 04_compress_easy_mt.c.
+
+ doc/examples/04_compress_easy_mt.c | 30 ++++++++++++++++++++++++++----
+ 1 file changed, 26 insertions(+), 4 deletions(-)
+
+commit 8dbb57238d372c7263cfeb3e7f7fd9a73173156a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:56:44 +0200
+
+ Docs: Update docs/examples/00_README.txt.
+
+ doc/examples/00_README.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:11:17 +0200
+
+ Bump version and soname for 5.2.0.
+
+ I know that soname != app version, but I skip AGE=1
+ in -version-info to make the soname match the liblzma
+ version anyway. It doesn't hurt anything as long as
+ it doesn't conflict with library versioning rules.
src/liblzma/Makefile.am | 2 +-
- src/liblzma/api/lzma/version.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ src/liblzma/api/lzma/version.h | 6 +++---
+ src/liblzma/liblzma.map | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+commit 3e8bd1d15e417f2d588e9be50ce027ee3d48b2da
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:05:03 +0200
+
+ Avoid variable-length arrays in the debug programs.
+
+ debug/full_flush.c | 3 ++-
+ debug/sync_flush.c | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+commit 72f7307cfdceb941aeb2bf30d424cc0d13621786
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:01:45 +0200
+
+ Build: Include 04_compress_easy_mt.c in the tarball.
+
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 2cb82ff21c62def11f3683a8bb0aaf363102aaa0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 18:00:38 +0200
+
+ Fix build when --disable-threads is used.
+
+ src/common/mythread.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 9b9e3536e458ef958f66b0e8982efc9d36de4d17
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:56:15 +0100
+
+ po/fr: improve wording for help for --lzma1/--lzma2.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a8b6b569e7fadbf5b5b9139d53bc764015c15027
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-21 15:55:48 +0100
+
+ po/fr: missing line in translation of --extreme.
+
+ po/fr.po | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f168a6fd1a888cf4f0caaddcafcb21dadc6ab6e9
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:33 +0200
+
+ Update NEWS for 5.2.0.
+
+ NEWS | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 65 insertions(+)
+
+commit cec2ee863b3a88f4bf039cb00f73c4a4fc93a429
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:32:22 +0200
+
+ Update NEWS for 5.0.8.
+
+ NEWS | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 42e97a32649bf53ce43be2258b902a417c6e7fa1
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-21 14:07:54 +0200
+
+ xz: Fix a comment.
+
+ src/xz/options.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 29b95d5d6665cedffa6a9d6d3d914f981e852182
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:43:14 +0200
+
+ Update INSTALL about the dependencies of the scripts.
+
+ INSTALL | 15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+commit 3af91040bb42c21afbb81f5568c3313125e61192
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:42:33 +0200
+
+ Windows: Update build instructions.
+
+ INSTALL | 15 +++++++++------
+ windows/INSTALL-Windows.txt | 44 +++++++++++++++++++++-----------------------
+ 2 files changed, 30 insertions(+), 29 deletions(-)
+
+commit 0152f72bf6289d744823dc6c849538f3a139ad70
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-20 20:41:48 +0200
+
+ Windows: Update the build script and README-Windows.txt.
+
+ The 32-bit build is now for i686 or newer because the
+ prebuilt MinGW-w64 toolchains include i686 code in the
+ executables even if one uses -march=i486.
+
+ The build script builds 32-bit SSE2 enabled version too.
+ Run-time detection of SSE2 support would be nice (on any OS)
+ but it's not implemented in XZ Utils yet.
+
+ windows/README-Windows.txt | 30 ++++++++++++++++--------------
+ windows/build.bash | 23 ++++++++++++++---------
+ 2 files changed, 30 insertions(+), 23 deletions(-)
+
+commit 4a1f6133ee5533cee8d91e06fcc22443e5f1881a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-19 15:51:50 +0200
+
+ Windows: Define TUKLIB_SYMBOL_PREFIX in config.h.
+
+ It is to keep all symbols in the lzma_ namespace.
+
+ windows/config.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 7f7d093de79eee0c7dbfd7433647e46302f19f82
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 21:00:09 +0200
+
+ xz: Update the man page about --threads.
+
+ src/xz/xz.1 | 5 -----
+ 1 file changed, 5 deletions(-)
+
+commit 009823448b82aa5f465668878a544c5842885407
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-16 20:57:43 +0200
+
+ xz: Update the man page about --block-size.
+
+ src/xz/xz.1 | 41 +++++++++++++++++++++++++++++++++--------
+ 1 file changed, 33 insertions(+), 8 deletions(-)
+
+commit 7dddfbeb499e528940bc12047355c184644aafe9
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:26:57 +0100
+
+ po/fr: several more translation updates: reword and handle --ignore-check.
+
+ po/fr.po | 50 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+
+commit 6eca5be40e04ddc4b738d493e4e56835956d8b69
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:23:01 +0100
+
+ po/fr: yet another place where my email address had to be updated.
+
+ po/fr.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d1003673e92ba47edd6aeeb3dbea05c18269d0e7
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-10 22:22:20 +0100
+
+ po/fr: fix several typos that have been around since the beginning.
+
+ po/fr.po | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+commit 4c5aa911a0df027e46171e368debc543d2fa72b2
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:02:31 +0100
+
+ po/fr: last batch of new translations for now.
+
+ Four new error messages.
+
+ po/fr.po | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+commit 3e3099e36d27059499e7996fb38a62e8ab01d356
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:01:32 +0100
+
+ po/fr: translations for --threads, --block-size and --block-list.
+
+ po/fr.po | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+commit e7d96a5933eec4e9d4a62569ee88df0ebb0f1d53
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 20:00:53 +0100
+
+ po/fr: remove fuzzy marker for error messages that will be kept in English.
+
+ The following is a copy of a comment inside fr.po:
+
+ Note from translator on "file status flags".
+ The following entry is kept un-translated on purpose. It is difficult to
+ translate and should only happen in exceptional circumstances which means
+ that translating would:
+ - lose some of the meaning
+ - make it more difficult to look up in search engines; it might happen one
+ in
+ a million times, if we dilute the error message in 20 languages, it will be
+ almost impossible to find an explanation and support for the error.
+
+ po/fr.po | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+commit 46cbb9033af8a21fafe543302d6919746e0d72af
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:58:25 +0100
+
+ po/fr: several minor updates and better wording.
+
+ Meaning doesn't change at all: it's only for better wording and/or
+ formatting of a few strings.
+
+ po/fr.po | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 7ce49d444f04e73145f79c832eb4d510594b074a
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-12-03 19:56:12 +0100
+
+ po/fr: update my email address and copyright years.
+
+ po/fr.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 214c553ebc3047cd720da1ce5c80cf7c38118d3c
+Author: Adrien Nader <adrien@notk.org>
+Date: 2014-11-26 10:08:26 +0100
+
+ fr.po: commit file after only "update-po" so actual is readable.
+
+ po/fr.po | 311 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 199 insertions(+), 112 deletions(-)
+
+commit 1190c641af09cde85f8bd0fbe5c4906f4a29431b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-12-02 20:04:07 +0200
+
+ liblzma: Document how lzma_mt.block_size affects memory usage.
+
+ src/liblzma/api/lzma/container.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit e4fc1d2f9571fba79ce383595be2ea2a9257def0
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-28 20:07:18 +0200
+
+ Update INSTALL about a "make check" failure in test_scripts.sh.
+
+ INSTALL | 24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+commit 34f9e40a0a0c3bd2c2730cdb9cd550bbb8a3f2fe
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:12:27 +0200
+
+ Remove LZMA_UNSTABLE macro.
+
+ src/liblzma/api/lzma/container.h | 4 ----
+ src/liblzma/common/common.h | 2 --
+ src/xz/private.h | 1 -
+ 3 files changed, 7 deletions(-)
+
+commit 6d9c0ce9f2677b159e32b224aba5b535b304a705
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-26 20:10:33 +0200
+
+ liblzma: Update lzma_stream_encoder_mt() API docs.
+
+ src/liblzma/api/lzma/container.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 2301f3f05dd9742f42cda8f0f318864f5dc39ab3
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-25 12:32:05 +0200
+
+ liblzma: Verify the filter chain in threaded encoder initialization.
+
+ This way an invalid filter chain is detected at the Stream
+ encoder initialization instead of delaying it to the first
+ call to lzma_code() which triggers the initialization of
+ the actual filter encoder(s).
+
+ src/liblzma/common/stream_encoder_mt.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+commit 107a263d5bb63cd3593fd6a5c938706539f84523
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 19:11:49 +0200
+
+ Build: Update m4/ax_pthread.m4 from Autoconf Archive.
+
+ m4/ax_pthread.m4 | 71 +++++++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 47 insertions(+), 24 deletions(-)
+
+commit b13a781833399ff5726cfc997f3cb2f0acbdbf31
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:52:21 +0200
+
+ Build: Replace obsolete AC_HELP_STRING with AS_HELP_STRING.
+
+ configure.ac | 36 ++++++++++++++++++------------------
+ m4/tuklib_integer.m4 | 2 +-
+ 2 files changed, 19 insertions(+), 19 deletions(-)
+
+commit 542cac122ed3550148a2af0033af22b757491378
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-17 18:43:19 +0200
+
+ Build: Fix Autoconf warnings about escaped backquotes.
+
+ Thanks to Daniel Richard G. for pointing out that it's
+ good to sometimes run autoreconf -fi with -Wall.
+
+ configure.ac | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+commit 7b03a15cea8cd4f19ed680b51c4bcbae3ce4142f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:54:40 +0200
+
+ xzdiff: Use mkdir if mktemp isn't available.
+
+ src/scripts/xzdiff.in | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+commit f8c13e5e3609581d5dd9f8777985ca07f2390ad7
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 18:45:01 +0200
+
+ xzdiff: Create a temporary directory to hold a temporary file.
+
+ This avoids the possibility of "File name too long" when
+ creating a temp file when the input file name is very long.
+
+ This also means that other users on the system can no longer
+ see the input file names in /tmp (or whatever $TMPDIR is)
+ since the temporary directory will have a generic name. This
+ usually doesn't matter since on many systems one can see
+ the arguments given to all processes anyway.
+
+ The number X chars to mktemp where increased from 6 to 10.
+
+ Note that with some shells temp files or dirs won't be used at all.
+
+ src/scripts/xzdiff.in | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 7716dcf9df7f457500cb657314e7a9aea5fedb06
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 15:38:47 +0200
+
+ liblzma: Fix lzma_mt.preset in lzma_stream_encoder_mt_memusage().
+
+ It read the filter chain from a wrong variable. This is a similar
+ bug that was fixed in 9494fb6d0ff41c585326f00aa8f7fe58f8106a5e.
+
+ src/liblzma/common/stream_encoder_mt.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit 230fa4a605542c84b4178a57381695a0af4e779b
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-11-10 14:49:55 +0200
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4e4ae08bc7c1711e399c9f2d26eb375d39d08101
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:28:25 +0200
+
+ Update .gitignore files.
+
+ .gitignore | 2 ++
+ m4/.gitignore | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit c923b140b27d1a055db6284e10fd546ad1a7fcdb
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-29 21:15:35 +0200
+
+ Build: Prepare to support Automake's subdir-objects.
+
+ Due to a bug in Automake, subdir-objects won't be enabled
+ for now.
+
+ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17354
+
+ Thanks to Daniel Richard G. for the original patches.
+
+ configure.ac | 7 ++++++-
+ src/Makefile.am | 22 +++++++++++++++++++++-
+ src/liblzma/Makefile.am | 4 ++--
+ src/lzmainfo/Makefile.am | 4 ++--
+ src/xz/Makefile.am | 10 +++++-----
+ src/xzdec/Makefile.am | 8 ++++----
+ 6 files changed, 40 insertions(+), 15 deletions(-)
+
+commit 08c2aa16bea0df82828f665d51fba2e0a5e8997f
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-24 20:09:29 +0300
+
+ Translations: Update the Italian translation.
+
+ Thanks to Milo Casagrande.
+
+ po/it.po | 452 ++++++++++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 275 insertions(+), 177 deletions(-)
+
+commit 2f9f61aa83539c54ff6c118a2693890f0519b3dd
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-18 18:51:45 +0300
+
+ Translations: Update the Polish translation.
+
+ Thanks to Jakub Bogusz.
+
+ po/pl.po | 332 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 214 insertions(+), 118 deletions(-)
+
+commit 4f9d233f67aea25e532824d11b7642cf7dee7a76
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:30 +0200
+
+ l10n: de.po: Change translator email address.
+
+ Although the old address is still working, the new one should
+ be preferred. So this commit changes all three places in de.po
+ accordingly.
+
+ Signed-off-by: Andre Noll <maan@tuebingen.mpg.de>
+
+ po/de.po | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 00502b2bedad43f0cc167ac17ae0608837ee196b
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:29 +0200
+
+ l10n: de.po: Update German translation
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 531 +++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 281 insertions(+), 250 deletions(-)
+
+commit 706b0496753fb609e69f1570ec603f11162189d1
+Author: Andre Noll <maan@tuebingen.mpg.de>
+Date: 2014-10-14 17:30:28 +0200
+
+ l10n: de.po: Fix typo: Schießen -> Schließen.
+
+ That's a funny one since "schießen" means to shoot :)
+
+ Signed-off-by: Andre Noll <maan@systemlinux.org>
+
+ po/de.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 7c32e6a935c3d7ee366abad1679bd5f322f0c7d4
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:42:26 +0300
+
+ Update THANKS.
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 076258cc458f1e705041ac7a729b15ffe8c5214a
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 19:41:51 +0300
+
+ Add support for AmigaOS/AROS to tuklib_physmem().
+
+ Thanks to Fredrik Wikstrom.
+
+ m4/tuklib_physmem.m4 | 3 ++-
+ src/common/tuklib_physmem.c | 7 +++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit efa7b0a210e1baa8e128fc98c5443a944c39ad24
+Author: Lasse Collin <lasse.collin@tukaani.org>
+Date: 2014-10-09 18:42:14 +0300
+
+ xzgrep: Avoid passing both -q and -l to grep.
+
+ The behavior of grep -ql varies:
+ - GNU grep behaves like grep -q.
+ - OpenBSD grep behaves like grep -l.
+
+ POSIX doesn't make it 100 % clear what behavior is expected.
+ Anyway, using both -q and -l at the same time makes no sense
+ so both options simply should never be used at the same time.
+
+ Thanks to Christian Weisgerber.
+
+ src/scripts/xzgrep.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 9c5f76098c9986b48d2fc574a0b764f4cde0c538
+Author: Trần Ngá»c Quân <vnwildman@gmail.com>
+Date: 2014-09-25 09:22:45 +0700
+
+ l10n: vi.po: Update Vietnamese translation
+
+ Signed-off-by: Trần Ngá»c Quân <vnwildman@gmail.com>
+
+ po/vi.po | 136 +++++++++++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 84 insertions(+), 52 deletions(-)
+
+commit c4911f2db36d811896c73c008b4218d8fa9a4730
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Thu Feb 12 21:18:02 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 90E666F2;
Thu, 12 Feb 2015 21:18:02 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 78B8DD68;
Thu, 12 Feb 2015 21:18:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1CLI2nu009321;
Thu, 12 Feb 2015 21:18:02 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1CLHp3n009237;
Thu, 12 Feb 2015 21:17:51 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502122117.t1CLHp3n009237@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Thu, 12 Feb 2015 21:17:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278638 - in projects/building-blocks: . bin/pkill/tests
contrib/binutils/ld/scripttempl contrib/elftoolchain/libdwarf
contrib/netbsd-tests/games etc etc/mtree etc/root games games/caes...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2015 21:18:02 -0000
Author: ngie
Date: Thu Feb 12 21:17:50 2015
New Revision: 278638
URL: https://svnweb.freebsd.org/changeset/base/278638
Log:
MFhead @ r278636
Modified:
projects/building-blocks/Makefile.inc1
projects/building-blocks/ObsoleteFiles.inc
projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh
projects/building-blocks/contrib/binutils/ld/scripttempl/elf.sc
projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h
projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_reloc.c
projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.c
projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.h
projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
projects/building-blocks/contrib/netbsd-tests/games/t_factor.sh
projects/building-blocks/etc/login.conf
projects/building-blocks/etc/master.passwd
projects/building-blocks/etc/mtree/BSD.debug.dist
projects/building-blocks/etc/mtree/BSD.usr.dist
projects/building-blocks/etc/root/dot.cshrc
projects/building-blocks/etc/root/dot.login
projects/building-blocks/etc/root/dot.profile
projects/building-blocks/games/Makefile.inc
projects/building-blocks/games/caesar/rot13.sh
projects/building-blocks/games/fortune/datfiles/Makefile
projects/building-blocks/include/stdio.h
projects/building-blocks/lib/libc/gen/ulimit.c
projects/building-blocks/lib/libthr/libthr.3
projects/building-blocks/release/scripts/make-manifest.sh
projects/building-blocks/share/man/man4/led.4
projects/building-blocks/share/man/man6/intro.6
projects/building-blocks/share/man/man7/hier.7
projects/building-blocks/share/mk/bsd.prog.mk
projects/building-blocks/share/skel/Makefile
projects/building-blocks/share/skel/dot.cshrc.in
projects/building-blocks/share/skel/dot.login.in
projects/building-blocks/share/skel/dot.profile.in
projects/building-blocks/sys/arm/arm/db_trace.c
projects/building-blocks/sys/arm/xscale/ixp425/if_npe.c
projects/building-blocks/sys/boot/arm/ixp425/boot2/ixp425_board.c
projects/building-blocks/sys/boot/pc98/boot2/Makefile
projects/building-blocks/sys/cam/ctl/ctl.c
projects/building-blocks/sys/cam/ctl/ctl.h
projects/building-blocks/sys/cam/ctl/ctl_backend_block.c
projects/building-blocks/sys/cam/ctl/ctl_private.h
projects/building-blocks/sys/cam/ctl/ctl_tpc.c
projects/building-blocks/sys/cam/ctl/ctl_tpc.h
projects/building-blocks/sys/cam/ctl/ctl_tpc_local.c
projects/building-blocks/sys/cam/scsi/scsi_all.h
projects/building-blocks/sys/cddl/dev/fbt/arm/fbt_isa.c
projects/building-blocks/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
projects/building-blocks/sys/dev/hwpmc/hwpmc_armv7.c
projects/building-blocks/sys/kern/kern_sig.c
projects/building-blocks/sys/kern/kern_timeout.c
projects/building-blocks/sys/x86/iommu/intel_drv.c
projects/building-blocks/sys/x86/iommu/intel_reg.h
projects/building-blocks/sys/x86/iommu/intel_utils.c
projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
projects/building-blocks/tools/tools/nanobsd/gateworks/Files/root/.profile
projects/building-blocks/tools/tools/nanobsd/pcengines/Files/root/.cshrc
projects/building-blocks/tools/tools/nanobsd/pcengines/Files/root/.login
projects/building-blocks/tools/tools/nanobsd/rescue/Files/root/.cshrc
projects/building-blocks/usr.bin/svn/svn/Makefile
projects/building-blocks/usr.bin/wc/wc.c
projects/building-blocks/usr.bin/whereis/pathnames.h
projects/building-blocks/usr.bin/whereis/whereis.1
projects/building-blocks/usr.bin/whereis/whereis.c
projects/building-blocks/usr.sbin/bsdconfig/include/messages.subr
projects/building-blocks/usr.sbin/ctladm/ctladm.8
projects/building-blocks/usr.sbin/ctld/ctl.conf.5
projects/building-blocks/usr.sbin/ctld/ctld.c
projects/building-blocks/usr.sbin/ctld/ctld.h
projects/building-blocks/usr.sbin/ctld/keys.c
projects/building-blocks/usr.sbin/flowctl/flowctl.c
projects/building-blocks/usr.sbin/iscsid/iscsid.h
projects/building-blocks/usr.sbin/iscsid/keys.c
projects/building-blocks/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
Directory Properties:
projects/building-blocks/ (props changed)
projects/building-blocks/contrib/binutils/ (props changed)
projects/building-blocks/contrib/elftoolchain/ (props changed)
projects/building-blocks/etc/ (props changed)
projects/building-blocks/include/ (props changed)
projects/building-blocks/lib/libc/ (props changed)
projects/building-blocks/share/ (props changed)
projects/building-blocks/share/man/man4/ (props changed)
projects/building-blocks/sys/ (props changed)
projects/building-blocks/sys/boot/ (props changed)
Modified: projects/building-blocks/Makefile.inc1
==============================================================================
--- projects/building-blocks/Makefile.inc1 Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/Makefile.inc1 Thu Feb 12 21:17:50 2015 (r278638)
@@ -189,9 +189,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX}
OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
-# /usr/games added for fortune which depend on strfile
-BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
-XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
+XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
@@ -812,9 +811,6 @@ ITOOLS+=makewhatis
# Non-base distributions produced by the base system
EXTRA_DISTRIBUTIONS= doc
-.if ${MK_GAMES} != "no"
-EXTRA_DISTRIBUTIONS+= games
-.endif
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
EXTRA_DISTRIBUTIONS+= lib32
.endif
Modified: projects/building-blocks/ObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/ObsoleteFiles.inc Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/ObsoleteFiles.inc Thu Feb 12 21:17:50 2015 (r278638)
@@ -38,6 +38,22 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150212: /usr/games moving into /usr/bin
+OLD_FILES+=usr/games/bcd
+OLD_FILES+=usr/games/caesar
+OLD_FILES+=usr/games/factor
+OLD_FILES+=usr/games/fortune
+OLD_FILES+=usr/games/grdc
+OLD_FILES+=usr/games/morse
+OLD_FILES+=usr/games/number
+OLD_FILES+=usr/games/pom
+OLD_FILES+=usr/games/ppt
+OLD_FILES+=usr/games/primes
+OLD_FILES+=usr/games/random
+OLD_FILES+=usr/games/rot13
+OLD_FILES+=usr/games/strfile
+OLD_FILES+=usr/games/unstr
+OLD_DIRS+=usr/games
# 20150209: liblzma header
OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
Modified: projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh Thu Feb 12 21:17:50 2015 (r278638)
@@ -19,79 +19,71 @@ jail_name_to_jid()
base=pgrep_j_test
+if [ `id -u` -ne 0 ]; then
+ echo "1..0 # skip Test needs uid 0."
+ exit 0
+fi
+
echo "1..3"
+sleep=$(pwd)/sleep.txt
+ln -sf /bin/sleep $sleep
+
name="pgrep -j <jid>"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
-
- jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
-
- jid1=$(jail_name_to_jid ${base}_1_1)
- jid2=$(jail_name_to_jid ${base}_1_2)
- jid="${jid1},${jid2}"
- pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)"
- pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
- $(cat ${PWD}/${base}_1_2.pid) | sort)
- if [ "$pid1" = "$pid2" ]; then
- echo "ok 1 - $name"
- else
- echo "not ok 1 - $name"
- fi
- [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
- [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
- rm -f $sleep
+sleep_amount=5
+jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
+
+jid1=$(jail_name_to_jid ${base}_1_1)
+jid2=$(jail_name_to_jid ${base}_1_2)
+jid="${jid1},${jid2}"
+pid1="$(pgrep -f -x -j $jid "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
+ $(cat ${PWD}/${base}_1_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+ echo "ok 1 - $name"
else
- echo "ok 1 - $name # skip Test needs uid 0."
+ echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
name="pgrep -j any"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
-
- jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
-
- sleep 2
- pid1="$(pgrep -f -x -j any "$sleep 5" | sort)"
- pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
- $(cat ${PWD}/${base}_2_2.pid) | sort)
- if [ "$pid1" = "$pid2" ]; then
- echo "ok 2 - $name"
- else
- echo "not ok 2 - $name"
- fi
- [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
- [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
- rm -f $sleep
+sleep_amount=6
+jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount &
+
+sleep 2
+pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
+ $(cat ${PWD}/${base}_2_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+ echo "ok 2 - $name"
else
- echo "ok 2 - $name # skip Test needs uid 0."
+ echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
name="pgrep -j none"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- daemon -p ${PWD}/${base}_3_1.pid $sleep 5 &
- jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
- sleep 2
- pid="$(pgrep -f -x -j none "$sleep 5")"
- if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
- echo "ok 3 - $name"
- else
- echo "not ok 3 - $name"
- fi
- rm -f $sleep
- [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
- [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid)
+sleep_amount=7
+daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount &
+jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
+sleep 2
+pid="$(pgrep -f -x -j none "$sleep $sleep_amount")"
+if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
+ echo "ok 3 - $name"
else
- echo "ok 3 - $name # skip Test needs uid 0."
+ echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
+[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid)
+
+rm -f $sleep
Modified: projects/building-blocks/contrib/binutils/ld/scripttempl/elf.sc
==============================================================================
--- projects/building-blocks/contrib/binutils/ld/scripttempl/elf.sc Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/binutils/ld/scripttempl/elf.sc Thu Feb 12 21:17:50 2015 (r278638)
@@ -402,8 +402,8 @@ cat <<EOF
.fini_array ${RELOCATING-0} :
{
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
- KEEP (*(.fini_array))
KEEP (*(SORT(.fini_array.*)))
+ KEEP (*(.fini_array))
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
}
${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}
Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h
==============================================================================
--- projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/elftoolchain/libdwarf/_libdwarf.h Thu Feb 12 21:17:50 2015 (r278638)
@@ -49,7 +49,7 @@
struct _libdwarf_globals {
Dwarf_Handler errhand;
Dwarf_Ptr errarg;
- int applyrela;
+ int applyreloc;
};
extern struct _libdwarf_globals _libdwarf;
Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_reloc.c
==============================================================================
--- projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_reloc.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_reloc.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply)
{
int oldapply;
- oldapply = _libdwarf.applyrela;
- _libdwarf.applyrela = apply;
+ oldapply = _libdwarf.applyreloc;
+ _libdwarf.applyreloc = apply;
return (oldapply);
}
Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
==============================================================================
--- projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Thu Feb 12 21:17:50 2015 (r278638)
@@ -24,7 +24,7 @@
.\"
.\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $
.\"
-.Dd June 26, 2011
+.Dd February 11, 2015
.Os
.Dt DWARF_SET_RELOC_APPLICATION 3
.Sh NAME
@@ -47,6 +47,8 @@ handled by the DWARF(3) library.
If the argument
.Ar apply
holds a non-zero value, the library will process all the relevant
+.Dq ".rel"
+and
.Dq ".rela"
relocation sections and will apply the relocation records found to
their corresponding DWARF sections.
Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.c
==============================================================================
--- projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -31,5 +31,5 @@ ELFTC_VCSID("$Id: libdwarf.c 2070 2011-1
struct _libdwarf_globals _libdwarf = {
.errhand = NULL,
.errarg = NULL,
- .applyrela = 1
+ .applyreloc = 1
};
Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.h Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf.h Thu Feb 12 21:17:50 2015 (r278638)
@@ -439,6 +439,7 @@ enum Dwarf_ISA {
DW_ISA_SPARC,
DW_ISA_X86,
DW_ISA_X86_64,
+ DW_ISA_AARCH64,
DW_ISA_MAX
};
Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -50,32 +50,46 @@ static const char *debug_name[] = {
};
static void
-_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
- Elf_Data *symtab_data, int endian)
+_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian,
+ void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend)
{
- Dwarf_Unsigned type;
- GElf_Rela rela;
GElf_Sym sym;
- size_t symndx;
- uint64_t offset;
- int size, j;
+ int size;
- j = 0;
- while (gelf_getrela(rel_data, j++, &rela) != NULL) {
- symndx = GELF_R_SYM(rela.r_info);
- type = GELF_R_TYPE(rela.r_info);
+ if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), &sym) == NULL)
+ return;
+ if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0)
+ return; /* Unknown or non-absolute relocation. */
+ if (endian == ELFDATA2MSB)
+ _dwarf_write_msb(buf, &offset, sym.st_value + r_addend, size);
+ else
+ _dwarf_write_lsb(buf, &offset, sym.st_value + r_addend, size);
+}
- if (gelf_getsym(symtab_data, symndx, &sym) == NULL)
- continue;
+static void
+_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rel rel;
+ int j;
- offset = rela.r_offset;
- size = _dwarf_get_reloc_size(dbg, type);
+ j = 0;
+ while (gelf_getrel(rel_data, j++, &rel) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rel.r_offset, rel.r_info, 0);
+}
- if (endian == ELFDATA2MSB)
- _dwarf_write_msb(buf, &offset, rela.r_addend, size);
- else
- _dwarf_write_lsb(buf, &offset, rela.r_addend, size);
- }
+static void
+_dwarf_elf_apply_rela_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rela rela;
+ int j;
+
+ j = 0;
+ while (gelf_getrela(rel_data, j++, &rela) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rela.r_offset, rela.r_info, rela.r_addend);
}
static int
@@ -104,7 +118,8 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
return (DW_DLE_ELF);
}
- if (sh.sh_type != SHT_RELA || sh.sh_size == 0)
+ if ((sh.sh_type != SHT_REL && sh.sh_type != SHT_RELA) ||
+ sh.sh_size == 0)
continue;
if (sh.sh_info == shndx && sh.sh_link == symtab) {
@@ -125,8 +140,12 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
}
memcpy(ed->ed_alloc, ed->ed_data->d_buf,
ed->ed_data->d_size);
- _dwarf_elf_apply_reloc(dbg, ed->ed_alloc, rel,
- symtab_data, eh.e_ident[EI_DATA]);
+ if (sh.sh_type == SHT_REL)
+ _dwarf_elf_apply_rel_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
+ else
+ _dwarf_elf_apply_rela_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
return (DW_DLE_NONE);
}
@@ -282,7 +301,7 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *el
}
}
- if (_libdwarf.applyrela) {
+ if (_libdwarf.applyreloc) {
if (_dwarf_elf_relocate(dbg, elf,
&e->eo_data[j], elf_ndxscn(scn), symtab_ndx,
symtab_data, error) != DW_DLE_NONE)
Modified: projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
assert(dbg != NULL);
switch (dbg->dbgp_isa) {
+ case DW_ISA_AARCH64:
+ return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
case DW_ISA_X86:
return (R_386_32);
case DW_ISA_X86_64:
@@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
switch (dbg->dbg_machine) {
case EM_NONE:
break;
+ case EM_AARCH64:
+ if (rel_type == R_AARCH64_ABS32)
+ return (4);
+ else if (rel_type == R_AARCH64_ABS64)
+ return (8);
+ break;
case EM_ARM:
if (rel_type == R_ARM_ABS32)
return (4);
Modified: projects/building-blocks/contrib/netbsd-tests/games/t_factor.sh
==============================================================================
--- projects/building-blocks/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/contrib/netbsd-tests/games/t_factor.sh Thu Feb 12 21:17:50 2015 (r278638)
@@ -27,13 +27,13 @@
expect() {
echo "${2}" >expout
- atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+ atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1}
}
atf_test_case overflow
overflow_head() {
atf_set "descr" "Tests for overflow conditions"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
overflow_body() {
expect '8675309' '8675309: 8675309'
@@ -44,7 +44,7 @@ atf_test_case loop
loop_head() {
atf_set "descr" "Tests some cases that once locked the program" \
"in an infinite loop"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
loop_body() {
expect '99999999999991' '99999999999991: 7 13 769231 1428571'
Modified: projects/building-blocks/etc/login.conf
==============================================================================
--- projects/building-blocks/etc/login.conf Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/etc/login.conf Thu Feb 12 21:17:50 2015 (r278638)
@@ -27,7 +27,7 @@ default:\
:copyright=/etc/COPYRIGHT:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
- :path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\
+ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
:nologin=/var/run/nologin:\
:cputime=unlimited:\
:datasize=unlimited:\
Modified: projects/building-blocks/etc/master.passwd
==============================================================================
--- projects/building-blocks/etc/master.passwd Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/etc/master.passwd Thu Feb 12 21:17:50 2015 (r278638)
@@ -7,7 +7,7 @@ operator:*:2:5::0:0:System &:/:/usr/sbin
bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
-games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin
+games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin
news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
Modified: projects/building-blocks/etc/mtree/BSD.debug.dist
==============================================================================
--- projects/building-blocks/etc/mtree/BSD.debug.dist Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/etc/mtree/BSD.debug.dist Thu Feb 12 21:17:50 2015 (r278638)
@@ -21,8 +21,6 @@
usr
bin
..
- games
- ..
lib
clang
3.5.1
Modified: projects/building-blocks/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/building-blocks/etc/mtree/BSD.usr.dist Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/etc/mtree/BSD.usr.dist Thu Feb 12 21:17:50 2015 (r278638)
@@ -7,8 +7,6 @@
.
bin
..
- games
- ..
include
..
lib
Modified: projects/building-blocks/etc/root/dot.cshrc
==============================================================================
--- projects/building-blocks/etc/root/dot.cshrc Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/etc/root/dot.cshrc Thu Feb 12 21:17:50 2015 (r278638)
@@ -15,7 +15,7 @@ alias ll ls -lAF
# A righteous umask
umask 22
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
setenv EDITOR vi
setenv PAGER more
Modified: projects/building-blocks/etc/root/dot.login
==============================================================================
--- projects/building-blocks/etc/root/dot.login Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/etc/root/dot.login Thu Feb 12 21:17:50 2015 (r278638)
@@ -6,4 +6,4 @@
#
# Uncomment to display a random cookie each login:
-# /usr/games/fortune -s
+# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s
Modified: projects/building-blocks/etc/root/dot.profile
==============================================================================
--- projects/building-blocks/etc/root/dot.profile Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/etc/root/dot.profile Thu Feb 12 21:17:50 2015 (r278638)
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
export PATH
HOME=/root
export HOME
Modified: projects/building-blocks/games/Makefile.inc
==============================================================================
--- projects/building-blocks/games/Makefile.inc Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/games/Makefile.inc Thu Feb 12 21:17:50 2015 (r278638)
@@ -1,7 +1,6 @@
# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-BINDIR?= /usr/games
+BINDIR?= /usr/bin
FILESDIR?= ${SHAREDIR}/games
WARNS?= 6
-DISTRIBUTION?= games
Modified: projects/building-blocks/games/caesar/rot13.sh
==============================================================================
--- projects/building-blocks/games/caesar/rot13.sh Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/games/caesar/rot13.sh Thu Feb 12 21:17:50 2015 (r278638)
@@ -30,4 +30,4 @@
# @(#)rot13.sh 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-exec /usr/games/caesar 13 "$@"
+exec /usr/bin/caesar 13 "$@"
Modified: projects/building-blocks/games/fortune/datfiles/Makefile
==============================================================================
--- projects/building-blocks/games/fortune/datfiles/Makefile Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/games/fortune/datfiles/Makefile Thu Feb 12 21:17:50 2015 (r278638)
@@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/games/fortune
.for f in ${DB}
$f.dat: $f
- PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
+ PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \
strfile -Cs ${.ALLSRC} ${.TARGET}
.endfor
Modified: projects/building-blocks/include/stdio.h
==============================================================================
--- projects/building-blocks/include/stdio.h Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/include/stdio.h Thu Feb 12 21:17:50 2015 (r278638)
@@ -166,7 +166,7 @@ __END_DECLS
#define __SRW 0x0010 /* open for reading & writing */
#define __SEOF 0x0020 /* found EOF */
#define __SERR 0x0040 /* found error */
-#define __SMBF 0x0080 /* _buf is from malloc */
+#define __SMBF 0x0080 /* _bf._base is from malloc */
#define __SAPP 0x0100 /* fdopen()ed in append mode */
#define __SSTR 0x0200 /* this is an sprintf/snprintf string */
#define __SOPT 0x0400 /* do fseek() optimization */
Modified: projects/building-blocks/lib/libc/gen/ulimit.c
==============================================================================
--- projects/building-blocks/lib/libc/gen/ulimit.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/lib/libc/gen/ulimit.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -53,13 +53,13 @@ ulimit(int cmd, ...)
va_start(ap, cmd);
arg = va_arg(ap, long);
va_end(ap);
+ if (arg > RLIM_INFINITY / 512 || arg < 0)
+ arg = RLIM_INFINITY / 512;
limit.rlim_max = limit.rlim_cur = (rlim_t)arg * 512;
/* The setrlimit() function sets errno to EPERM if needed. */
if (setrlimit(RLIMIT_FSIZE, &limit) == -1)
return (-1);
- if (arg * 512 > LONG_MAX)
- return (LONG_MAX);
return (arg);
} else {
errno = EINVAL;
Modified: projects/building-blocks/lib/libthr/libthr.3
==============================================================================
--- projects/building-blocks/lib/libthr/libthr.3 Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/lib/libthr/libthr.3 Thu Feb 12 21:17:50 2015 (r278638)
@@ -1,5 +1,5 @@
.\" Copyright (c) 2005 Robert N. M. Watson
-.\" Copyright (c) 2014 The FreeBSD Foundation, Inc.
+.\" Copyright (c) 2014,2015 The FreeBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" Part of this documentation was written by
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 26, 2014
+.Dd February 12, 2015
.Dt LIBTHR 3
.Os
.Sh NAME
@@ -200,45 +200,25 @@ Bigger values reduce the frequency of th
The value must be between 0 and 255.
.El
.Sh INTERACTION WITH RUN-TIME LINKER
-The
+On load,
.Nm
-library must appear before
-.Li libc
-in the global order of depended objects.
-.Pp
-Loading
-.Nm
-with the
-.Xr dlopen 3
-call in the process after the program binary is activated
-is not supported, and causes miscellaneous and hard-to-diagnose misbehaviour.
-This is due to
-.Nm
-interposing several important
-.Li libc
-symbols to provide thread-safe services.
-In particular,
-.Dv errno
-and the locking stubs from
-.Li libc
-are affected.
-This requirement is currently not enforced.
-.Pp
-If the program loads any modules at run-time, and those modules may require
-threading services, the main program binary must be linked with
-.Li libpthread ,
-even if it does not require any services from the library.
+installs interposing handlers into the hooks exported by
+.Li libc .
+The interposers provide real locking implementation instead of the
+stubs for single-threaded processes in
+.Li ,
+cancellation support and some modifications to the signal operations.
.Pp
.Nm
cannot be unloaded; the
.Xr dlclose 3
function does not perform any action when called with a handle for
.Nm .
-One of the reasons is that the interposing of
+One of the reasons is that the internal interposing of
.Li libc
functions cannot be undone.
.Sh SIGNALS
-The implementation also interposes the user-installed
+The implementation interposes the user-installed
.Xr signal 3
handlers.
This interposing is done to postpone signal delivery to threads which
Modified: projects/building-blocks/release/scripts/make-manifest.sh
==============================================================================
--- projects/building-blocks/release/scripts/make-manifest.sh Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/release/scripts/make-manifest.sh Thu Feb 12 21:17:50 2015 (r278638)
@@ -13,7 +13,6 @@ desc_base="Base system (MANDATORY)"
desc_kernel="Kernel (MANDATORY)"
desc_doc="Additional documentation"
doc_default=off
-desc_games="Games (fortune, etc.)"
desc_lib32="32-bit compatibility libraries"
desc_ports="Ports tree"
desc_src="System source code"
Modified: projects/building-blocks/share/man/man4/led.4
==============================================================================
--- projects/building-blocks/share/man/man4/led.4 Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/man/man4/led.4 Thu Feb 12 21:17:50 2015 (r278638)
@@ -170,7 +170,7 @@ flashes
.Pp
.Dl *_*__**_
.Bd -literal
-/usr/games/morse -l "Soekris rocks" > /dev/led/error
+/usr/bin/morse -l "Soekris rocks" > /dev/led/error
.Ed
.Sh SEE ALSO
.Xr morse 6
Modified: projects/building-blocks/share/man/man6/intro.6
==============================================================================
--- projects/building-blocks/share/man/man6/intro.6 Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/man/man6/intro.6 Thu Feb 12 21:17:50 2015 (r278638)
@@ -37,7 +37,7 @@
This section contains information about games.
The games
are located in
-.Pa /usr/games
+.Pa /usr/bin
if installed.
You can get a short overview about all the games with the
command:
@@ -45,13 +45,18 @@ command:
$ apropos '\\(6\\)'
.Ed
.Sh FILES
-.Bl -tag -width /usr/games -compact
-.It Pa /usr/games
+.Bl -tag -width /usr/bin -compact
+.It Pa /usr/bin
location of games
.El
.Sh SEE ALSO
.Xr intro 1
.Sh HISTORY
+In earlier versions of
+.Fx ,
+games were located in
+.Pa /usr/games .
+.Pp
The
.Nm
section manual page appeared in
Modified: projects/building-blocks/share/man/man7/hier.7
==============================================================================
--- projects/building-blocks/share/man/man7/hier.7 Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/man/man7/hier.7 Thu Feb 12 21:17:50 2015 (r278638)
@@ -187,8 +187,6 @@ common utilities, programming tools, and
.It Pa compat/
files needed to support binary compatibility with other operating systems,
such as Linux
-.It Pa games/
-useful and semi-frivolous programs
.It Pa include/
standard C include files
.Pp
Modified: projects/building-blocks/share/mk/bsd.prog.mk
==============================================================================
--- projects/building-blocks/share/mk/bsd.prog.mk Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/mk/bsd.prog.mk Thu Feb 12 21:17:50 2015 (r278638)
@@ -62,7 +62,7 @@ PROG_FULL=${PROG}.full
${BINDIR} == "/bin" ||\
${BINDIR} == "/libexec" ||\
${BINDIR} == "/sbin" ||\
- ${BINDIR:C%/usr/(bin|bsdinstall|games|libexec|lpr|sendmail|sm.bin|sbin)(/.*)?%/usr/bin%} == "/usr/bin"\
+ ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin)(/.*)?%/usr/bin%} == "/usr/bin"\
)
DEBUGFILEDIR= ${DEBUGDIR}${BINDIR}
.else
Modified: projects/building-blocks/share/skel/Makefile
==============================================================================
--- projects/building-blocks/share/skel/Makefile Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/skel/Makefile Thu Feb 12 21:17:50 2015 (r278638)
@@ -25,11 +25,6 @@ FILES2+= dot.rhosts
FILES1+= dot.cshrc
.endif
-.if ${MK_GAMES} == "no"
-dot.login_SED+= -e "/\/usr\/games\/fortune /s/^/\#/"
-dot.profile_SED+= -e "/\/usr\/games\/fortune /s/^/\#/"
-.endif
-
.if ${MK_VI} == "no"
dot.cshrc_SED+= -e '/^setenv.*EDITOR.*vi$$/s/^/\#/'
dot.mailrc_SED+= -e '/^set EDITOR=vi$$/s/^/\#/' -e '/^set VISUAL=vi$$/s/^/\#/'
Modified: projects/building-blocks/share/skel/dot.cshrc.in
==============================================================================
--- projects/building-blocks/share/skel/dot.cshrc.in Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/skel/dot.cshrc.in Thu Feb 12 21:17:50 2015 (r278638)
@@ -14,7 +14,7 @@ alias ll ls -lAF
# These are normally set through /etc/login.conf. You may override them here
# if wanted.
-# set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
+# set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
# setenv BLOCKSIZE K
# A righteous umask
# umask 22
Modified: projects/building-blocks/share/skel/dot.login.in
==============================================================================
--- projects/building-blocks/share/skel/dot.login.in Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/skel/dot.login.in Thu Feb 12 21:17:50 2015 (r278638)
@@ -5,4 +5,4 @@
# see also csh(1), environ(7).
#
-/usr/games/fortune freebsd-tips
+/usr/bin/fortune freebsd-tips
Modified: projects/building-blocks/share/skel/dot.profile.in
==============================================================================
--- projects/building-blocks/share/skel/dot.profile.in Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/share/skel/dot.profile.in Thu Feb 12 21:17:50 2015 (r278638)
@@ -7,7 +7,7 @@
# These are normally set through /etc/login.conf. You may override them here
# if wanted.
-# PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH
+# PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH
# BLOCKSIZE=K; export BLOCKSIZE
# Setting TERM is normally done through /etc/ttys. Do only override
@@ -21,4 +21,4 @@ PAGER=more; export PAGER
# set ENV to a file invoked each time sh is started for interactive use.
ENV=$HOME/.shrc; export ENV
-/usr/games/fortune freebsd-tips
+/usr/bin/fortune freebsd-tips
Modified: projects/building-blocks/sys/arm/arm/db_trace.c
==============================================================================
--- projects/building-blocks/sys/arm/arm/db_trace.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/sys/arm/arm/db_trace.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <ddb/db_sym.h>
#include <ddb/db_output.h>
-#ifdef __ARM_EABI__
/*
* Definitions for the instruction interpreter.
*
@@ -453,131 +452,6 @@ db_stack_trace_cmd(struct unwind_state *
}
}
}
-#endif
-
-/*
- * APCS stack frames are awkward beasts, so I don't think even trying to use
- * a structure to represent them is a good idea.
- *
- * Here's the diagram from the APCS. Increasing address is _up_ the page.
- *
- * save code pointer [fp] <- fp points to here
- * return link value [fp, #-4]
- * return sp value [fp, #-8]
- * return fp value [fp, #-12]
- * [saved v7 value]
- * [saved v6 value]
- * [saved v5 value]
- * [saved v4 value]
- * [saved v3 value]
- * [saved v2 value]
- * [saved v1 value]
- * [saved a4 value]
- * [saved a3 value]
- * [saved a2 value]
- * [saved a1 value]
- *
- * The save code pointer points twelve bytes beyond the start of the
- * code sequence (usually a single STM) that created the stack frame.
- * We have to disassemble it if we want to know which of the optional
- * fields are actually present.
- */
-
-#ifndef __ARM_EABI__ /* The frame format is differend in AAPCS */
-static void
-db_stack_trace_cmd(db_expr_t addr, db_expr_t count, boolean_t kernel_only)
-{
- u_int32_t *frame, *lastframe;
- c_db_sym_t sym;
- const char *name;
- db_expr_t value;
- db_expr_t offset;
- int scp_offset;
-
- frame = (u_int32_t *)addr;
- lastframe = NULL;
- scp_offset = -(get_pc_str_offset() >> 2);
-
- while (count-- && frame != NULL && !db_pager_quit) {
- db_addr_t scp;
- u_int32_t savecode;
- int r;
- u_int32_t *rp;
- const char *sep;
-
- /*
- * In theory, the SCP isn't guaranteed to be in the function
- * that generated the stack frame. We hope for the best.
- */
- scp = frame[FR_SCP];
-
- sym = db_search_symbol(scp, DB_STGY_ANY, &offset);
- if (sym == C_DB_SYM_NULL) {
- value = 0;
- name = "(null)";
- } else
- db_symbol_values(sym, &name, &value);
- db_printf("%s() at ", name);
- db_printsym(scp, DB_STGY_PROC);
- db_printf("\n");
-#ifdef __PROG26
- db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV] & R15_PC);
- db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC);
- db_printf(")\n");
-#else
- db_printf("\tscp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV]);
- db_printsym(frame[FR_RLV], DB_STGY_PROC);
- db_printf(")\n");
-#endif
- db_printf("\trsp=0x%08x rfp=0x%08x", frame[FR_RSP], frame[FR_RFP]);
-
- savecode = ((u_int32_t *)scp)[scp_offset];
- if ((savecode & 0x0e100000) == 0x08000000) {
- /* Looks like an STM */
- rp = frame - 4;
- sep = "\n\t";
- for (r = 10; r >= 0; r--) {
- if (savecode & (1 << r)) {
- db_printf("%sr%d=0x%08x",
- sep, r, *rp--);
- sep = (frame - rp) % 4 == 2 ?
- "\n\t" : " ";
- }
- }
- }
-
- db_printf("\n");
-
- /*
- * Switch to next frame up
- */
- if (frame[FR_RFP] == 0)
- break; /* Top of stack */
-
- lastframe = frame;
- frame = (u_int32_t *)(frame[FR_RFP]);
-
- if (INKERNEL((int)frame)) {
- /* staying in kernel */
- if (frame <= lastframe) {
- db_printf("Bad frame pointer: %p\n", frame);
- break;
- }
- } else if (INKERNEL((int)lastframe)) {
- /* switch from user to kernel */
- if (kernel_only)
- break; /* kernel stack only */
- } else {
- /* in user */
- if (frame <= lastframe) {
- db_printf("Bad user frame pointer: %p\n",
- frame);
- break;
- }
- }
- }
-}
-#endif
/* XXX stubs */
void
@@ -600,24 +474,18 @@ db_md_set_watchpoint(db_expr_t addr, db_
int
db_trace_thread(struct thread *thr, int count)
{
-#ifdef __ARM_EABI__
struct unwind_state state;
-#endif
struct pcb *ctx;
if (thr != curthread) {
ctx = kdb_thr_ctx(thr);
-#ifdef __ARM_EABI__
state.registers[FP] = ctx->pcb_regs.sf_r11;
state.registers[SP] = ctx->pcb_regs.sf_sp;
state.registers[LR] = ctx->pcb_regs.sf_lr;
state.registers[PC] = ctx->pcb_regs.sf_pc;
db_stack_trace_cmd(&state);
-#else
- db_stack_trace_cmd(ctx->pcb_regs.sf_r11, -1, TRUE);
-#endif
} else
db_trace_self();
return (0);
@@ -626,7 +494,6 @@ db_trace_thread(struct thread *thr, int
void
db_trace_self(void)
{
-#ifdef __ARM_EABI__
struct unwind_state state;
uint32_t sp;
@@ -639,10 +506,4 @@ db_trace_self(void)
state.registers[PC] = (uint32_t)db_trace_self;
db_stack_trace_cmd(&state);
-#else
- db_addr_t addr;
-
- addr = (db_addr_t)__builtin_frame_address(0);
- db_stack_trace_cmd(addr, -1, FALSE);
-#endif
}
Modified: projects/building-blocks/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- projects/building-blocks/sys/arm/xscale/ixp425/if_npe.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/sys/arm/xscale/ixp425/if_npe.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -285,7 +285,7 @@ unit2npeid(int unit)
};
/* XXX check feature register instead */
return (unit < 3 ? npeidmap[
- (cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
+ (cpu_ident() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1);
}
static int
Modified: projects/building-blocks/sys/boot/arm/ixp425/boot2/ixp425_board.c
==============================================================================
--- projects/building-blocks/sys/boot/arm/ixp425/boot2/ixp425_board.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/sys/boot/arm/ixp425/boot2/ixp425_board.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -74,7 +74,7 @@ board_init(void)
{
struct board_config **pbp;
- cputype = cpu_id() & CPU_ID_CPU_MASK;
+ cputype = cpu_ident() & CPU_ID_CPU_MASK;
SET_FOREACH(pbp, boards)
/* XXX pass down redboot board type */
Modified: projects/building-blocks/sys/boot/pc98/boot2/Makefile
==============================================================================
--- projects/building-blocks/sys/boot/pc98/boot2/Makefile Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/sys/boot/pc98/boot2/Makefile Thu Feb 12 21:17:50 2015 (r278638)
@@ -92,6 +92,7 @@ boot2.out: ${BTXCRT} boot2.o sio.o
${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC}
boot2.o: boot2.s
+ ${CC} ${ACFLAGS} -c boot2.s
SRCS= boot2.c boot2.h
Modified: projects/building-blocks/sys/cam/ctl/ctl.c
==============================================================================
--- projects/building-blocks/sys/cam/ctl/ctl.c Thu Feb 12 21:15:28 2015 (r278637)
+++ projects/building-blocks/sys/cam/ctl/ctl.c Thu Feb 12 21:17:50 2015 (r278638)
@@ -4483,6 +4483,8 @@ ctl_init_log_page_index(struct ctl_lun *
lun->log_pages.index[1].page_len = k * 2;
lun->log_pages.index[2].page_data = &lun->log_pages.lbp_page[0];
lun->log_pages.index[2].page_len = 12*CTL_NUM_LBP_PARAMS;
+ lun->log_pages.index[3].page_data = (uint8_t *)&lun->log_pages.stat_page;
+ lun->log_pages.index[3].page_len = sizeof(lun->log_pages.stat_page);
return (CTL_RETVAL_COMPLETE);
}
@@ -4720,6 +4722,9 @@ ctl_alloc_lun(struct ctl_softc *ctl_soft
lun->serseq = CTL_LUN_SERSEQ_OFF;
lun->ctl_softc = ctl_softc;
+#ifdef CTL_TIME_IO
+ lun->last_busy = getsbinuptime();
+#endif
TAILQ_INIT(&lun->ooa_queue);
TAILQ_INIT(&lun->blocked_queue);
STAILQ_INIT(&lun->error_list);
@@ -7085,6 +7090,67 @@ ctl_lbp_log_sense_handler(struct ctl_scs
}
int
+ctl_sap_log_sense_handler(struct ctl_scsiio *ctsio,
+ struct ctl_page_index *page_index,
+ int pc)
+{
+ struct ctl_lun *lun;
+ struct stat_page *data;
+ uint64_t rn, wn, rb, wb;
+ struct bintime rt, wt;
+ int i;
+
+ lun = (struct ctl_lun *)ctsio->io_hdr.ctl_private[CTL_PRIV_LUN].ptr;
+ data = (struct stat_page *)page_index->page_data;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 00:08:34 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 53C056D8;
Fri, 13 Feb 2015 00:08:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 349B618E;
Fri, 13 Feb 2015 00:08:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1D08YVu092066;
Fri, 13 Feb 2015 00:08:34 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1D08X7Z092061;
Fri, 13 Feb 2015 00:08:33 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502130008.t1D08X7Z092061@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 13 Feb 2015 00:08:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278644 - in projects/release-install-debug: .
release/scripts usr.sbin/bsdinstall/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 00:08:34 -0000
Author: gjb
Date: Fri Feb 13 00:08:32 2015
New Revision: 278644
URL: https://svnweb.freebsd.org/changeset/base/278644
Log:
Separate /boot/kernel/*.symbols into its own distribution
set, kernel_symbols.txz, which is selected by default.
Provide a manifest description for kernel_symbols.txz.
Fix installing LOCAL_DISTRIBUTIONS by properly setting the
BSDINSTALL_FETCHDEST and BSDINSTALL_DISTDIR environment
variables, enforcing the local MANIFEST is used.
When generating DISTMENU (used to populate the available
distribution sets for selection), do not exclude all of
the available base* and kernel* distributions, which allows
the base-dbg.txz and kernel.*.txz to be listed.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/Makefile.inc1
projects/release-install-debug/release/scripts/make-manifest.sh
projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
Modified: projects/release-install-debug/Makefile.inc1
==============================================================================
--- projects/release-install-debug/Makefile.inc1 Fri Feb 13 00:06:07 2015 (r278643)
+++ projects/release-install-debug/Makefile.inc1 Fri Feb 13 00:08:32 2015 (r278644)
@@ -1143,18 +1143,40 @@ packagekernel:
.if defined(NO_ROOT)
cd ${DESTDIR}/${DISTDIR}/kernel; \
tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \
+ --exclude '*.symbols' \
+ @${DESTDIR}/${DISTDIR}/kernel.meta
+ cd ${DESTDIR}/${DISTDIR}/kernel; \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \
+ --include '*/*/*.symbols' \
@${DESTDIR}/${DISTDIR}/kernel.meta
.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \
+ --exclude '*.symbols' \
+ @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
+ cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \
+ --include '*/*/*.symbols' \
@${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
.endfor
.else
cd ${DESTDIR}/${DISTDIR}/kernel; \
- tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz .
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.txz \
+ --exclude '*.symbols' \
+ .
+ cd ${DESTDIR}/${DISTDIR}/kernel; \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \
+ --include '*/*/*.symbols' \
+ $$(eval find .)
.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
- tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz .
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.txz \
+ --exclude '*.symbols' \
+ .
+ cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \
+ --include '*/*/*.symbols' \
+ $$(eval find .)
.endfor
.endif
Modified: projects/release-install-debug/release/scripts/make-manifest.sh
==============================================================================
--- projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 00:06:07 2015 (r278643)
+++ projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 00:08:32 2015 (r278644)
@@ -24,6 +24,7 @@ desc_doc="${doc}"
desc_games="${games}"
desc_games_dbg="${games} (Debugging)"
desc_kernel="${kernel} (MANDATORY)"
+desc_kernel_symbols="${kernel} (Debugging symbols)"
desc_kernel_alt="Alternate ${kernel}"
desc_lib32="${lib32}"
desc_lib32_dbg="${lib32} (Debugging)"
@@ -38,6 +39,7 @@ default_base_dbg=off
default_games_dbg=off
default_lib32_dbg=off
default_kernel_alt=off
+default_kernel_symbols=on
for i in ${*}; do
dist="${i}"
Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 00:06:07 2015 (r278643)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 00:08:32 2015 (r278644)
@@ -66,7 +66,7 @@ bsdinstall hostname || error "Set hostna
export DISTRIBUTIONS="base.txz kernel.txz"
if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
- DISTMENU=`awk -F'\t' '!/^(kernel|base)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
+ DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
exec 3>&1
EXTRA_DISTS=$( eval dialog \
@@ -215,7 +215,18 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
fi
if [ ! -z "$LOCAL_DISTRIBUTIONS" ]; then
- env DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS" bsdinstall distfetch || \
+ # Download to a directory in the new system as scratch space
+ BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"
+ mkdir -p "$BSDINSTALL_FETCHDEST" || error "Could not create directory $BSDINSTALL_FETCHDEST"
+ # Try to use any existing distfiles
+ if [ -d $BSDINSTALL_DISTDIR ]; then
+ DISTDIR_IS_UNIONFS=1
+ mount_nullfs -o union "$BSDINSTALL_FETCHDEST" "$BSDINSTALL_DISTDIR"
+ export BSDINSTALL_DISTDIR="$BSDINSTALL_FETCHDEST"
+ fi
+ env DISTRIBUTIONS="$LOCAL_DISTRIBUTIONS" \
+ BSDINSTALL_DISTSITE="file:///usr/freebsd-dist" \
+ bsdinstall distfetch || \
error "Failed to fetch distribution from local media"
fi
From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 00:16:08 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 46488AC5;
Fri, 13 Feb 2015 00:16:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 3073325F;
Fri, 13 Feb 2015 00:16:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1D0G8Ew096714;
Fri, 13 Feb 2015 00:16:08 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1D0G6r8096701;
Fri, 13 Feb 2015 00:16:06 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502130016.t1D0G6r8096701@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 13 Feb 2015 00:16:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278647 - in projects/release-pkg: etc share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 00:16:08 -0000
Author: bapt
Date: Fri Feb 13 00:16:05 2015
New Revision: 278647
URL: https://svnweb.freebsd.org/changeset/base/278647
Log:
Makes it more flexible to tag and define a target package
Modified:
projects/release-pkg/etc/Makefile
projects/release-pkg/share/mk/bsd.doc.mk
projects/release-pkg/share/mk/bsd.files.mk
projects/release-pkg/share/mk/bsd.incs.mk
projects/release-pkg/share/mk/bsd.lib.mk
projects/release-pkg/share/mk/bsd.links.mk
projects/release-pkg/share/mk/bsd.man.mk
projects/release-pkg/share/mk/bsd.prog.mk
Modified: projects/release-pkg/etc/Makefile
==============================================================================
--- projects/release-pkg/etc/Makefile Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/etc/Makefile Fri Feb 13 00:16:05 2015 (r278647)
@@ -218,12 +218,12 @@ distribution:
@false
.endif
cd ${.CURDIR}; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \
${BIN2} ${DESTDIR}/etc; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
.if ${MK_AT} == "no"
sed -i "" -e 's;.*/usr/libexec/atrun;#&;' ${DESTDIR}/etc/crontab
@@ -264,74 +264,74 @@ distribution:
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
+ cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 0444 \
${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \
+ cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 0600 \
${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
+ cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 0500 \
${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
.if ${MK_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
- ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
+ ${INSTALL_SYMLINK} ${TAG_ARGS} ../var/unbound ${DESTDIR}/etc/unbound; \
fi
.endif
.if ${MK_SENDMAIL} != "no"
${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
.endif
.if ${MK_OPENSSH} != "no"
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSH} ${DESTDIR}/etc/ssh
.endif
.if ${MK_OPENSSL} != "no"
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
${SSL} ${DESTDIR}/etc/ssl
.endif
.if ${MK_KERBEROS} != "no"
cd ${.CURDIR}/root; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.k5login ${DESTDIR}/root/.k5login;
.endif
cd ${.CURDIR}/root; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.profile ${DESTDIR}/root/.profile; \
rm -f ${DESTDIR}/.profile; \
ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
.if ${MK_TCSH} != "no"
cd ${.CURDIR}/root; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.cshrc ${DESTDIR}/root/.cshrc; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.login ${DESTDIR}/root/.login; \
rm -f ${DESTDIR}/.cshrc; \
ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
.endif
- cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ cd ${.CURDIR}/mtree; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
${MTREE} ${DESTDIR}/etc/mtree
.if ${MK_PPP} != "no"
- cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
+ cd ${.CURDIR}/ppp; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 600 \
${PPPCNF} ${DESTDIR}/etc/ppp
.endif
.if ${MK_MAIL} != "no"
- cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ cd ${.CURDIR}/mail; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 \
${ETCMAIL} ${DESTDIR}/etc/mail
if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
! -f ${DESTDIR}/etc/aliases ]; then \
ln -s mail/aliases ${DESTDIR}/etc/aliases; \
fi
.endif
- ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g operator -m 664 /dev/null \
${DESTDIR}/etc/dumpdates
.if ${MK_LOCATE} != "no"
- ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} ${TAG_ARGS} -o nobody -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/db/locate.database
.endif
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
${DESTDIR}/var/crash
- cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ cd ${.CURDIR}/..; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
${FREEBSD} ${DESTDIR}/
.if ${MK_BOOT} != "no"
.if exists(${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints)
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \
${DESTDIR}/boot/device.hints
.endif
@@ -426,7 +426,7 @@ distrib-dirs: ${MTREES:N/*}
.endif
etc-examples:
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
${BIN1} ${BIN2} nsmb.conf opieaccess \
${DESTDIR}/usr/share/examples/etc
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
Modified: projects/release-pkg/share/mk/bsd.doc.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.doc.mk Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/share/mk/bsd.doc.mk Fri Feb 13 00:16:05 2015 (r278647)
@@ -81,6 +81,13 @@ TRFLAGS+= -I${SRCDIR}
TRFLAGS+= -t
.endif
+.if defined(NO_ROOT)
+.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
+TAGS+= package=${PACKAGE:Uruntime}
+.endif
+TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+.endif
+
DCOMPRESS_EXT?= ${COMPRESS_EXT}
DCOMPRESS_CMD?= ${COMPRESS_CMD}
.for _dev in ${PRINTERDEVICE:Mhtml}
@@ -135,11 +142,11 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${
realinstall:
.for _dev in ${PRINTERDEVICE:Mhtml}
cd ${SRCDIR}; \
- ${INSTALL} -T docs -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
.endfor
.for _dev in ${PRINTERDEVICE:Nhtml}
- ${INSTALL} -T docs -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},docs} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
.endfor
Modified: projects/release-pkg/share/mk/bsd.files.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.files.mk Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/share/mk/bsd.files.mk Fri Feb 13 00:16:05 2015 (r278647)
@@ -13,6 +13,13 @@ FILESGROUPS?= FILES
buildfiles: ${${group}}
.endfor
+.if defined(NO_ROOT)
+.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
+TAGS+= package=${PACKAGE:Uruntime}
+.endif
+TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+.endif
+
all: buildfiles
.for group in ${FILESGROUPS}
@@ -40,7 +47,7 @@ ${group}NAME_${file:T}?= ${file:T}
.endif
installfiles-${group}: _${group}INS_${file:T}
_${group}INS_${file:T}: ${file}
- ${INSTALL} -T runtime -o ${${group}OWN_${.ALLSRC:T}} \
+ ${INSTALL} ${TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
@@ -52,11 +59,11 @@ _${group}FILES+= ${file}
installfiles-${group}: _${group}INS
_${group}INS: ${_${group}FILES}
.if defined(${group}NAME)
- ${INSTALL} -T runtime -o ${${group}OWN} -g ${${group}GRP} \
+ ${INSTALL} ${TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
-m ${${group}MODE} ${.ALLSRC} \
${DESTDIR}${${group}DIR}/${${group}NAME}
.else
- ${INSTALL} -T runtime -o ${${group}OWN} -g ${${group}GRP} \
+ ${INSTALL} ${TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
-m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif
.endif
Modified: projects/release-pkg/share/mk/bsd.incs.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.incs.mk Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/share/mk/bsd.incs.mk Fri Feb 13 00:16:05 2015 (r278647)
@@ -8,6 +8,13 @@
INCSGROUPS?= INCS
+.if defined(NO_ROOT)
+.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
+TAGS+= package=${PACKAGE:Uruntime}
+.endif
+TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+.endif
+
.if !target(buildincludes)
.for group in ${INCSGROUPS}
buildincludes: ${${group}}
@@ -41,7 +48,7 @@ ${group}NAME_${header:T}?= ${header:T}
.endif
installincludes: _${group}INS_${header:T}
_${group}INS_${header:T}: ${header}
- ${INSTALL} -T development -C -o ${${group}OWN_${.ALLSRC:T}} \
+ ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
-g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
@@ -53,10 +60,10 @@ _${group}INCS+= ${header}
installincludes: _${group}INS
_${group}INS: ${_${group}INCS}
.if defined(${group}NAME)
- ${INSTALL} -T development -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
.else
- ${INSTALL} -T development -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
${.ALLSRC} ${DESTDIR}${${group}DIR}
.endif
.endif
@@ -73,7 +80,7 @@ installincludes:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ${INSTALL_SYMLINK} $$l $$t; \
+ ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} $$l $$t; \
done; true
.endif
.endif # !target(installincludes)
Modified: projects/release-pkg/share/mk/bsd.lib.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.lib.mk Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/share/mk/bsd.lib.mk Fri Feb 13 00:16:05 2015 (r278647)
@@ -43,6 +43,13 @@ CTFFLAGS+= -g
STRIP?= -s
.endif
+.if defined(NO_ROOT)
+.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
+TAGS+= package=${PACKAGE}
+.endif
+TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+.endif
+
.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \
empty(DEBUG_FLAGS:M-gdwarf*)
SHARED_CFLAGS+= -g
@@ -223,7 +230,7 @@ ${SHLIB_NAME_FULL}: ${SOBJS}
@${ECHO} building shared library ${SHLIB_NAME}
@rm -f ${SHLIB_NAME} ${SHLIB_LINK}
.if defined(SHLIB_LINK)
- @${INSTALL_SYMLINK} -T development ${SHLIB_NAME} ${SHLIB_LINK}
+ @${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${SHLIB_LINK}
.endif
.if !defined(NM)
@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
@@ -313,22 +320,22 @@ realinstall: _libinstall
.ORDER: beforeinstall _libinstall
_libinstall:
.if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" && !defined(PRIVATELIB)
- ${INSTALL} -T development -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${_LIBDIR}
.endif
.if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) && !defined(PRIVATELIB)
- ${INSTALL} -T profile -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},profile} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(SHLIB_NAME)
- ${INSTALL} -T runtime ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
${SHLIB_NAME} ${DESTDIR}${_SHLIBDIR}
.if ${MK_DEBUG_FILES} != "no"
.if defined(DEBUGMKDIR)
- ${INSTALL} -T debug -d ${DESTDIR}${DEBUGFILEDIR}
+ ${INSTALL} -d ${DESTDIR}${DEBUGFILEDIR}
.endif
- ${INSTALL} -T debug -o ${LIBOWN} -g ${LIBGRP} -m ${DEBUGMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -o ${LIBOWN} -g ${LIBGRP} -m ${DEBUGMODE} \
${_INSTALLFLAGS} \
${SHLIB_NAME}.debug ${DESTDIR}${DEBUGFILEDIR}
.endif
@@ -354,16 +361,16 @@ _libinstall:
sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${_SHLIBDIR}/${SHLIB_NAME},g' \
-e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${_LIBDIR},g' \
${.CURDIR}/${SHLIB_LDSCRIPT} > ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
- ${INSTALL} -T development -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
rm -f ${DESTDIR}${_LIBDIR}/${SHLIB_LINK:R}.ld
.else
.if ${_SHLIBDIR} == ${_LIBDIR}
- ${INSTALL_SYMLINK} -T development ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
+ ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${SHLIB_NAME} ${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.else
- ${INSTALL_SYMLINK} -T development ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \
+ ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},development} ${_SHLIBDIRPREFIX}${_SHLIBDIR}/${SHLIB_NAME} \
${DESTDIR}${_LIBDIR}/${SHLIB_LINK}
.if exists(${DESTDIR}${_LIBDIR}/${SHLIB_NAME})
-chflags noschg ${DESTDIR}${_LIBDIR}/${SHLIB_NAME}
@@ -374,11 +381,11 @@ _libinstall:
.endif # SHLIB_LINK
.endif # SHIB_NAME
.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" && !defined(PRIVATELIB)
- ${INSTALL} -T development -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${_LIBDIR}
.endif
.if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)
- ${INSTALL} -T development -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},development} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR}
.endif
.endif # !defined(INTERNALLIB)
Modified: projects/release-pkg/share/mk/bsd.links.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.links.mk Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/share/mk/bsd.links.mk Fri Feb 13 00:16:05 2015 (r278647)
@@ -4,6 +4,13 @@
.error bsd.links.mk cannot be included directly.
.endif
+.if defined(NO_ROOT)
+.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
+TAGS+= package=${PACKAGE}
+.endif
+TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+.endif
+
afterinstall: _installlinks
.ORDER: realinstall _installlinks
_installlinks:
@@ -15,7 +22,7 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ${INSTALL_LINK} -T runtime $$l $$t; \
+ ${INSTALL_LINK} ${TAG_ARGS} $$l $$t; \
done; true
.endif
.if defined(SYMLINKS) && !empty(SYMLINKS)
@@ -26,6 +33,6 @@ _installlinks:
t=${DESTDIR}$$1; \
shift; \
${ECHO} $$t -\> $$l; \
- ${INSTALL_SYMLINK} -T runtime $$l $$t; \
+ ${INSTALL_SYMLINK} ${TAG_ARGS} $$l $$t; \
done; true
.endif
Modified: projects/release-pkg/share/mk/bsd.man.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.man.mk Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/share/mk/bsd.man.mk Fri Feb 13 00:16:05 2015 (r278647)
@@ -50,7 +50,7 @@
.error bsd.man.mk cannot be included directly.
.endif
-MINSTALL?= ${INSTALL} -T runtime -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+MINSTALL?= ${INSTALL} ${TAG_ARGS} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
CATDIR= ${MANDIR:H:S/$/\/cat/}
CATEXT= .cat
@@ -62,6 +62,7 @@ MCOMPRESS_EXT?= ${COMPRESS_EXT}
SECTIONS= 1 2 3 4 5 6 7 8 9
.SUFFIXES: ${SECTIONS:S/^/./g}
+
# Backwards compatibility.
.if !defined(MAN)
.for __sect in ${SECTIONS}
@@ -213,7 +214,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
+ ${INSTALL_LINK} ${TAG_ARGS} $${l}${ZEXT} $${t}${ZEXT}; \
done
.if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
@@ -228,7 +229,7 @@ _maninstall: ${MAN}
t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
rm -f $${t} $${t}${MCOMPRESS_EXT}; \
- ${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
+ ${INSTALL_LINK} ${TAG_ARGS} $${l}${ZEXT} $${t}${ZEXT}; \
done
.endif
.endif
Modified: projects/release-pkg/share/mk/bsd.prog.mk
==============================================================================
--- projects/release-pkg/share/mk/bsd.prog.mk Fri Feb 13 00:15:13 2015 (r278646)
+++ projects/release-pkg/share/mk/bsd.prog.mk Fri Feb 13 00:16:05 2015 (r278647)
@@ -47,6 +47,13 @@ CTFFLAGS+= -g
STRIP?= -s
.endif
+.if defined(NO_ROOT)
+.if !defined(TAGS) || ! ${TAGS:Mpackage=*}
+TAGS+= package=${PACKAGE:Uruntime}
+.endif
+TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
+.endif
+
.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
LDFLAGS+= -static
.endif
@@ -201,13 +208,13 @@ realinstall: _proginstall
.ORDER: beforeinstall _proginstall
_proginstall:
.if defined(PROG)
- ${INSTALL} -T runtime ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${TAG_ARGS} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
.if ${MK_DEBUG_FILES} != "no"
.if defined(DEBUGMKDIR)
- ${INSTALL} -T debug -d ${DESTDIR}${DEBUGFILEDIR}
+ ${INSTALL} -d ${DESTDIR}${DEBUGFILEDIR}
.endif
- ${INSTALL} -T debug -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \
+ ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \
${PROGNAME}.debug ${DESTDIR}${DEBUGFILEDIR}/${PROGNAME}.debug
.endif
.endif
@@ -234,7 +241,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP}
SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
_scriptsinstall: _SCRIPTSINS_${script:T}
_SCRIPTSINS_${script:T}: ${script}
- ${INSTALL} -T runtime -o ${SCRIPTSOWN_${.ALLSRC:T}} \
+ ${INSTALL} ${TAG_ARGS} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
-g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
${.ALLSRC} \
${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}/${SCRIPTSNAME_${.ALLSRC:T}}
From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 14:28:04 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 622D85D7;
Fri, 13 Feb 2015 14:28:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 4D3FD7DE;
Fri, 13 Feb 2015 14:28:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DES4kg000456;
Fri, 13 Feb 2015 14:28:04 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DES3M7000454;
Fri, 13 Feb 2015 14:28:03 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502131428.t1DES3M7000454@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 13 Feb 2015 14:28:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278674 - in projects/release-install-debug: .
release/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 14:28:04 -0000
Author: gjb
Date: Fri Feb 13 14:28:03 2015
New Revision: 278674
URL: https://svnweb.freebsd.org/changeset/base/278674
Log:
Rename kernel{_*,}_symbols.txz -> kernel{_*,}-dbg.txz.
Default kernel-dbg.txz to 'on' and kernel_*-dbg.txz to
'off' in the MANIFEST.
Add additional string manipulation to properly display
the description.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/Makefile.inc1
projects/release-install-debug/release/scripts/make-manifest.sh
Modified: projects/release-install-debug/Makefile.inc1
==============================================================================
--- projects/release-install-debug/Makefile.inc1 Fri Feb 13 13:55:38 2015 (r278673)
+++ projects/release-install-debug/Makefile.inc1 Fri Feb 13 14:28:03 2015 (r278674)
@@ -1146,7 +1146,7 @@ packagekernel:
--exclude '*.symbols' \
@${DESTDIR}/${DISTDIR}/kernel.meta
cd ${DESTDIR}/${DISTDIR}/kernel; \
- tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \
--include '*/*/*.symbols' \
@${DESTDIR}/${DISTDIR}/kernel.meta
.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
@@ -1155,7 +1155,7 @@ packagekernel:
--exclude '*.symbols' \
@${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
- tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \
--include '*/*/*.symbols' \
@${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta
.endfor
@@ -1165,7 +1165,7 @@ packagekernel:
--exclude '*.symbols' \
.
cd ${DESTDIR}/${DISTDIR}/kernel; \
- tar cvJf ${DESTDIR}/${DISTDIR}/kernel_symbols.txz \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel-dbg.txz \
--include '*/*/*.symbols' \
$$(eval find .)
.for _kernel in ${BUILDKERNELS:S/${INSTALLKERNEL}//}
@@ -1174,7 +1174,7 @@ packagekernel:
--exclude '*.symbols' \
.
cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
- tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}_symbols.txz \
+ tar cvJf ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz \
--include '*/*/*.symbols' \
$$(eval find .)
.endfor
Modified: projects/release-install-debug/release/scripts/make-manifest.sh
==============================================================================
--- projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 13:55:38 2015 (r278673)
+++ projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 14:28:03 2015 (r278674)
@@ -24,8 +24,9 @@ desc_doc="${doc}"
desc_games="${games}"
desc_games_dbg="${games} (Debugging)"
desc_kernel="${kernel} (MANDATORY)"
-desc_kernel_symbols="${kernel} (Debugging symbols)"
+desc_kernel_dbg="${kernel} (Debugging)"
desc_kernel_alt="Alternate ${kernel}"
+desc_kernel_alt_dbg="Alternate ${kernel} (Debugging)"
desc_lib32="${lib32}"
desc_lib32_dbg="${lib32} (Debugging)"
desc_ports="${ports}"
@@ -39,21 +40,32 @@ default_base_dbg=off
default_games_dbg=off
default_lib32_dbg=off
default_kernel_alt=off
-default_kernel_symbols=on
+default_kernel_dbg=on
+default_kernel_alt_dbg=off
for i in ${*}; do
dist="${i}"
distname="${i%%.txz}"
- distname="$(echo ${distname} | sed -E 's/-dbg/_dbg/')"
- distname="$(echo ${distname} | sed -E 's/kernel\..*/kernel_alt/')"
+ distname="$(echo ${distname} | tr '-' '_')"
+ distname="$(echo ${distname} | tr 'kernel.' 'kernel_')"
hash="$(sha256 -q ${i})"
nfiles="$(tar tvf ${i} | wc -l | tr -d ' ')"
default="$(eval echo \${default_${distname}:-on})"
desc="$(eval echo \"\${desc_${distname}}\")"
case ${i} in
- kernel.*.*)
- desc="${desc} \($(echo ${i%%.txz} | cut -f 2 -d '.')\)"
+ kernel-dbg.txz)
+ desc="${desc_kernel_dbg}"
+ ;;
+ kernel.*-dbg.txz)
+ desc="$(eval echo \"${desc_kernel_alt_dbg}\")"
+ desc="${desc}: $(eval echo ${i%%-dbg.txz} | cut -f 2 -d '.')"
+ default="$(eval echo \"${default_kernel_alt_dbg}\")"
+ ;;
+ kernel.*.txz)
+ desc="$(eval echo \"${desc_kernel_alt}\")"
+ desc="${desc}: $(eval echo ${i%%.txz} | cut -f 2 -d '.')"
+ default="$(eval echo \"${default_kernel_alt}\")"
;;
*)
;;
From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 20:53:21 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id A24EFADA;
Fri, 13 Feb 2015 20:53:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 72E409D0;
Fri, 13 Feb 2015 20:53:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DKrLOg088015;
Fri, 13 Feb 2015 20:53:21 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DKrLUJ088013;
Fri, 13 Feb 2015 20:53:21 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502132053.t1DKrLUJ088013@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 13 Feb 2015 20:53:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278707 - in projects/release-install-debug: release
usr.sbin/bsdinstall/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 20:53:21 -0000
Author: gjb
Date: Fri Feb 13 20:53:20 2015
New Revision: 278707
URL: https://svnweb.freebsd.org/changeset/base/278707
Log:
Explicitly exclude (base|lib32)-dbg from the installation
ISOs to ensure kernel{,.*}-dbg.txz are available.
Exclude local *-dbg.txz distribution sets from DEBUG_LIST.
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/release/Makefile
projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
Modified: projects/release-install-debug/release/Makefile
==============================================================================
--- projects/release-install-debug/release/Makefile Fri Feb 13 20:52:23 2015 (r278706)
+++ projects/release-install-debug/release/Makefile Fri Feb 13 20:53:20 2015 (r278707)
@@ -188,7 +188,7 @@ disc1: packagesystem
MK_DEBUG_FILES=no
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
- for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \
+ for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done
# Copy documentation, if generated
@@ -237,7 +237,7 @@ dvd: packagesystem
MK_TESTS=no MK_DEBUG_FILES=no
# Copy distfiles
mkdir -p ${.TARGET}/usr/freebsd-dist
- for dist in MANIFEST $$(ls *.txz | grep -v -- '-dbg'); \
+ for dist in MANIFEST $$(ls *.txz | grep -v -- '(base|lib32)-dbg'); \
do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
done
# Copy documentation, if generated
Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 20:52:23 2015 (r278706)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 20:53:20 2015 (r278707)
@@ -67,6 +67,7 @@ bsdinstall hostname || error "Set hostna
export DISTRIBUTIONS="base.txz kernel.txz"
if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then
DISTMENU=`awk -F'\t' '!/^(kernel\.txz|base\.txz)/{print $4,$5,$6}' $BSDINSTALL_DISTDIR/MANIFEST`
+ DISTMENU="$(echo ${DISTMENU} | tr '_' '-')"
exec 3>&1
EXTRA_DISTS=$( eval dialog \
@@ -183,6 +184,8 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
for _DISTRIBUTION in $DISTRIBUTIONS; do
case $_DISTRIBUTION in
*-dbg.*)
+ [ -e $BSDINSTALL_DISTDIR/$_DISTRIBUTION ] \
+ && continue
WANT_DEBUG=true
DEBUG_LIST="\n$DEBUG_LIST\n$_DISTRIBUTION"
;;
From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 20:58:23 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 1006ED04;
Fri, 13 Feb 2015 20:58:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 EBA5BA05;
Fri, 13 Feb 2015 20:58:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DKwMNK088775;
Fri, 13 Feb 2015 20:58:22 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DKwB7q088701;
Fri, 13 Feb 2015 20:58:11 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502132058.t1DKwB7q088701@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 13 Feb 2015 20:58:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278708 - in projects/release-install-debug: .
bin/pkill/tests contrib/binutils/ld/scripttempl contrib/elftoolchain/libdwarf
contrib/netbsd-tests/games etc etc/mtree etc/rc.d etc/root g...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 20:58:23 -0000
Author: gjb
Date: Fri Feb 13 20:58:10 2015
New Revision: 278708
URL: https://svnweb.freebsd.org/changeset/base/278708
Log:
MFH: r278585-r278707
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/Makefile.inc1
projects/release-install-debug/ObsoleteFiles.inc
projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh
projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc
projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h
projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c
projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c
projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh
projects/release-install-debug/etc/login.conf
projects/release-install-debug/etc/master.passwd
projects/release-install-debug/etc/mtree/BSD.debug.dist
projects/release-install-debug/etc/mtree/BSD.usr.dist
projects/release-install-debug/etc/rc.d/LOGIN
projects/release-install-debug/etc/rc.d/NETWORKING
projects/release-install-debug/etc/rc.d/local_unbound
projects/release-install-debug/etc/rc.d/utx
projects/release-install-debug/etc/root/dot.cshrc
projects/release-install-debug/etc/root/dot.login
projects/release-install-debug/etc/root/dot.profile
projects/release-install-debug/games/Makefile.inc
projects/release-install-debug/games/caesar/rot13.sh
projects/release-install-debug/games/fortune/datfiles/Makefile
projects/release-install-debug/include/stdio.h
projects/release-install-debug/lib/libproc/proc_sym.c
projects/release-install-debug/lib/libthr/libthr.3
projects/release-install-debug/release/scripts/make-manifest.sh
projects/release-install-debug/sbin/sysctl/sysctl.8
projects/release-install-debug/sbin/sysctl/sysctl.c
projects/release-install-debug/share/man/man4/led.4
projects/release-install-debug/share/man/man6/intro.6
projects/release-install-debug/share/man/man7/hier.7
projects/release-install-debug/share/mk/bsd.lib.mk
projects/release-install-debug/share/mk/bsd.prog.mk
projects/release-install-debug/share/skel/dot.cshrc
projects/release-install-debug/share/skel/dot.login
projects/release-install-debug/share/skel/dot.profile
projects/release-install-debug/sys/amd64/amd64/db_disasm.c
projects/release-install-debug/sys/cam/ctl/ctl.c
projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c
projects/release-install-debug/sys/cam/ctl/ctl_backend_ramdisk.c
projects/release-install-debug/sys/cam/ctl/ctl_tpc.c
projects/release-install-debug/sys/cam/ctl/ctl_tpc.h
projects/release-install-debug/sys/cam/ctl/ctl_tpc_local.c
projects/release-install-debug/sys/cddl/dev/fbt/arm/fbt_isa.c
projects/release-install-debug/sys/contrib/vchiq/interface/compat/vchi_bsd.h
projects/release-install-debug/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
projects/release-install-debug/sys/dev/dwc/if_dwc.c
projects/release-install-debug/sys/dev/oce/oce_mbox.c
projects/release-install-debug/sys/dev/smc/if_smc.c
projects/release-install-debug/sys/dev/vt/font/vt_mouse_cursor.c
projects/release-install-debug/sys/i386/i386/db_disasm.c
projects/release-install-debug/sys/kern/kern_sig.c
projects/release-install-debug/sys/kern/kern_timeout.c
projects/release-install-debug/sys/kern/sysv_shm.c
projects/release-install-debug/sys/netgraph/ng_base.c
projects/release-install-debug/sys/ofed/include/linux/gfp.h
projects/release-install-debug/sys/ofed/include/linux/kernel.h
projects/release-install-debug/sys/ofed/include/linux/kref.h
projects/release-install-debug/sys/ofed/include/linux/pci.h
projects/release-install-debug/sys/sys/disk.h
projects/release-install-debug/sys/x86/iommu/intel_drv.c
projects/release-install-debug/sys/x86/iommu/intel_reg.h
projects/release-install-debug/sys/x86/iommu/intel_utils.c
projects/release-install-debug/tools/build/mk/OptionalObsoleteFiles.inc
projects/release-install-debug/tools/tools/nanobsd/gateworks/Files/root/.profile
projects/release-install-debug/tools/tools/nanobsd/pcengines/Files/root/.cshrc
projects/release-install-debug/tools/tools/nanobsd/pcengines/Files/root/.login
projects/release-install-debug/tools/tools/nanobsd/rescue/Files/root/.cshrc
projects/release-install-debug/tools/tools/netmap/pkt-gen.c
projects/release-install-debug/usr.bin/svn/svn/Makefile
projects/release-install-debug/usr.bin/wc/wc.c
projects/release-install-debug/usr.bin/whereis/pathnames.h
projects/release-install-debug/usr.bin/whereis/whereis.1
projects/release-install-debug/usr.bin/whereis/whereis.c
projects/release-install-debug/usr.sbin/bsdconfig/include/messages.subr
projects/release-install-debug/usr.sbin/ctladm/ctladm.8
projects/release-install-debug/usr.sbin/ctld/ctl.conf.5
projects/release-install-debug/usr.sbin/ctld/ctld.c
projects/release-install-debug/usr.sbin/ctld/ctld.h
projects/release-install-debug/usr.sbin/ctld/keys.c
projects/release-install-debug/usr.sbin/flowctl/flowctl.c
projects/release-install-debug/usr.sbin/gssd/Makefile
projects/release-install-debug/usr.sbin/gssd/gssd.c
projects/release-install-debug/usr.sbin/iscsid/iscsid.h
projects/release-install-debug/usr.sbin/iscsid/keys.c
projects/release-install-debug/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
Directory Properties:
projects/release-install-debug/ (props changed)
projects/release-install-debug/contrib/binutils/ (props changed)
projects/release-install-debug/contrib/elftoolchain/ (props changed)
projects/release-install-debug/etc/ (props changed)
projects/release-install-debug/include/ (props changed)
projects/release-install-debug/sbin/ (props changed)
projects/release-install-debug/share/ (props changed)
projects/release-install-debug/share/man/man4/ (props changed)
projects/release-install-debug/sys/ (props changed)
Modified: projects/release-install-debug/Makefile.inc1
==============================================================================
--- projects/release-install-debug/Makefile.inc1 Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/Makefile.inc1 Fri Feb 13 20:58:10 2015 (r278708)
@@ -189,9 +189,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX}
OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
-# /usr/games added for fortune which depend on strfile
-BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
-XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
+XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
@@ -807,9 +806,6 @@ ITOOLS+=makewhatis
# Non-base distributions produced by the base system
EXTRA_DISTRIBUTIONS= doc
-.if ${MK_GAMES} != "no"
-EXTRA_DISTRIBUTIONS+= games
-.endif
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
EXTRA_DISTRIBUTIONS+= lib32
.endif
Modified: projects/release-install-debug/ObsoleteFiles.inc
==============================================================================
--- projects/release-install-debug/ObsoleteFiles.inc Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/ObsoleteFiles.inc Fri Feb 13 20:58:10 2015 (r278708)
@@ -38,6 +38,22 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150212: /usr/games moving into /usr/bin
+OLD_FILES+=usr/games/bcd
+OLD_FILES+=usr/games/caesar
+OLD_FILES+=usr/games/factor
+OLD_FILES+=usr/games/fortune
+OLD_FILES+=usr/games/grdc
+OLD_FILES+=usr/games/morse
+OLD_FILES+=usr/games/number
+OLD_FILES+=usr/games/pom
+OLD_FILES+=usr/games/ppt
+OLD_FILES+=usr/games/primes
+OLD_FILES+=usr/games/random
+OLD_FILES+=usr/games/rot13
+OLD_FILES+=usr/games/strfile
+OLD_FILES+=usr/games/unstr
+OLD_DIRS+=usr/games
# 20150209: liblzma header
OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
Modified: projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Fri Feb 13 20:58:10 2015 (r278708)
@@ -19,79 +19,73 @@ jail_name_to_jid()
base=pgrep_j_test
+if [ `id -u` -ne 0 ]; then
+ echo "1..0 # skip Test needs uid 0."
+ exit 0
+fi
+
echo "1..3"
+sleep=$(pwd)/sleep.txt
+ln -sf /bin/sleep $sleep
+
name="pgrep -j <jid>"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
-
- jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
-
- jid1=$(jail_name_to_jid ${base}_1_1)
- jid2=$(jail_name_to_jid ${base}_1_2)
- jid="${jid1},${jid2}"
- pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)"
- pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
- $(cat ${PWD}/${base}_1_2.pid) | sort)
- if [ "$pid1" = "$pid2" ]; then
- echo "ok 1 - $name"
- else
- echo "not ok 1 - $name"
- fi
- [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
- [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
- rm -f $sleep
+sleep_amount=5
+jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
+
+jid1=$(jail_name_to_jid ${base}_1_1)
+jid2=$(jail_name_to_jid ${base}_1_2)
+jid="${jid1},${jid2}"
+pid1="$(pgrep -f -x -j $jid "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
+ $(cat ${PWD}/${base}_1_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+ echo "ok 1 - $name"
else
- echo "ok 1 - $name # skip Test needs uid 0."
+ echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+wait
name="pgrep -j any"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
-
- jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
-
- sleep 2
- pid1="$(pgrep -f -x -j any "$sleep 5" | sort)"
- pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
- $(cat ${PWD}/${base}_2_2.pid) | sort)
- if [ "$pid1" = "$pid2" ]; then
- echo "ok 2 - $name"
- else
- echo "not ok 2 - $name"
- fi
- [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
- [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
- rm -f $sleep
+sleep_amount=6
+jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount &
+
+sleep 2
+pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
+ $(cat ${PWD}/${base}_2_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+ echo "ok 2 - $name"
else
- echo "ok 2 - $name # skip Test needs uid 0."
+ echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+wait
name="pgrep -j none"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- daemon -p ${PWD}/${base}_3_1.pid $sleep 5 &
- jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
- sleep 2
- pid="$(pgrep -f -x -j none "$sleep 5")"
- if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
- echo "ok 3 - $name"
- else
- echo "not ok 3 - $name"
- fi
- rm -f $sleep
- [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
- [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid)
+sleep_amount=7
+daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount &
+jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
+sleep 2
+pid="$(pgrep -f -x -j none "$sleep $sleep_amount")"
+if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
+ echo "ok 3 - $name"
else
- echo "ok 3 - $name # skip Test needs uid 0."
+ echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
+[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid)
+
+rm -f $sleep
Modified: projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc
==============================================================================
--- projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc Fri Feb 13 20:58:10 2015 (r278708)
@@ -402,8 +402,8 @@ cat <<EOF
.fini_array ${RELOCATING-0} :
{
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
- KEEP (*(.fini_array))
KEEP (*(SORT(.fini_array.*)))
+ KEEP (*(.fini_array))
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
}
${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}
Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h
==============================================================================
--- projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h Fri Feb 13 20:58:10 2015 (r278708)
@@ -49,7 +49,7 @@
struct _libdwarf_globals {
Dwarf_Handler errhand;
Dwarf_Ptr errarg;
- int applyrela;
+ int applyreloc;
};
extern struct _libdwarf_globals _libdwarf;
Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c
==============================================================================
--- projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply)
{
int oldapply;
- oldapply = _libdwarf.applyrela;
- _libdwarf.applyrela = apply;
+ oldapply = _libdwarf.applyreloc;
+ _libdwarf.applyreloc = apply;
return (oldapply);
}
Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
==============================================================================
--- projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Fri Feb 13 20:58:10 2015 (r278708)
@@ -24,7 +24,7 @@
.\"
.\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $
.\"
-.Dd June 26, 2011
+.Dd February 11, 2015
.Os
.Dt DWARF_SET_RELOC_APPLICATION 3
.Sh NAME
@@ -47,6 +47,8 @@ handled by the DWARF(3) library.
If the argument
.Ar apply
holds a non-zero value, the library will process all the relevant
+.Dq ".rel"
+and
.Dq ".rela"
relocation sections and will apply the relocation records found to
their corresponding DWARF sections.
Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c
==============================================================================
--- projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -31,5 +31,5 @@ ELFTC_VCSID("$Id: libdwarf.c 2070 2011-1
struct _libdwarf_globals _libdwarf = {
.errhand = NULL,
.errarg = NULL,
- .applyrela = 1
+ .applyreloc = 1
};
Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -50,32 +50,46 @@ static const char *debug_name[] = {
};
static void
-_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
- Elf_Data *symtab_data, int endian)
+_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian,
+ void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend)
{
- Dwarf_Unsigned type;
- GElf_Rela rela;
GElf_Sym sym;
- size_t symndx;
- uint64_t offset;
- int size, j;
+ int size;
- j = 0;
- while (gelf_getrela(rel_data, j++, &rela) != NULL) {
- symndx = GELF_R_SYM(rela.r_info);
- type = GELF_R_TYPE(rela.r_info);
+ if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), &sym) == NULL)
+ return;
+ if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0)
+ return; /* Unknown or non-absolute relocation. */
+ if (endian == ELFDATA2MSB)
+ _dwarf_write_msb(buf, &offset, sym.st_value + r_addend, size);
+ else
+ _dwarf_write_lsb(buf, &offset, sym.st_value + r_addend, size);
+}
- if (gelf_getsym(symtab_data, symndx, &sym) == NULL)
- continue;
+static void
+_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rel rel;
+ int j;
- offset = rela.r_offset;
- size = _dwarf_get_reloc_size(dbg, type);
+ j = 0;
+ while (gelf_getrel(rel_data, j++, &rel) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rel.r_offset, rel.r_info, 0);
+}
- if (endian == ELFDATA2MSB)
- _dwarf_write_msb(buf, &offset, rela.r_addend, size);
- else
- _dwarf_write_lsb(buf, &offset, rela.r_addend, size);
- }
+static void
+_dwarf_elf_apply_rela_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rela rela;
+ int j;
+
+ j = 0;
+ while (gelf_getrela(rel_data, j++, &rela) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rela.r_offset, rela.r_info, rela.r_addend);
}
static int
@@ -104,7 +118,8 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
return (DW_DLE_ELF);
}
- if (sh.sh_type != SHT_RELA || sh.sh_size == 0)
+ if ((sh.sh_type != SHT_REL && sh.sh_type != SHT_RELA) ||
+ sh.sh_size == 0)
continue;
if (sh.sh_info == shndx && sh.sh_link == symtab) {
@@ -125,8 +140,12 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
}
memcpy(ed->ed_alloc, ed->ed_data->d_buf,
ed->ed_data->d_size);
- _dwarf_elf_apply_reloc(dbg, ed->ed_alloc, rel,
- symtab_data, eh.e_ident[EI_DATA]);
+ if (sh.sh_type == SHT_REL)
+ _dwarf_elf_apply_rel_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
+ else
+ _dwarf_elf_apply_rela_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
return (DW_DLE_NONE);
}
@@ -282,7 +301,7 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *el
}
}
- if (_libdwarf.applyrela) {
+ if (_libdwarf.applyreloc) {
if (_dwarf_elf_relocate(dbg, elf,
&e->eo_data[j], elf_ndxscn(scn), symtab_ndx,
symtab_data, error) != DW_DLE_NONE)
Modified: projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh
==============================================================================
--- projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh Fri Feb 13 20:58:10 2015 (r278708)
@@ -27,13 +27,13 @@
expect() {
echo "${2}" >expout
- atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+ atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1}
}
atf_test_case overflow
overflow_head() {
atf_set "descr" "Tests for overflow conditions"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
overflow_body() {
expect '8675309' '8675309: 8675309'
@@ -44,7 +44,7 @@ atf_test_case loop
loop_head() {
atf_set "descr" "Tests some cases that once locked the program" \
"in an infinite loop"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
loop_body() {
expect '99999999999991' '99999999999991: 7 13 769231 1428571'
Modified: projects/release-install-debug/etc/login.conf
==============================================================================
--- projects/release-install-debug/etc/login.conf Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/login.conf Fri Feb 13 20:58:10 2015 (r278708)
@@ -27,7 +27,7 @@ default:\
:copyright=/etc/COPYRIGHT:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
- :path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\
+ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
:nologin=/var/run/nologin:\
:cputime=unlimited:\
:datasize=unlimited:\
Modified: projects/release-install-debug/etc/master.passwd
==============================================================================
--- projects/release-install-debug/etc/master.passwd Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/master.passwd Fri Feb 13 20:58:10 2015 (r278708)
@@ -7,7 +7,7 @@ operator:*:2:5::0:0:System &:/:/usr/sbin
bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
-games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin
+games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin
news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
Modified: projects/release-install-debug/etc/mtree/BSD.debug.dist
==============================================================================
--- projects/release-install-debug/etc/mtree/BSD.debug.dist Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/mtree/BSD.debug.dist Fri Feb 13 20:58:10 2015 (r278708)
@@ -21,8 +21,6 @@
usr
bin
..
- games
- ..
lib
clang
3.5.1
Modified: projects/release-install-debug/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/release-install-debug/etc/mtree/BSD.usr.dist Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/mtree/BSD.usr.dist Fri Feb 13 20:58:10 2015 (r278708)
@@ -7,8 +7,6 @@
.
bin
..
- games
- ..
include
..
lib
Modified: projects/release-install-debug/etc/rc.d/LOGIN
==============================================================================
--- projects/release-install-debug/etc/rc.d/LOGIN Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/rc.d/LOGIN Fri Feb 13 20:58:10 2015 (r278708)
@@ -4,7 +4,7 @@
#
# PROVIDE: LOGIN
-# REQUIRE: DAEMON utx
+# REQUIRE: DAEMON
# This is a dummy dependency to ensure user services such as xdm,
# inetd, cron and kerberos are started after everything else, in case
Modified: projects/release-install-debug/etc/rc.d/NETWORKING
==============================================================================
--- projects/release-install-debug/etc/rc.d/NETWORKING Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/rc.d/NETWORKING Fri Feb 13 20:58:10 2015 (r278708)
@@ -6,7 +6,7 @@
# PROVIDE: NETWORKING NETWORK
# REQUIRE: netif netoptions routing ppp ipfw stf
# REQUIRE: defaultroute routed route6d mroute6d resolv bridge
-# REQUIRE: static_arp static_ndp local_unbound
+# REQUIRE: static_arp static_ndp
# This is a dummy dependency, for services which require networking
# to be operational before starting.
Modified: projects/release-install-debug/etc/rc.d/local_unbound
==============================================================================
--- projects/release-install-debug/etc/rc.d/local_unbound Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/rc.d/local_unbound Fri Feb 13 20:58:10 2015 (r278708)
@@ -5,6 +5,7 @@
# PROVIDE: local_unbound
# REQUIRE: FILESYSTEMS netif resolv
+# BEFORE: NETWORKING
# KEYWORD: shutdown
. /etc/rc.subr
Modified: projects/release-install-debug/etc/rc.d/utx
==============================================================================
--- projects/release-install-debug/etc/rc.d/utx Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/rc.d/utx Fri Feb 13 20:58:10 2015 (r278708)
@@ -5,6 +5,7 @@
# PROVIDE: utx
# REQUIRE: DAEMON FILESYSTEMS
+# BEFORE: LOGIN
# KEYWORD: shutdown
. /etc/rc.subr
Modified: projects/release-install-debug/etc/root/dot.cshrc
==============================================================================
--- projects/release-install-debug/etc/root/dot.cshrc Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/root/dot.cshrc Fri Feb 13 20:58:10 2015 (r278708)
@@ -15,7 +15,7 @@ alias ll ls -lAF
# A righteous umask
umask 22
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
setenv EDITOR vi
setenv PAGER more
Modified: projects/release-install-debug/etc/root/dot.login
==============================================================================
--- projects/release-install-debug/etc/root/dot.login Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/root/dot.login Fri Feb 13 20:58:10 2015 (r278708)
@@ -6,4 +6,4 @@
#
# Uncomment to display a random cookie each login:
-# if ( -x /usr/games/fortune ) /usr/games/fortune -s
+# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s
Modified: projects/release-install-debug/etc/root/dot.profile
==============================================================================
--- projects/release-install-debug/etc/root/dot.profile Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/etc/root/dot.profile Fri Feb 13 20:58:10 2015 (r278708)
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
export PATH
HOME=/root
export HOME
Modified: projects/release-install-debug/games/Makefile.inc
==============================================================================
--- projects/release-install-debug/games/Makefile.inc Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/games/Makefile.inc Fri Feb 13 20:58:10 2015 (r278708)
@@ -1,7 +1,6 @@
# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-BINDIR?= /usr/games
+BINDIR?= /usr/bin
FILESDIR?= ${SHAREDIR}/games
WARNS?= 6
-DISTRIBUTION?= games
Modified: projects/release-install-debug/games/caesar/rot13.sh
==============================================================================
--- projects/release-install-debug/games/caesar/rot13.sh Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/games/caesar/rot13.sh Fri Feb 13 20:58:10 2015 (r278708)
@@ -30,4 +30,4 @@
# @(#)rot13.sh 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-exec /usr/games/caesar 13 "$@"
+exec /usr/bin/caesar 13 "$@"
Modified: projects/release-install-debug/games/fortune/datfiles/Makefile
==============================================================================
--- projects/release-install-debug/games/fortune/datfiles/Makefile Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/games/fortune/datfiles/Makefile Fri Feb 13 20:58:10 2015 (r278708)
@@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/games/fortune
.for f in ${DB}
$f.dat: $f
- PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
+ PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \
strfile -Cs ${.ALLSRC} ${.TARGET}
.endfor
Modified: projects/release-install-debug/include/stdio.h
==============================================================================
--- projects/release-install-debug/include/stdio.h Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/include/stdio.h Fri Feb 13 20:58:10 2015 (r278708)
@@ -166,7 +166,7 @@ __END_DECLS
#define __SRW 0x0010 /* open for reading & writing */
#define __SEOF 0x0020 /* found EOF */
#define __SERR 0x0040 /* found error */
-#define __SMBF 0x0080 /* _buf is from malloc */
+#define __SMBF 0x0080 /* _bf._base is from malloc */
#define __SAPP 0x0100 /* fdopen()ed in append mode */
#define __SSTR 0x0200 /* this is an sprintf/snprintf string */
#define __SOPT 0x0400 /* do fseek() optimization */
Modified: projects/release-install-debug/lib/libproc/proc_sym.c
==============================================================================
--- projects/release-install-debug/lib/libproc/proc_sym.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/lib/libproc/proc_sym.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -82,6 +82,21 @@ fail:
strlcpy(buf, symbol, len);
}
+static int
+find_dbg_obj(const char *path)
+{
+ int fd;
+ char dbg_path[PATH_MAX];
+
+ snprintf(dbg_path, sizeof(dbg_path),
+ "/usr/lib/debug/%s.debug", path);
+ fd = open(dbg_path, O_RDONLY);
+ if (fd > 0)
+ return (fd);
+ else
+ return (open(path, O_RDONLY));
+}
+
static void
proc_rdl2prmap(rd_loadobj_t *rdl, prmap_t *map)
{
@@ -295,7 +310,7 @@ proc_addr2sym(struct proc_handle *p, uin
if ((map = proc_addr2map(p, addr)) == NULL)
return (-1);
- if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) {
+ if ((fd = find_dbg_obj(map->pr_mapname)) < 0) {
DPRINTF("ERROR: open %s failed", map->pr_mapname);
goto err0;
}
@@ -443,7 +458,7 @@ proc_name2sym(struct proc_handle *p, con
DPRINTFX("ERROR: couldn't find object %s", object);
goto err0;
}
- if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) {
+ if ((fd = find_dbg_obj(map->pr_mapname)) < 0) {
DPRINTF("ERROR: open %s failed", map->pr_mapname);
goto err0;
}
@@ -539,7 +554,7 @@ proc_iter_symbyaddr(struct proc_handle *
if ((map = proc_name2map(p, object)) == NULL)
return (-1);
- if ((fd = open(map->pr_mapname, O_RDONLY)) < 0) {
+ if ((fd = find_dbg_obj(map->pr_mapname)) < 0) {
DPRINTF("ERROR: open %s failed", map->pr_mapname);
goto err0;
}
Modified: projects/release-install-debug/lib/libthr/libthr.3
==============================================================================
--- projects/release-install-debug/lib/libthr/libthr.3 Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/lib/libthr/libthr.3 Fri Feb 13 20:58:10 2015 (r278708)
@@ -1,5 +1,5 @@
.\" Copyright (c) 2005 Robert N. M. Watson
-.\" Copyright (c) 2014 The FreeBSD Foundation, Inc.
+.\" Copyright (c) 2014,2015 The FreeBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" Part of this documentation was written by
@@ -29,7 +29,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 26, 2014
+.Dd February 12, 2015
.Dt LIBTHR 3
.Os
.Sh NAME
@@ -200,45 +200,25 @@ Bigger values reduce the frequency of th
The value must be between 0 and 255.
.El
.Sh INTERACTION WITH RUN-TIME LINKER
-The
+On load,
.Nm
-library must appear before
-.Li libc
-in the global order of depended objects.
-.Pp
-Loading
-.Nm
-with the
-.Xr dlopen 3
-call in the process after the program binary is activated
-is not supported, and causes miscellaneous and hard-to-diagnose misbehaviour.
-This is due to
-.Nm
-interposing several important
-.Li libc
-symbols to provide thread-safe services.
-In particular,
-.Dv errno
-and the locking stubs from
-.Li libc
-are affected.
-This requirement is currently not enforced.
-.Pp
-If the program loads any modules at run-time, and those modules may require
-threading services, the main program binary must be linked with
-.Li libpthread ,
-even if it does not require any services from the library.
+installs interposing handlers into the hooks exported by
+.Li libc .
+The interposers provide real locking implementation instead of the
+stubs for single-threaded processes in
+.Li ,
+cancellation support and some modifications to the signal operations.
.Pp
.Nm
cannot be unloaded; the
.Xr dlclose 3
function does not perform any action when called with a handle for
.Nm .
-One of the reasons is that the interposing of
+One of the reasons is that the internal interposing of
.Li libc
functions cannot be undone.
.Sh SIGNALS
-The implementation also interposes the user-installed
+The implementation interposes the user-installed
.Xr signal 3
handlers.
This interposing is done to postpone signal delivery to threads which
Modified: projects/release-install-debug/release/scripts/make-manifest.sh
==============================================================================
--- projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 20:58:10 2015 (r278708)
@@ -11,7 +11,6 @@
base="Base system"
doc="Additional Documentation"
-games="Games (fortune, etc.)"
kernel="Kernel"
ports="Ports tree"
src="System source tree"
@@ -21,8 +20,6 @@ tests="Test suite"
desc_base="${base} (MANDATORY)"
desc_base_dbg="${base} (Debugging)"
desc_doc="${doc}"
-desc_games="${games}"
-desc_games_dbg="${games} (Debugging)"
desc_kernel="${kernel} (MANDATORY)"
desc_kernel_dbg="${kernel} (Debugging)"
desc_kernel_alt="Alternate ${kernel}"
@@ -37,7 +34,6 @@ default_doc=off
default_src=off
default_tests=off
default_base_dbg=off
-default_games_dbg=off
default_lib32_dbg=off
default_kernel_alt=off
default_kernel_dbg=on
Modified: projects/release-install-debug/sbin/sysctl/sysctl.8
==============================================================================
--- projects/release-install-debug/sbin/sysctl/sysctl.8 Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/sbin/sysctl/sysctl.8 Fri Feb 13 20:58:10 2015 (r278708)
@@ -28,7 +28,7 @@
.\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd December 13, 2012
+.Dd February 12, 2015
.Dt SYSCTL 8
.Os
.Sh NAME
@@ -37,11 +37,13 @@
.Sh SYNOPSIS
.Nm
.Op Fl bdehiNnoRTqx
+.Op Fl B Ar bufsize
.Op Fl f Ar filename
.Ar name Ns Op = Ns Ar value
.Ar ...
.Nm
.Op Fl bdehNnoRTqx
+.Op Fl B Ar bufsize
.Fl a
.Sh DESCRIPTION
The
@@ -68,6 +70,15 @@ the command line.
Force the value of the variable(s) to be output in raw, binary format.
No names are printed and no terminating newlines are output.
This is mostly useful with a single variable.
+.It Fl B Ar bufsize
+Set the buffer size to read from the
+.Nm
+to
+.Ar bufsize .
+This is necessary for a
+.Nm
+that has variable length, and the probe value of 0 is a valid length, such as
+.Va kern.arandom .
.It Fl d
Print the description of the variable instead of its value.
.It Fl e
@@ -128,7 +139,7 @@ Suppress some warnings generated by
.Nm
to standard error.
.It Fl T
-Display only variables that are setable via loader (CTLFLAG_TUN).
+Display only variables that are settable via loader (CTLFLAG_TUN).
.It Fl W
Display only writable variables that are not statistical.
Useful for determining the set of runtime tunable sysctls.
Modified: projects/release-install-debug/sbin/sysctl/sysctl.c
==============================================================================
--- projects/release-install-debug/sbin/sysctl/sysctl.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/sbin/sysctl/sysctl.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -71,7 +71,7 @@ static const char rcsid[] =
static const char *conffile;
-static int aflag, bflag, dflag, eflag, hflag, iflag;
+static int aflag, bflag, Bflag, dflag, eflag, hflag, iflag;
static int Nflag, nflag, oflag, qflag, Tflag, Wflag, xflag;
static int oidfmt(int *, int, char *, u_int *);
@@ -112,8 +112,8 @@ usage(void)
{
(void)fprintf(stderr, "%s\n%s\n",
- "usage: sysctl [-bdehiNnoqTWx] [-f filename] name[=value] ...",
- " sysctl [-bdehNnoqTWx] -a");
+ "usage: sysctl [-bdehiNnoqTWx] [ -B <bufsize> ] [-f filename] name[=value] ...",
+ " sysctl [-bdehNnoqTWx] [ -B <bufsize> ] -a");
exit(1);
}
@@ -127,7 +127,7 @@ main(int argc, char **argv)
setbuf(stdout,0);
setbuf(stderr,0);
- while ((ch = getopt(argc, argv, "Aabdef:hiNnoqTwWxX")) != -1) {
+ while ((ch = getopt(argc, argv, "AabB:def:hiNnoqTwWxX")) != -1) {
switch (ch) {
case 'A':
/* compatibility */
@@ -139,6 +139,9 @@ main(int argc, char **argv)
case 'b':
bflag = 1;
break;
+ case 'B':
+ Bflag = strtol(optarg, NULL, 0);
+ break;
case 'd':
dflag = 1;
break;
@@ -222,7 +225,7 @@ parse(const char *string, int lineno)
unsigned int uintval;
long longval;
unsigned long ulongval;
- size_t newsize = 0;
+ size_t newsize = Bflag;
int64_t i64val;
uint64_t u64val;
int mib[CTL_MAXNAME];
@@ -815,9 +818,13 @@ show_var(int *oid, int nlen)
return (0);
}
/* find an estimate of how much we need for this var */
- j = 0;
- i = sysctl(oid, nlen, 0, &j, 0, 0);
- j += j; /* we want to be sure :-) */
+ if (Bflag)
+ j = Bflag;
+ else {
+ j = 0;
+ i = sysctl(oid, nlen, 0, &j, 0, 0);
+ j += j; /* we want to be sure :-) */
+ }
val = oval = malloc(j + 1);
if (val == NULL) {
Modified: projects/release-install-debug/share/man/man4/led.4
==============================================================================
--- projects/release-install-debug/share/man/man4/led.4 Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/man/man4/led.4 Fri Feb 13 20:58:10 2015 (r278708)
@@ -170,7 +170,7 @@ flashes
.Pp
.Dl *_*__**_
.Bd -literal
-/usr/games/morse -l "Soekris rocks" > /dev/led/error
+/usr/bin/morse -l "Soekris rocks" > /dev/led/error
.Ed
.Sh SEE ALSO
.Xr morse 6
Modified: projects/release-install-debug/share/man/man6/intro.6
==============================================================================
--- projects/release-install-debug/share/man/man6/intro.6 Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/man/man6/intro.6 Fri Feb 13 20:58:10 2015 (r278708)
@@ -37,7 +37,7 @@
This section contains information about games.
The games
are located in
-.Pa /usr/games
+.Pa /usr/bin
if installed.
You can get a short overview about all the games with the
command:
@@ -45,13 +45,18 @@ command:
$ apropos '\\(6\\)'
.Ed
.Sh FILES
-.Bl -tag -width /usr/games -compact
-.It Pa /usr/games
+.Bl -tag -width /usr/bin -compact
+.It Pa /usr/bin
location of games
.El
.Sh SEE ALSO
.Xr intro 1
.Sh HISTORY
+In earlier versions of
+.Fx ,
+games were located in
+.Pa /usr/games .
+.Pp
The
.Nm
section manual page appeared in
Modified: projects/release-install-debug/share/man/man7/hier.7
==============================================================================
--- projects/release-install-debug/share/man/man7/hier.7 Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/man/man7/hier.7 Fri Feb 13 20:58:10 2015 (r278708)
@@ -187,8 +187,6 @@ common utilities, programming tools, and
.It Pa compat/
files needed to support binary compatibility with other operating systems,
such as Linux
-.It Pa games/
-useful and semi-frivolous programs
.It Pa include/
standard C include files
.Pp
Modified: projects/release-install-debug/share/mk/bsd.lib.mk
==============================================================================
--- projects/release-install-debug/share/mk/bsd.lib.mk Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/mk/bsd.lib.mk Fri Feb 13 20:58:10 2015 (r278708)
@@ -286,7 +286,7 @@ _EXTRADEPEND:
mv $$TMP ${DEPENDFILE}
.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME)
.if defined(DPADD) && !empty(DPADD)
- echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE}
+ echo ${SHLIB_NAME_FULL}: ${DPADD} >> ${DEPENDFILE}
.endif
.endif
Modified: projects/release-install-debug/share/mk/bsd.prog.mk
==============================================================================
--- projects/release-install-debug/share/mk/bsd.prog.mk Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/mk/bsd.prog.mk Fri Feb 13 20:58:10 2015 (r278708)
@@ -62,7 +62,7 @@ PROG_FULL=${PROG}.full
${BINDIR} == "/bin" ||\
${BINDIR} == "/libexec" ||\
${BINDIR} == "/sbin" ||\
- ${BINDIR:C%/usr/(bin|bsdinstall|games|libexec|lpr|sendmail|sm.bin|sbin)(/.*)?%/usr/bin%} == "/usr/bin"\
+ ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin)(/.*)?%/usr/bin%} == "/usr/bin"\
)
DEBUGFILEDIR= ${DEBUGDIR}${BINDIR}
.else
@@ -168,15 +168,15 @@ CLEANFILES+= ${OBJS}
_EXTRADEPEND:
.if defined(LDFLAGS) && !empty(LDFLAGS:M-nostdlib)
.if defined(DPADD) && !empty(DPADD)
- echo ${PROG}: ${DPADD} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${DPADD} >> ${DEPENDFILE}
.endif
.else
- echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
.if defined(PROG_CXX)
.if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++)
- echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
.else
- echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
.endif
.endif
.endif
Modified: projects/release-install-debug/share/skel/dot.cshrc
==============================================================================
--- projects/release-install-debug/share/skel/dot.cshrc Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/skel/dot.cshrc Fri Feb 13 20:58:10 2015 (r278708)
@@ -14,7 +14,7 @@ alias ll ls -lAF
# These are normally set through /etc/login.conf. You may override them here
# if wanted.
-# set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
+# set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
# setenv BLOCKSIZE K
# A righteous umask
# umask 22
Modified: projects/release-install-debug/share/skel/dot.login
==============================================================================
--- projects/release-install-debug/share/skel/dot.login Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/skel/dot.login Fri Feb 13 20:58:10 2015 (r278708)
@@ -5,4 +5,4 @@
# see also csh(1), environ(7).
#
-if ( -x /usr/games/fortune ) /usr/games/fortune freebsd-tips
+if ( -x /usr/bin/fortune ) /usr/bin/fortune freebsd-tips
Modified: projects/release-install-debug/share/skel/dot.profile
==============================================================================
--- projects/release-install-debug/share/skel/dot.profile Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/share/skel/dot.profile Fri Feb 13 20:58:10 2015 (r278708)
@@ -7,7 +7,7 @@
# These are normally set through /etc/login.conf. You may override them here
# if wanted.
-# PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH
+# PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH
# BLOCKSIZE=K; export BLOCKSIZE
# Setting TERM is normally done through /etc/ttys. Do only override
@@ -21,4 +21,4 @@ PAGER=more; export PAGER
# set ENV to a file invoked each time sh is started for interactive use.
ENV=$HOME/.shrc; export ENV
-if [ -x /usr/games/fortune ] ; then /usr/games/fortune freebsd-tips ; fi
+if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune freebsd-tips ; fi
Modified: projects/release-install-debug/sys/amd64/amd64/db_disasm.c
==============================================================================
--- projects/release-install-debug/sys/amd64/amd64/db_disasm.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/sys/amd64/amd64/db_disasm.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -250,6 +250,26 @@ static const struct inst db_inst_0f0x[]
/*0f*/ { "", FALSE, NONE, 0, 0 },
};
+static const struct inst db_inst_0f1x[] = {
+/*10*/ { "", FALSE, NONE, 0, 0 },
+/*11*/ { "", FALSE, NONE, 0, 0 },
+/*12*/ { "", FALSE, NONE, 0, 0 },
+/*13*/ { "", FALSE, NONE, 0, 0 },
+/*14*/ { "", FALSE, NONE, 0, 0 },
+/*15*/ { "", FALSE, NONE, 0, 0 },
+/*16*/ { "", FALSE, NONE, 0, 0 },
+/*17*/ { "", FALSE, NONE, 0, 0 },
+
+/*18*/ { "", FALSE, NONE, 0, 0 },
+/*19*/ { "", FALSE, NONE, 0, 0 },
+/*1a*/ { "", FALSE, NONE, 0, 0 },
+/*1b*/ { "", FALSE, NONE, 0, 0 },
+/*1c*/ { "", FALSE, NONE, 0, 0 },
+/*1d*/ { "", FALSE, NONE, 0, 0 },
+/*1e*/ { "", FALSE, NONE, 0, 0 },
+/*1f*/ { "nopl", TRUE, SDEP, 0, "nopw" },
+};
+
static const struct inst db_inst_0f2x[] = {
/*20*/ { "mov", TRUE, LONG, op2(CR,El), 0 },
/*21*/ { "mov", TRUE, LONG, op2(DR,El), 0 },
@@ -431,7 +451,7 @@ static const struct inst db_inst_0fcx[]
static const struct inst * const db_inst_0f[] = {
db_inst_0f0x,
- 0,
+ db_inst_0f1x,
db_inst_0f2x,
db_inst_0f3x,
db_inst_0f4x,
Modified: projects/release-install-debug/sys/cam/ctl/ctl.c
==============================================================================
--- projects/release-install-debug/sys/cam/ctl/ctl.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/sys/cam/ctl/ctl.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -11646,7 +11646,8 @@ ctl_clear_ua(struct ctl_softc *ctl_softc
STAILQ_FOREACH(lun, &ctl_softc->lun_list, links) {
mtx_lock(&lun->lun_lock);
pu = lun->pending_ua[initidx / CTL_MAX_INIT_PER_PORT];
- pu[initidx % CTL_MAX_INIT_PER_PORT] &= ~ua_type;
+ if (pu != NULL)
+ pu[initidx % CTL_MAX_INIT_PER_PORT] &= ~ua_type;
mtx_unlock(&lun->lun_lock);
}
}
Modified: projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c Fri Feb 13 20:53:20 2015 (r278707)
+++ projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c Fri Feb 13 20:58:10 2015 (r278708)
@@ -1188,6 +1188,7 @@ ctl_be_block_cw_dispatch_ws(struct ctl_b
struct ctl_be_block_softc *softc;
struct ctl_lba_len_flags *lbalen;
uint64_t len_left, lba;
+ uint32_t pb, pbo, adj;
int i, seglen;
uint8_t *buf, *end;
@@ -1241,6 +1242,11 @@ ctl_be_block_cw_dispatch_ws(struct ctl_b
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Fri Feb 13 21:21:39 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 29C774EC;
Fri, 13 Feb 2015 21:21:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 11E16CC2;
Fri, 13 Feb 2015 21:21:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1DLLc0V002610;
Fri, 13 Feb 2015 21:21:38 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1DLLcc6002609;
Fri, 13 Feb 2015 21:21:38 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502132121.t1DLLcc6002609@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 13 Feb 2015 21:21:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278711 -
projects/release-install-debug/usr.sbin/bsdinstall/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 21:21:39 -0000
Author: gjb
Date: Fri Feb 13 21:21:38 2015
New Revision: 278711
URL: https://svnweb.freebsd.org/changeset/base/278711
Log:
Fix WANT_DEBUG boolean test.
Submitted by: jilles
Sponsored by: The FreeBSD Foundation
Modified:
projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
Modified: projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 21:19:54 2015 (r278710)
+++ projects/release-install-debug/usr.sbin/bsdinstall/scripts/auto Fri Feb 13 21:21:38 2015 (r278711)
@@ -162,7 +162,7 @@ esac
if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
ALL_DISTRIBUTIONS="$DISTRIBUTIONS"
- WANT_DEBUG=false
+ WANT_DEBUG=
# Download to a directory in the new system as scratch space
BSDINSTALL_FETCHDEST="$BSDINSTALL_CHROOT/usr/freebsd-dist"
@@ -186,7 +186,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
*-dbg.*)
[ -e $BSDINSTALL_DISTDIR/$_DISTRIBUTION ] \
&& continue
- WANT_DEBUG=true
+ WANT_DEBUG=1
DEBUG_LIST="\n$DEBUG_LIST\n$_DISTRIBUTION"
;;
*)
@@ -204,7 +204,7 @@ if [ ! -z "$FETCH_DISTRIBUTIONS" ]; then
# installation, since failure to fetch *-dbg.txz should not
# be considered a fatal installation error.
msg="Failed to fetch remote distribution"
- if [ $WANT_DEBUG ]; then
+ if [ ! -z "$WANT_DEBUG" ]; then
# Trim leading and trailing newlines.
DEBUG_LIST="${DEBUG_LIST%%\n}"
DEBUG_LIST="${DEBUG_LIST##\n}"
From owner-svn-src-projects@FreeBSD.ORG Sat Feb 14 13:12:17 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id C0316C0A;
Sat, 14 Feb 2015 13:12:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 A727FEB5;
Sat, 14 Feb 2015 13:12:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1EDCHix051139;
Sat, 14 Feb 2015 13:12:17 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1EDC4RF051076;
Sat, 14 Feb 2015 13:12:04 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201502141312.t1EDC4RF051076@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 14 Feb 2015 13:12:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278756 - in projects/clang360-import: . bin/pkill/tests
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io
cddl/contrib/opensolaris/lib/libdtrace/arm cddl/contrib/opensolaris/tools...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2015 13:12:18 -0000
Author: dim
Date: Sat Feb 14 13:12:03 2015
New Revision: 278756
URL: https://svnweb.freebsd.org/changeset/base/278756
Log:
Merge ^/head r278499 through r278755.
Added:
projects/clang360-import/cddl/contrib/opensolaris/lib/libdtrace/arm/
- copied from r278755, head/cddl/contrib/opensolaris/lib/libdtrace/arm/
projects/clang360-import/sys/cddl/contrib/opensolaris/uts/arm/
- copied from r278755, head/sys/cddl/contrib/opensolaris/uts/arm/
projects/clang360-import/sys/cddl/dev/dtrace/arm/
- copied from r278755, head/sys/cddl/dev/dtrace/arm/
projects/clang360-import/sys/cddl/dev/fbt/arm/
- copied from r278755, head/sys/cddl/dev/fbt/arm/
Deleted:
projects/clang360-import/lib/libiconv/
projects/clang360-import/share/info/
Modified:
projects/clang360-import/Makefile.inc1
projects/clang360-import/ObsoleteFiles.inc
projects/clang360-import/UPDATING
projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh
projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c
projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d
projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
projects/clang360-import/cddl/lib/Makefile
projects/clang360-import/cddl/lib/libdtrace/Makefile
projects/clang360-import/cddl/usr.sbin/Makefile
projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc
projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h
projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c
projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c
projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h
projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh
projects/clang360-import/contrib/top/utils.c
projects/clang360-import/etc/login.conf
projects/clang360-import/etc/master.passwd
projects/clang360-import/etc/mtree/BSD.debug.dist
projects/clang360-import/etc/mtree/BSD.usr.dist
projects/clang360-import/etc/rc.d/LOGIN
projects/clang360-import/etc/rc.d/NETWORKING
projects/clang360-import/etc/rc.d/local_unbound
projects/clang360-import/etc/rc.d/netif
projects/clang360-import/etc/rc.d/utx
projects/clang360-import/etc/root/dot.cshrc
projects/clang360-import/etc/root/dot.login
projects/clang360-import/etc/root/dot.profile
projects/clang360-import/games/Makefile.inc
projects/clang360-import/games/caesar/rot13.sh
projects/clang360-import/games/fortune/datfiles/Makefile
projects/clang360-import/games/fortune/datfiles/freebsd-tips
projects/clang360-import/include/stdio.h
projects/clang360-import/lib/Makefile
projects/clang360-import/lib/libc/gen/_spinlock_stub.c
projects/clang360-import/lib/libc/include/libc_private.h
projects/clang360-import/lib/libc/nls/msgcat.c
projects/clang360-import/lib/libc/regex/regcomp.c
projects/clang360-import/lib/libc/sys/interposing_table.c
projects/clang360-import/lib/libproc/proc_bkpt.c
projects/clang360-import/lib/libproc/proc_regs.c
projects/clang360-import/lib/libproc/proc_sym.c
projects/clang360-import/lib/libthr/libthr.3
projects/clang360-import/lib/libthr/thread/thr_private.h
projects/clang360-import/lib/libthr/thread/thr_spinlock.c
projects/clang360-import/lib/libthr/thread/thr_syscalls.c
projects/clang360-import/release/scripts/make-manifest.sh
projects/clang360-import/release/scripts/mk-vmimage.sh
projects/clang360-import/sbin/sysctl/sysctl.8
projects/clang360-import/sbin/sysctl/sysctl.c
projects/clang360-import/share/man/man4/led.4
projects/clang360-import/share/man/man4/ral.4
projects/clang360-import/share/man/man5/nullfs.5
projects/clang360-import/share/man/man6/intro.6
projects/clang360-import/share/man/man7/hier.7
projects/clang360-import/share/mk/bsd.lib.mk
projects/clang360-import/share/mk/bsd.prog.mk
projects/clang360-import/share/skel/dot.cshrc
projects/clang360-import/share/skel/dot.login
projects/clang360-import/share/skel/dot.profile
projects/clang360-import/sys/amd64/amd64/db_disasm.c
projects/clang360-import/sys/arm/arm/cpufunc.c
projects/clang360-import/sys/arm/arm/cpufunc_asm_armv7.S
projects/clang360-import/sys/arm/arm/db_trace.c
projects/clang360-import/sys/arm/arm/elf_trampoline.c
projects/clang360-import/sys/arm/arm/exception.S
projects/clang360-import/sys/arm/arm/identcpu.c
projects/clang360-import/sys/arm/arm/trap.c
projects/clang360-import/sys/arm/conf/BEAGLEBONE
projects/clang360-import/sys/arm/include/armreg.h
projects/clang360-import/sys/arm/include/cpufunc.h
projects/clang360-import/sys/arm/xscale/ixp425/if_npe.c
projects/clang360-import/sys/boot/arm/ixp425/boot2/ixp425_board.c
projects/clang360-import/sys/boot/pc98/boot2/Makefile
projects/clang360-import/sys/cam/ctl/ctl.c
projects/clang360-import/sys/cam/ctl/ctl.h
projects/clang360-import/sys/cam/ctl/ctl_backend_block.c
projects/clang360-import/sys/cam/ctl/ctl_backend_ramdisk.c
projects/clang360-import/sys/cam/ctl/ctl_private.h
projects/clang360-import/sys/cam/ctl/ctl_tpc.c
projects/clang360-import/sys/cam/ctl/ctl_tpc.h
projects/clang360-import/sys/cam/ctl/ctl_tpc_local.c
projects/clang360-import/sys/cam/scsi/scsi_all.h
projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
projects/clang360-import/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
projects/clang360-import/sys/cddl/dev/lockstat/lockstat.c
projects/clang360-import/sys/cddl/dev/profile/profile.c
projects/clang360-import/sys/conf/kern.pre.mk
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini
projects/clang360-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini
projects/clang360-import/sys/contrib/dev/ral/microcode.h
projects/clang360-import/sys/contrib/dev/ral/rt2860.fw.uu
projects/clang360-import/sys/contrib/vchiq/interface/compat/vchi_bsd.h
projects/clang360-import/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c
projects/clang360-import/sys/dev/dwc/if_dwc.c
projects/clang360-import/sys/dev/hwpmc/hwpmc_armv7.c
projects/clang360-import/sys/dev/malo/if_malo.c
projects/clang360-import/sys/dev/mwl/if_mwl.c
projects/clang360-import/sys/dev/oce/oce_mbox.c
projects/clang360-import/sys/dev/ral/if_ral_pci.c
projects/clang360-import/sys/dev/ral/rt2860.c
projects/clang360-import/sys/dev/ral/rt2860reg.h
projects/clang360-import/sys/dev/smc/if_smc.c
projects/clang360-import/sys/dev/sound/usb/uaudio.c
projects/clang360-import/sys/dev/vt/font/vt_mouse_cursor.c
projects/clang360-import/sys/fs/autofs/autofs.c
projects/clang360-import/sys/fs/autofs/autofs_ioctl.h
projects/clang360-import/sys/i386/i386/db_disasm.c
projects/clang360-import/sys/kern/kern_sig.c
projects/clang360-import/sys/kern/kern_timeout.c
projects/clang360-import/sys/kern/sysv_shm.c
projects/clang360-import/sys/kern/vfs_mount.c
projects/clang360-import/sys/modules/dtrace/Makefile
projects/clang360-import/sys/modules/dtrace/dtrace/Makefile
projects/clang360-import/sys/netgraph/ng_base.c
projects/clang360-import/sys/ofed/include/linux/gfp.h
projects/clang360-import/sys/ofed/include/linux/kernel.h
projects/clang360-import/sys/ofed/include/linux/kref.h
projects/clang360-import/sys/ofed/include/linux/pci.h
projects/clang360-import/sys/sys/disk.h
projects/clang360-import/sys/sys/sockbuf.h
projects/clang360-import/sys/x86/acpica/madt.c
projects/clang360-import/sys/x86/include/vmware.h
projects/clang360-import/sys/x86/iommu/intel_drv.c
projects/clang360-import/sys/x86/iommu/intel_reg.h
projects/clang360-import/sys/x86/iommu/intel_utils.c
projects/clang360-import/tools/build/mk/OptionalObsoleteFiles.inc
projects/clang360-import/tools/tools/nanobsd/gateworks/Files/root/.profile
projects/clang360-import/tools/tools/nanobsd/pcengines/Files/root/.cshrc
projects/clang360-import/tools/tools/nanobsd/pcengines/Files/root/.login
projects/clang360-import/tools/tools/nanobsd/rescue/Files/root/.cshrc
projects/clang360-import/tools/tools/netmap/pkt-gen.c
projects/clang360-import/usr.bin/svn/svn/Makefile
projects/clang360-import/usr.bin/w/w.c
projects/clang360-import/usr.bin/wc/wc.c
projects/clang360-import/usr.bin/whereis/pathnames.h
projects/clang360-import/usr.bin/whereis/whereis.1
projects/clang360-import/usr.bin/whereis/whereis.c
projects/clang360-import/usr.sbin/bsdconfig/include/messages.subr
projects/clang360-import/usr.sbin/ctladm/ctladm.8
projects/clang360-import/usr.sbin/ctld/ctl.conf.5
projects/clang360-import/usr.sbin/ctld/ctld.c
projects/clang360-import/usr.sbin/ctld/ctld.h
projects/clang360-import/usr.sbin/ctld/keys.c
projects/clang360-import/usr.sbin/flowctl/flowctl.c
projects/clang360-import/usr.sbin/freebsd-update/freebsd-update.sh
projects/clang360-import/usr.sbin/gssd/Makefile
projects/clang360-import/usr.sbin/gssd/gssd.c
projects/clang360-import/usr.sbin/iscsid/iscsid.h
projects/clang360-import/usr.sbin/iscsid/keys.c
projects/clang360-import/usr.sbin/mountd/mountd.c
projects/clang360-import/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
Directory Properties:
projects/clang360-import/ (props changed)
projects/clang360-import/cddl/ (props changed)
projects/clang360-import/cddl/contrib/opensolaris/ (props changed)
projects/clang360-import/contrib/binutils/ (props changed)
projects/clang360-import/contrib/elftoolchain/ (props changed)
projects/clang360-import/contrib/top/ (props changed)
projects/clang360-import/etc/ (props changed)
projects/clang360-import/include/ (props changed)
projects/clang360-import/lib/libc/ (props changed)
projects/clang360-import/sbin/ (props changed)
projects/clang360-import/share/ (props changed)
projects/clang360-import/share/man/man4/ (props changed)
projects/clang360-import/sys/ (props changed)
projects/clang360-import/sys/boot/ (props changed)
projects/clang360-import/sys/cddl/contrib/opensolaris/ (props changed)
projects/clang360-import/sys/conf/ (props changed)
Modified: projects/clang360-import/Makefile.inc1
==============================================================================
--- projects/clang360-import/Makefile.inc1 Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/Makefile.inc1 Sat Feb 14 13:12:03 2015 (r278756)
@@ -50,10 +50,6 @@
.include <bsd.arch.inc.mk>
.include <bsd.compiler.mk>
-# We must do share/info early so that installation of info `dir'
-# entries works correctly. Do it first since it is less likely to
-# grow dependencies on include and lib than vice versa.
-#
# We must do lib/ and libexec/ before bin/, because if installworld
# installs a new /bin/sh, the 'make' command will *immediately*
# use that new version. And the new (dynamically-linked) /bin/sh
@@ -63,7 +59,7 @@ SRCDIR?= ${.CURDIR}
.if defined(SUBDIR_OVERRIDE)
SUBDIR= ${SUBDIR_OVERRIDE}
.else
-SUBDIR= share/info lib libexec
+SUBDIR= lib libexec
SUBDIR+=bin
.if ${MK_GAMES} != "no"
SUBDIR+=games
@@ -193,9 +189,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX}
OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}
.endif
WORLDTMP= ${OBJTREE}${.CURDIR}/tmp
-# /usr/games added for fortune which depend on strfile
-BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin
-XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games
+BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
+XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
STRICTTMPPATH= ${BPATH}:${XPATH}
TMPPATH= ${STRICTTMPPATH}:${PATH}
@@ -811,9 +806,6 @@ ITOOLS+=makewhatis
# Non-base distributions produced by the base system
EXTRA_DISTRIBUTIONS= doc
-.if ${MK_GAMES} != "no"
-EXTRA_DISTRIBUTIONS+= games
-.endif
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
EXTRA_DISTRIBUTIONS+= lib32
.endif
Modified: projects/clang360-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang360-import/ObsoleteFiles.inc Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/ObsoleteFiles.inc Sat Feb 14 13:12:03 2015 (r278756)
@@ -38,7 +38,7 @@
# xargs -n1 | sort | uniq -d;
# done
-# 20150210: new clang import which bumps version from 3.5.1 to 3.6.0.
+# 2015mmdd: new clang import which bumps version from 3.5.1 to 3.6.0.
OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_aes.h
OLD_FILES+=usr/include/clang/3.5.1/__wmmintrin_pclmul.h
OLD_FILES+=usr/include/clang/3.5.1/altivec.h
@@ -93,6 +93,22 @@ OLD_FILES+=usr/lib/clang/3.5.1/lib/freeb
OLD_DIRS+=usr/lib/clang/3.5.1/lib/freebsd
OLD_DIRS+=usr/lib/clang/3.5.1/lib
OLD_DIRS+=usr/lib/clang/3.5.1
+# 20150212: /usr/games moving into /usr/bin
+OLD_FILES+=usr/games/bcd
+OLD_FILES+=usr/games/caesar
+OLD_FILES+=usr/games/factor
+OLD_FILES+=usr/games/fortune
+OLD_FILES+=usr/games/grdc
+OLD_FILES+=usr/games/morse
+OLD_FILES+=usr/games/number
+OLD_FILES+=usr/games/pom
+OLD_FILES+=usr/games/ppt
+OLD_FILES+=usr/games/primes
+OLD_FILES+=usr/games/random
+OLD_FILES+=usr/games/rot13
+OLD_FILES+=usr/games/strfile
+OLD_FILES+=usr/games/unstr
+OLD_DIRS+=usr/games
# 20150209: liblzma header
OLD_FILES+=usr/include/lzma/lzma.h
# 20150124: spl.9 and friends
Modified: projects/clang360-import/UPDATING
==============================================================================
--- projects/clang360-import/UPDATING Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/UPDATING Sat Feb 14 13:12:03 2015 (r278756)
@@ -34,6 +34,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
2015mmdd:
Clang and llvm have been upgraded to 3.6.0 release.
+20150210:
+ The autofs(4) ABI was changed in order to restore binary compatibility
+ with 10.1-RELEASE. The automountd(8) daemon needs to be rebuilt to work
+ with the new kernel.
+
20150131:
The powerpc64 kernel has been changed to a position-independent
executable. This can only be booted with a new version of loader(8),
@@ -290,6 +295,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
The lindev device has been removed since /dev/full has been made a
standard device. __FreeBSD_version has been bumped.
+20140424:
+ The knob WITHOUT_VI was added to the base system, which controls
+ building ex(1), vi(1), etc. Older releases of FreeBSD required ex(1)
+ in order to reorder files share/termcap and didn't build ex(1) as a
+ build tool, so building/installing with WITH_VI is highly advised for
+ build hosts for older releases.
+
+ This issue has been fixed in stable/9 and stable/10 in r277022 and
+ r276991, respectively.
+
20140418:
The YES_HESIOD knob has been removed. It has been obsolete for
a decade. Please move to using WITH_HESIOD instead or your builds
Modified: projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/bin/pkill/tests/pgrep-j_test.sh Sat Feb 14 13:12:03 2015 (r278756)
@@ -4,94 +4,87 @@
jail_name_to_jid()
{
local check_name="$1"
- (
- line="$(jls -n 2> /dev/null | grep name=$check_name )"
- for nv in $line; do
- local name="${nv%=*}"
- if [ "${name}" = "jid" ]; then
- eval $nv
- echo $jid
- break
- fi
- done
- )
+ jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
}
base=pgrep_j_test
+if [ `id -u` -ne 0 ]; then
+ echo "1..0 # skip Test needs uid 0."
+ exit 0
+fi
+
echo "1..3"
+sleep=$(pwd)/sleep.txt
+ln -sf /bin/sleep $sleep
+
name="pgrep -j <jid>"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+sleep_amount=5
+jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
- jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
+for i in `seq 1 10`; do
jid1=$(jail_name_to_jid ${base}_1_1)
jid2=$(jail_name_to_jid ${base}_1_2)
jid="${jid1},${jid2}"
- pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)"
- pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
- $(cat ${PWD}/${base}_1_2.pid) | sort)
- if [ "$pid1" = "$pid2" ]; then
- echo "ok 1 - $name"
- else
- echo "not ok 1 - $name"
- fi
- [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
- [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
- rm -f $sleep
+ case "$jid" in
+ [0-9]+,[0-9]+)
+ break
+ ;;
+ esac
+ sleep 0.1
+done
+
+pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
+ $(cat ${PWD}/${base}_1_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+ echo "ok 1 - $name"
else
- echo "ok 1 - $name # skip Test needs uid 0."
+ echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+wait
name="pgrep -j any"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
-
- jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
-
- sleep 2
- pid1="$(pgrep -f -x -j any "$sleep 5" | sort)"
- pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
- $(cat ${PWD}/${base}_2_2.pid) | sort)
- if [ "$pid1" = "$pid2" ]; then
- echo "ok 2 - $name"
- else
- echo "not ok 2 - $name"
- fi
- [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
- [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
- rm -f $sleep
+sleep_amount=6
+jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount &
+
+sleep 2
+pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \
+ $(cat ${PWD}/${base}_2_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+ echo "ok 2 - $name"
else
- echo "ok 2 - $name # skip Test needs uid 0."
+ echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+wait
name="pgrep -j none"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- daemon -p ${PWD}/${base}_3_1.pid $sleep 5 &
- jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
- sleep 2
- pid="$(pgrep -f -x -j none "$sleep 5")"
- if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
- echo "ok 3 - $name"
- else
- echo "not ok 3 - $name"
- fi
- rm -f $sleep
- [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
- [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid)
+sleep_amount=7
+daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount &
+jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
+sleep 2
+pid="$(pgrep -f -x -j none "$sleep $sleep_amount")"
+if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then
+ echo "ok 3 - $name"
else
- echo "ok 3 - $name # skip Test needs uid 0."
+ echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
fi
+[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid)
+[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid)
+
+rm -f $sleep
Modified: projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -26,6 +26,8 @@
#pragma ident "%Z%%M% %I% %E% SMI"
+#include <sys/ioctl.h>
+
#include <assert.h>
#include <setjmp.h>
#include <signal.h>
@@ -69,7 +71,7 @@ main(int argc, char *argv[])
*/
if (sigsetjmp(env, 1) == 0) {
for (;;)
- (void) ioctl(-1, -1, NULL);
+ (void) ioctl(-1, 0, NULL);
}
/*
@@ -80,20 +82,19 @@ main(int argc, char *argv[])
fds[n++] = open(file, O_WRONLY);
fds[n++] = open(file, O_RDWR);
- fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC |
- O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC |
- O_SYNC | O_TRUNC | O_XATTR, 0666);
+ fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT |
+ O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666);
fds[n++] = open(file, O_RDWR);
(void) lseek(fds[n - 1], 123, SEEK_SET);
/*
* Once we have all the file descriptors in the state we want to test,
- * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack
+ * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack
* our DTrace script into recording the content of the fds[] array.
*/
for (i = 0; i < n; i++)
- (void) ioctl(fds[i], -1, NULL);
+ (void) ioctl(fds[i], 0, NULL);
assert(n <= sizeof (fds) / sizeof (fds[0]));
exit(0);
Modified: projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Sat Feb 14 13:12:03 2015 (r278756)
@@ -36,7 +36,7 @@ syscall::ioctl:entry
}
syscall::ioctl:entry
-/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/
+/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/
{
printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name);
printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname);
Modified: projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
==============================================================================
--- projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -169,12 +169,12 @@ write_objects(iidesc_t *idp, ctf_buf_t *
{
ushort_t id = (idp ? idp->ii_dtype->t_id : 0);
- ctf_buf_write(b, &id, sizeof (id));
-
if (target_requires_swap) {
SWAP_16(id);
}
+ ctf_buf_write(b, &id, sizeof (id));
+
debug(3, "Wrote object %s (%d)\n", (idp ? idp->ii_name : "(null)"), id);
}
Modified: projects/clang360-import/cddl/lib/Makefile
==============================================================================
--- projects/clang360-import/cddl/lib/Makefile Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/cddl/lib/Makefile Sat Feb 14 13:12:03 2015 (r278756)
@@ -27,7 +27,8 @@ _libzpool= libzpool
.endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \
+ ${MACHINE_CPUARCH} == "arm"
_drti= drti
_libdtrace= libdtrace
.endif
Modified: projects/clang360-import/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/clang360-import/cddl/lib/libdtrace/Makefile Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/cddl/lib/libdtrace/Makefile Sat Feb 14 13:12:03 2015 (r278756)
@@ -81,6 +81,10 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/ut
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips
.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips
+.elif ${MACHINE_CPUARCH} == "arm"
+CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm
+.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm
.elif ${MACHINE_CPUARCH} == "powerpc"
CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc
Modified: projects/clang360-import/cddl/usr.sbin/Makefile
==============================================================================
--- projects/clang360-import/cddl/usr.sbin/Makefile Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/cddl/usr.sbin/Makefile Sat Feb 14 13:12:03 2015 (r278756)
@@ -30,6 +30,12 @@ _plockstat= plockstat
.endif
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_dtrace= dtrace
+_dtruss= dtruss
+_lockstat= lockstat
+.endif
+
.if ${MACHINE_CPUARCH} == "mips"
_dtrace= dtrace
.endif
Modified: projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc
==============================================================================
--- projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/binutils/ld/scripttempl/elf.sc Sat Feb 14 13:12:03 2015 (r278756)
@@ -402,8 +402,8 @@ cat <<EOF
.fini_array ${RELOCATING-0} :
{
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}}
- KEEP (*(.fini_array))
KEEP (*(SORT(.fini_array.*)))
+ KEEP (*(.fini_array))
${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}}
}
${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}
Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/_libdwarf.h Sat Feb 14 13:12:03 2015 (r278756)
@@ -49,7 +49,7 @@
struct _libdwarf_globals {
Dwarf_Handler errhand;
Dwarf_Ptr errarg;
- int applyrela;
+ int applyreloc;
};
extern struct _libdwarf_globals _libdwarf;
Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_reloc.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply)
{
int oldapply;
- oldapply = _libdwarf.applyrela;
- _libdwarf.applyrela = apply;
+ oldapply = _libdwarf.applyreloc;
+ _libdwarf.applyreloc = apply;
return (oldapply);
}
Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Sat Feb 14 13:12:03 2015 (r278756)
@@ -24,7 +24,7 @@
.\"
.\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $
.\"
-.Dd June 26, 2011
+.Dd February 11, 2015
.Os
.Dt DWARF_SET_RELOC_APPLICATION 3
.Sh NAME
@@ -47,6 +47,8 @@ handled by the DWARF(3) library.
If the argument
.Ar apply
holds a non-zero value, the library will process all the relevant
+.Dq ".rel"
+and
.Dq ".rela"
relocation sections and will apply the relocation records found to
their corresponding DWARF sections.
Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -31,5 +31,5 @@ ELFTC_VCSID("$Id: libdwarf.c 2070 2011-1
struct _libdwarf_globals _libdwarf = {
.errhand = NULL,
.errarg = NULL,
- .applyrela = 1
+ .applyreloc = 1
};
Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf.h Sat Feb 14 13:12:03 2015 (r278756)
@@ -439,6 +439,7 @@ enum Dwarf_ISA {
DW_ISA_SPARC,
DW_ISA_X86,
DW_ISA_X86_64,
+ DW_ISA_AARCH64,
DW_ISA_MAX
};
Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -50,32 +50,46 @@ static const char *debug_name[] = {
};
static void
-_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
- Elf_Data *symtab_data, int endian)
+_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian,
+ void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend)
{
- Dwarf_Unsigned type;
- GElf_Rela rela;
GElf_Sym sym;
- size_t symndx;
- uint64_t offset;
- int size, j;
+ int size;
- j = 0;
- while (gelf_getrela(rel_data, j++, &rela) != NULL) {
- symndx = GELF_R_SYM(rela.r_info);
- type = GELF_R_TYPE(rela.r_info);
+ if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), &sym) == NULL)
+ return;
+ if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0)
+ return; /* Unknown or non-absolute relocation. */
+ if (endian == ELFDATA2MSB)
+ _dwarf_write_msb(buf, &offset, sym.st_value + r_addend, size);
+ else
+ _dwarf_write_lsb(buf, &offset, sym.st_value + r_addend, size);
+}
- if (gelf_getsym(symtab_data, symndx, &sym) == NULL)
- continue;
+static void
+_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rel rel;
+ int j;
- offset = rela.r_offset;
- size = _dwarf_get_reloc_size(dbg, type);
+ j = 0;
+ while (gelf_getrel(rel_data, j++, &rel) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rel.r_offset, rel.r_info, 0);
+}
- if (endian == ELFDATA2MSB)
- _dwarf_write_msb(buf, &offset, rela.r_addend, size);
- else
- _dwarf_write_lsb(buf, &offset, rela.r_addend, size);
- }
+static void
+_dwarf_elf_apply_rela_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data,
+ Elf_Data *symtab_data, int endian)
+{
+ GElf_Rela rela;
+ int j;
+
+ j = 0;
+ while (gelf_getrela(rel_data, j++, &rela) != NULL)
+ _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf,
+ rela.r_offset, rela.r_info, rela.r_addend);
}
static int
@@ -104,7 +118,8 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
return (DW_DLE_ELF);
}
- if (sh.sh_type != SHT_RELA || sh.sh_size == 0)
+ if ((sh.sh_type != SHT_REL && sh.sh_type != SHT_RELA) ||
+ sh.sh_size == 0)
continue;
if (sh.sh_info == shndx && sh.sh_link == symtab) {
@@ -125,8 +140,12 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf
}
memcpy(ed->ed_alloc, ed->ed_data->d_buf,
ed->ed_data->d_size);
- _dwarf_elf_apply_reloc(dbg, ed->ed_alloc, rel,
- symtab_data, eh.e_ident[EI_DATA]);
+ if (sh.sh_type == SHT_REL)
+ _dwarf_elf_apply_rel_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
+ else
+ _dwarf_elf_apply_rela_reloc(dbg, ed->ed_alloc,
+ rel, symtab_data, eh.e_ident[EI_DATA]);
return (DW_DLE_NONE);
}
@@ -282,7 +301,7 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *el
}
}
- if (_libdwarf.applyrela) {
+ if (_libdwarf.applyreloc) {
if (_dwarf_elf_relocate(dbg, elf,
&e->eo_data[j], elf_ndxscn(scn), symtab_ndx,
symtab_data, error) != DW_DLE_NONE)
Modified: projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c
==============================================================================
--- projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/elftoolchain/libdwarf/libdwarf_reloc.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -35,6 +35,8 @@ _dwarf_get_reloc_type(Dwarf_P_Debug dbg,
assert(dbg != NULL);
switch (dbg->dbgp_isa) {
+ case DW_ISA_AARCH64:
+ return (is64 ? R_AARCH64_ABS64 : R_AARCH64_ABS32);
case DW_ISA_X86:
return (R_386_32);
case DW_ISA_X86_64:
@@ -62,6 +64,12 @@ _dwarf_get_reloc_size(Dwarf_Debug dbg, D
switch (dbg->dbg_machine) {
case EM_NONE:
break;
+ case EM_AARCH64:
+ if (rel_type == R_AARCH64_ABS32)
+ return (4);
+ else if (rel_type == R_AARCH64_ABS64)
+ return (8);
+ break;
case EM_ARM:
if (rel_type == R_ARM_ABS32)
return (4);
Modified: projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh
==============================================================================
--- projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/netbsd-tests/games/t_factor.sh Sat Feb 14 13:12:03 2015 (r278756)
@@ -27,13 +27,13 @@
expect() {
echo "${2}" >expout
- atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+ atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1}
}
atf_test_case overflow
overflow_head() {
atf_set "descr" "Tests for overflow conditions"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
overflow_body() {
expect '8675309' '8675309: 8675309'
@@ -44,7 +44,7 @@ atf_test_case loop
loop_head() {
atf_set "descr" "Tests some cases that once locked the program" \
"in an infinite loop"
- atf_set "require.progs" "/usr/games/factor"
+ atf_set "require.progs" "/usr/bin/factor"
}
loop_body() {
expect '99999999999991' '99999999999991: 7 13 769231 1428571'
Modified: projects/clang360-import/contrib/top/utils.c
==============================================================================
--- projects/clang360-import/contrib/top/utils.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/contrib/top/utils.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -58,6 +58,7 @@ char *str;
* ever convert will be 2^32-1, which is 10
* digits.
*/
+_Static_assert(sizeof(int) <= 4, "buffer too small for this sized int");
char *itoa(val)
Modified: projects/clang360-import/etc/login.conf
==============================================================================
--- projects/clang360-import/etc/login.conf Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/login.conf Sat Feb 14 13:12:03 2015 (r278756)
@@ -27,7 +27,7 @@ default:\
:copyright=/etc/COPYRIGHT:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
- :path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\
+ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
:nologin=/var/run/nologin:\
:cputime=unlimited:\
:datasize=unlimited:\
Modified: projects/clang360-import/etc/master.passwd
==============================================================================
--- projects/clang360-import/etc/master.passwd Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/master.passwd Sat Feb 14 13:12:03 2015 (r278756)
@@ -7,7 +7,7 @@ operator:*:2:5::0:0:System &:/:/usr/sbin
bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
-games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin
+games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin
news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
Modified: projects/clang360-import/etc/mtree/BSD.debug.dist
==============================================================================
--- projects/clang360-import/etc/mtree/BSD.debug.dist Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/mtree/BSD.debug.dist Sat Feb 14 13:12:03 2015 (r278756)
@@ -21,8 +21,6 @@
usr
bin
..
- games
- ..
lib
clang
3.6.0
Modified: projects/clang360-import/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/clang360-import/etc/mtree/BSD.usr.dist Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/mtree/BSD.usr.dist Sat Feb 14 13:12:03 2015 (r278756)
@@ -7,8 +7,6 @@
.
bin
..
- games
- ..
include
..
lib
Modified: projects/clang360-import/etc/rc.d/LOGIN
==============================================================================
--- projects/clang360-import/etc/rc.d/LOGIN Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/rc.d/LOGIN Sat Feb 14 13:12:03 2015 (r278756)
@@ -4,7 +4,7 @@
#
# PROVIDE: LOGIN
-# REQUIRE: DAEMON utx
+# REQUIRE: DAEMON
# This is a dummy dependency to ensure user services such as xdm,
# inetd, cron and kerberos are started after everything else, in case
Modified: projects/clang360-import/etc/rc.d/NETWORKING
==============================================================================
--- projects/clang360-import/etc/rc.d/NETWORKING Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/rc.d/NETWORKING Sat Feb 14 13:12:03 2015 (r278756)
@@ -6,7 +6,7 @@
# PROVIDE: NETWORKING NETWORK
# REQUIRE: netif netoptions routing ppp ipfw stf
# REQUIRE: defaultroute routed route6d mroute6d resolv bridge
-# REQUIRE: static_arp static_ndp local_unbound
+# REQUIRE: static_arp static_ndp
# This is a dummy dependency, for services which require networking
# to be operational before starting.
Modified: projects/clang360-import/etc/rc.d/local_unbound
==============================================================================
--- projects/clang360-import/etc/rc.d/local_unbound Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/rc.d/local_unbound Sat Feb 14 13:12:03 2015 (r278756)
@@ -5,6 +5,7 @@
# PROVIDE: local_unbound
# REQUIRE: FILESYSTEMS netif resolv
+# BEFORE: NETWORKING
# KEYWORD: shutdown
. /etc/rc.subr
Modified: projects/clang360-import/etc/rc.d/netif
==============================================================================
--- projects/clang360-import/etc/rc.d/netif Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/rc.d/netif Sat Feb 14 13:12:03 2015 (r278756)
@@ -252,5 +252,8 @@ netif_common()
debug "The following interfaces were not configured: $_fail"
}
+# Load the old "network" config file also for compatibility.
+# This is needed for mfsBSD at least.
+load_rc_config network
load_rc_config $name
run_rc_command $*
Modified: projects/clang360-import/etc/rc.d/utx
==============================================================================
--- projects/clang360-import/etc/rc.d/utx Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/rc.d/utx Sat Feb 14 13:12:03 2015 (r278756)
@@ -5,6 +5,7 @@
# PROVIDE: utx
# REQUIRE: DAEMON FILESYSTEMS
+# BEFORE: LOGIN
# KEYWORD: shutdown
. /etc/rc.subr
Modified: projects/clang360-import/etc/root/dot.cshrc
==============================================================================
--- projects/clang360-import/etc/root/dot.cshrc Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/root/dot.cshrc Sat Feb 14 13:12:03 2015 (r278756)
@@ -15,7 +15,7 @@ alias ll ls -lAF
# A righteous umask
umask 22
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin)
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
setenv EDITOR vi
setenv PAGER more
Modified: projects/clang360-import/etc/root/dot.login
==============================================================================
--- projects/clang360-import/etc/root/dot.login Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/root/dot.login Sat Feb 14 13:12:03 2015 (r278756)
@@ -6,4 +6,4 @@
#
# Uncomment to display a random cookie each login:
-# if ( -x /usr/games/fortune ) /usr/games/fortune -s
+# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s
Modified: projects/clang360-import/etc/root/dot.profile
==============================================================================
--- projects/clang360-import/etc/root/dot.profile Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/etc/root/dot.profile Sat Feb 14 13:12:03 2015 (r278756)
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
export PATH
HOME=/root
export HOME
Modified: projects/clang360-import/games/Makefile.inc
==============================================================================
--- projects/clang360-import/games/Makefile.inc Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/games/Makefile.inc Sat Feb 14 13:12:03 2015 (r278756)
@@ -1,7 +1,6 @@
# @(#)Makefile.inc 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-BINDIR?= /usr/games
+BINDIR?= /usr/bin
FILESDIR?= ${SHAREDIR}/games
WARNS?= 6
-DISTRIBUTION?= games
Modified: projects/clang360-import/games/caesar/rot13.sh
==============================================================================
--- projects/clang360-import/games/caesar/rot13.sh Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/games/caesar/rot13.sh Sat Feb 14 13:12:03 2015 (r278756)
@@ -30,4 +30,4 @@
# @(#)rot13.sh 8.1 (Berkeley) 5/31/93
# $FreeBSD$
-exec /usr/games/caesar 13 "$@"
+exec /usr/bin/caesar 13 "$@"
Modified: projects/clang360-import/games/fortune/datfiles/Makefile
==============================================================================
--- projects/clang360-import/games/fortune/datfiles/Makefile Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/games/fortune/datfiles/Makefile Sat Feb 14 13:12:03 2015 (r278756)
@@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/games/fortune
.for f in ${DB}
$f.dat: $f
- PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \
+ PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \
strfile -Cs ${.ALLSRC} ${.TARGET}
.endfor
Modified: projects/clang360-import/games/fortune/datfiles/freebsd-tips
==============================================================================
--- projects/clang360-import/games/fortune/datfiles/freebsd-tips Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/games/fortune/datfiles/freebsd-tips Sat Feb 14 13:12:03 2015 (r278756)
@@ -443,7 +443,7 @@ on this system. Example entries are in
%
You can use "pkg info" to see a list of packages you have installed.
%
-You can use the 'fetch' command to retrieve files over ftp or http.
+You can use the 'fetch' command to retrieve files over ftp, http or https.
fetch http://www.FreeBSD.org/index.html
Modified: projects/clang360-import/include/stdio.h
==============================================================================
--- projects/clang360-import/include/stdio.h Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/include/stdio.h Sat Feb 14 13:12:03 2015 (r278756)
@@ -166,7 +166,7 @@ __END_DECLS
#define __SRW 0x0010 /* open for reading & writing */
#define __SEOF 0x0020 /* found EOF */
#define __SERR 0x0040 /* found error */
-#define __SMBF 0x0080 /* _buf is from malloc */
+#define __SMBF 0x0080 /* _bf._base is from malloc */
#define __SAPP 0x0100 /* fdopen()ed in append mode */
#define __SSTR 0x0200 /* this is an sprintf/snprintf string */
#define __SOPT 0x0400 /* do fseek() optimization */
Modified: projects/clang360-import/lib/Makefile
==============================================================================
--- projects/clang360-import/lib/Makefile Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/Makefile Sat Feb 14 13:12:03 2015 (r278756)
@@ -284,6 +284,12 @@ _libsmb= libsmb
_libsmb= libsmb
.endif
+.if ${MACHINE_CPUARCH} == "arm"
+_libsmb= libsmb
+_libproc= libproc
+_librtld_db= librtld_db
+.endif
+
.if ${MK_OPENSSL} != "no"
_libmp= libmp
.endif
Modified: projects/clang360-import/lib/libc/gen/_spinlock_stub.c
==============================================================================
--- projects/clang360-import/lib/libc/gen/_spinlock_stub.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/libc/gen/_spinlock_stub.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -33,51 +33,48 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include "spinlock.h"
+#include "libc_private.h"
long _atomic_lock_stub(volatile long *);
void _spinlock_stub(spinlock_t *);
void _spinunlock_stub(spinlock_t *);
void _spinlock_debug_stub(spinlock_t *, char *, int);
-/*
- * Declare weak definitions in case the application is not linked
- * with libpthread.
- */
__weak_reference(_atomic_lock_stub, _atomic_lock);
-__weak_reference(_spinlock_stub, _spinlock);
-__weak_reference(_spinunlock_stub, _spinunlock);
-__weak_reference(_spinlock_debug_stub, _spinlock_debug);
-
-/*
- * This function is a stub for the _atomic_lock function in libpthread.
- */
+
long
_atomic_lock_stub(volatile long *lck __unused)
{
return (0L);
}
+__weak_reference(_spinlock, _spinlock_debug);
+#pragma weak _spinlock
+void
+_spinlock(spinlock_t *lck)
+{
+
+ ((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinlock])
+ (lck);
-/*
- * This function is a stub for the spinlock function in libpthread.
- */
+}
+
+#pragma weak _spinlock
void
-_spinlock_stub(spinlock_t *lck __unused)
+_spinunlock(spinlock_t *lck)
{
+
+ ((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinunlock])
+ (lck);
+
}
-/*
- * This function is a stub for the spinunlock function in libpthread.
- */
void
-_spinunlock_stub(spinlock_t *lck __unused)
+__libc_spinlock_stub(spinlock_t *lck __unused)
{
}
-/*
- * This function is a stub for the debug spinlock function in libpthread.
- */
void
-_spinlock_debug_stub(spinlock_t *lck __unused, char *fname __unused, int lineno __unused)
+__libc_spinunlock_stub(spinlock_t *lck __unused)
{
}
Modified: projects/clang360-import/lib/libc/include/libc_private.h
==============================================================================
--- projects/clang360-import/lib/libc/include/libc_private.h Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/libc/include/libc_private.h Sat Feb 14 13:12:03 2015 (r278756)
@@ -95,6 +95,9 @@ do { \
_SPINUNLOCK(&__stdio_thread_lock); \
} while (0)
+void __libc_spinlock_stub(struct _spinlock *);
+void __libc_spinunlock_stub(struct _spinlock *);
+
/*
* Indexes into the pthread jump table.
*
@@ -216,6 +219,8 @@ enum {
INTERPOS_write,
INTERPOS_writev,
INTERPOS__pthread_mutex_init_calloc_cb,
+ INTERPOS_spinlock,
+ INTERPOS_spinunlock,
INTERPOS_MAX
};
Modified: projects/clang360-import/lib/libc/nls/msgcat.c
==============================================================================
--- projects/clang360-import/lib/libc/nls/msgcat.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/libc/nls/msgcat.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
np->name = strdup(n); \
np->path = NULL; \
np->catd = NLERR; \
+ np->refcount = 0; \
np->lang = (l == NULL) ? NULL : \
strdup(l); \
np->caterrno = e; \
Modified: projects/clang360-import/lib/libc/regex/regcomp.c
==============================================================================
--- projects/clang360-import/lib/libc/regex/regcomp.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/libc/regex/regcomp.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -192,6 +192,7 @@ regcomp(regex_t * __restrict preg,
struct parse *p = &pa;
int i;
size_t len;
+ size_t maxlen;
#ifdef REDEBUG
# define GOODFLAGS(f) (f)
#else
@@ -213,7 +214,23 @@ regcomp(regex_t * __restrict preg,
g = (struct re_guts *)malloc(sizeof(struct re_guts));
if (g == NULL)
return(REG_ESPACE);
+ /*
+ * Limit the pattern space to avoid a 32-bit overflow on buffer
+ * extension. Also avoid any signed overflow in case of conversion
+ * so make the real limit based on a 31-bit overflow.
+ *
+ * Likely not applicable on 64-bit systems but handle the case
+ * generically (who are we to stop people from using ~715MB+
+ * patterns?).
+ */
+ maxlen = ((size_t)-1 >> 1) / sizeof(sop) * 2 / 3;
+ if (len >= maxlen) {
+ free((char *)g);
+ return(REG_ESPACE);
+ }
p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
+ assert(p->ssize >= len);
+
p->strip = (sop *)malloc(p->ssize * sizeof(sop));
p->slen = 0;
if (p->strip == NULL) {
Modified: projects/clang360-import/lib/libc/sys/interposing_table.c
==============================================================================
--- projects/clang360-import/lib/libc/sys/interposing_table.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/libc/sys/interposing_table.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -73,6 +73,8 @@ interpos_func_t __libc_interposing[INTER
SLOT(write, __sys_write),
SLOT(writev, __sys_writev),
SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),
+ SLOT(spinlock, __libc_spinlock_stub),
+ SLOT(spinunlock, __libc_spinunlock_stub),
};
#undef SLOT
Modified: projects/clang360-import/lib/libproc/proc_bkpt.c
==============================================================================
--- projects/clang360-import/lib/libproc/proc_bkpt.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/libproc/proc_bkpt.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -51,6 +51,9 @@ __FBSDID("$FreeBSD$");
#elif defined(__powerpc__)
#define BREAKPOINT_INSTR 0x7fe00008 /* trap */
#define BREAKPOINT_INSTR_SZ 4
+#elif defined(__arm__)
+#define BREAKPOINT_INSTR 0xe7ffffff /* bkpt */
+#define BREAKPOINT_INSTR_SZ 4
#else
#error "Add support for your architecture"
#endif
Modified: projects/clang360-import/lib/libproc/proc_regs.c
==============================================================================
--- projects/clang360-import/lib/libproc/proc_regs.c Sat Feb 14 12:19:35 2015 (r278755)
+++ projects/clang360-import/lib/libproc/proc_regs.c Sat Feb 14 13:12:03 2015 (r278756)
@@ -56,6 +56,8 @@ proc_regget(struct proc_handle *phdl, pr
case REG_PC:
#if defined(__amd64__)
*regvalue = regs.r_rip;
+#elif defined(__arm__)
+ *regvalue = regs.r_pc;
#elif defined(__i386__)
*regvalue = regs.r_eip;
#elif defined(__mips__)
@@ -67,6 +69,8 @@ proc_regget(struct proc_handle *phdl, pr
case REG_SP:
#if defined(__amd64__)
*regvalue = regs.r_rsp;
+#elif defined(__arm__)
+ *regvalue = regs.r_sp;
#elif defined(__i386__)
*regvalue = regs.r_esp;
#elif defined(__mips__)
@@ -99,6 +103,8 @@ proc_regset(struct proc_handle *phdl, pr
case REG_PC:
#if defined(__amd64__)
regs.r_rip = regvalue;
+#elif defined(__arm__)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sat Feb 14 14:13:08 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id C936FA49;
Sat, 14 Feb 2015 14:13:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 B06E465A;
Sat, 14 Feb 2015 14:13:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1EED8FN079260;
Sat, 14 Feb 2015 14:13:08 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1EED1D9079216;
Sat, 14 Feb 2015 14:13:01 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201502141413.t1EED1D9079216@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 14 Feb 2015 14:13:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278757 - in projects/clang360-import:
contrib/llvm/include/llvm/CodeGen contrib/llvm/include/llvm/IR
contrib/llvm/lib/Analysis contrib/llvm/lib/Analysis/IPA
contrib/llvm/lib/Bitcode/Re...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2015 14:13:08 -0000
Author: dim
Date: Sat Feb 14 14:13:00 2015
New Revision: 278757
URL: https://svnweb.freebsd.org/changeset/base/278757
Log:
Merge llvm 3.6.0rc3 from ^/vendor/llvm/dist, merge clang 3.6.0rc3 from
^/vendor/clang/dist, resolve conflicts, and update patches README.
Modified:
projects/clang360-import/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h
projects/clang360-import/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h
projects/clang360-import/contrib/llvm/include/llvm/IR/Metadata.h
projects/clang360-import/contrib/llvm/lib/Analysis/IPA/InlineCost.cpp
projects/clang360-import/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp
projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.h
projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.h
projects/clang360-import/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/Passes.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
projects/clang360-import/contrib/llvm/lib/IR/DebugInfo.cpp
projects/clang360-import/contrib/llvm/lib/IR/Metadata.cpp
projects/clang360-import/contrib/llvm/lib/IR/Type.cpp
projects/clang360-import/contrib/llvm/lib/MC/MCSectionCOFF.cpp
projects/clang360-import/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp
projects/clang360-import/contrib/llvm/lib/Support/regcomp.c
projects/clang360-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
projects/clang360-import/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
projects/clang360-import/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
projects/clang360-import/contrib/llvm/lib/Target/R600/AMDGPUTargetTransformInfo.cpp
projects/clang360-import/contrib/llvm/lib/Target/R600/SIAnnotateControlFlow.cpp
projects/clang360-import/contrib/llvm/lib/Target/R600/SIRegisterInfo.cpp
projects/clang360-import/contrib/llvm/lib/Target/X86/X86.td
projects/clang360-import/contrib/llvm/lib/Target/X86/X86AsmPrinter.cpp
projects/clang360-import/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
projects/clang360-import/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td
projects/clang360-import/contrib/llvm/lib/Target/X86/X86Subtarget.cpp
projects/clang360-import/contrib/llvm/lib/Target/X86/X86Subtarget.h
projects/clang360-import/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Scalar/EarlyCSE.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Utils/Local.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp
projects/clang360-import/contrib/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
projects/clang360-import/contrib/llvm/patches/README.TXT
projects/clang360-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td
projects/clang360-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
projects/clang360-import/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
projects/clang360-import/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/CodeGen/CGClass.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h
projects/clang360-import/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/Parse/ParseExprCXX.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/Sema/SemaLookup.cpp
projects/clang360-import/contrib/llvm/tools/clang/lib/Serialization/ASTWriterDecl.cpp
projects/clang360-import/lib/clang/include/clang/Basic/Version.inc
projects/clang360-import/lib/clang/include/llvm/Config/config.h
projects/clang360-import/lib/clang/liblldbPluginInstrumentationRuntimeAddressSanitizer/Makefile
projects/clang360-import/usr.bin/clang/lldb/Makefile
Directory Properties:
projects/clang360-import/contrib/llvm/ (props changed)
projects/clang360-import/contrib/llvm/tools/clang/ (props changed)
Modified: projects/clang360-import/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h
==============================================================================
--- projects/clang360-import/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h Sat Feb 14 14:13:00 2015 (r278757)
@@ -66,7 +66,6 @@ struct LandingPadInfo {
MachineBasicBlock *LandingPadBlock; // Landing pad block.
SmallVector<MCSymbol*, 1> BeginLabels; // Labels prior to invoke.
SmallVector<MCSymbol*, 1> EndLabels; // Labels after invoke.
- SmallVector<MCSymbol*, 1> ClauseLabels; // Labels for each clause.
MCSymbol *LandingPadLabel; // Label at beginning of landing pad.
const Function *Personality; // Personality function.
std::vector<int> TypeIds; // List of type ids (filters negative)
@@ -331,11 +330,6 @@ public:
///
void addCleanup(MachineBasicBlock *LandingPad);
- /// Add a clause for a landing pad. Returns a new label for the clause. This
- /// is used by EH schemes that have more than one landing pad. In this case,
- /// each clause gets its own basic block.
- MCSymbol *addClauseForLandingPad(MachineBasicBlock *LandingPad);
-
/// getTypeIDFor - Return the type id for the specified typeinfo. This is
/// function wide.
unsigned getTypeIDFor(const GlobalValue *TI);
Modified: projects/clang360-import/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h
==============================================================================
--- projects/clang360-import/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/include/llvm/CodeGen/RegAllocPBQP.h Sat Feb 14 14:13:00 2015 (r278757)
@@ -248,7 +248,7 @@ public:
void setReductionState(ReductionState RS) { this->RS = RS; }
void handleAddEdge(const MatrixMetadata& MD, bool Transpose) {
- DeniedOpts += Transpose ? MD.getWorstCol() : MD.getWorstRow();
+ DeniedOpts += Transpose ? MD.getWorstRow() : MD.getWorstCol();
const bool* UnsafeOpts =
Transpose ? MD.getUnsafeCols() : MD.getUnsafeRows();
for (unsigned i = 0; i < NumOpts; ++i)
@@ -256,7 +256,7 @@ public:
}
void handleRemoveEdge(const MatrixMetadata& MD, bool Transpose) {
- DeniedOpts -= Transpose ? MD.getWorstCol() : MD.getWorstRow();
+ DeniedOpts -= Transpose ? MD.getWorstRow() : MD.getWorstCol();
const bool* UnsafeOpts =
Transpose ? MD.getUnsafeCols() : MD.getUnsafeRows();
for (unsigned i = 0; i < NumOpts; ++i)
Modified: projects/clang360-import/contrib/llvm/include/llvm/IR/Metadata.h
==============================================================================
--- projects/clang360-import/contrib/llvm/include/llvm/IR/Metadata.h Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/include/llvm/IR/Metadata.h Sat Feb 14 14:13:00 2015 (r278757)
@@ -693,6 +693,7 @@ public:
static AAMDNodes getMostGenericAA(const AAMDNodes &A, const AAMDNodes &B);
static MDNode *getMostGenericFPMath(MDNode *A, MDNode *B);
static MDNode *getMostGenericRange(MDNode *A, MDNode *B);
+ static MDNode *getMostGenericAliasScope(MDNode *A, MDNode *B);
};
/// \brief Uniquable metadata node.
Modified: projects/clang360-import/contrib/llvm/lib/Analysis/IPA/InlineCost.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Analysis/IPA/InlineCost.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/Analysis/IPA/InlineCost.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -52,7 +52,7 @@ class CallAnalyzer : public InstVisitor<
const TargetTransformInfo &TTI;
/// The cache of @llvm.assume intrinsics.
- AssumptionCache &AC;
+ AssumptionCacheTracker *ACT;
// The called function.
Function &F;
@@ -146,8 +146,8 @@ class CallAnalyzer : public InstVisitor<
public:
CallAnalyzer(const DataLayout *DL, const TargetTransformInfo &TTI,
- AssumptionCache &AC, Function &Callee, int Threshold)
- : DL(DL), TTI(TTI), AC(AC), F(Callee), Threshold(Threshold), Cost(0),
+ AssumptionCacheTracker *ACT, Function &Callee, int Threshold)
+ : DL(DL), TTI(TTI), ACT(ACT), F(Callee), Threshold(Threshold), Cost(0),
IsCallerRecursive(false), IsRecursiveCall(false),
ExposesReturnsTwice(false), HasDynamicAlloca(false),
ContainsNoDuplicateCall(false), HasReturn(false), HasIndirectBr(false),
@@ -783,7 +783,7 @@ bool CallAnalyzer::visitCallSite(CallSit
// during devirtualization and so we want to give it a hefty bonus for
// inlining, but cap that bonus in the event that inlining wouldn't pan
// out. Pretend to inline the function, with a custom threshold.
- CallAnalyzer CA(DL, TTI, AC, *F, InlineConstants::IndirectCallThreshold);
+ CallAnalyzer CA(DL, TTI, ACT, *F, InlineConstants::IndirectCallThreshold);
if (CA.analyzeCall(CS)) {
// We were able to inline the indirect call! Subtract the cost from the
// bonus we want to apply, but don't go below zero.
@@ -1110,7 +1110,7 @@ bool CallAnalyzer::analyzeCall(CallSite
// the ephemeral values multiple times (and they're completely determined by
// the callee, so this is purely duplicate work).
SmallPtrSet<const Value *, 32> EphValues;
- CodeMetrics::collectEphemeralValues(&F, &AC, EphValues);
+ CodeMetrics::collectEphemeralValues(&F, &ACT->getAssumptionCache(F), EphValues);
// The worklist of live basic blocks in the callee *after* inlining. We avoid
// adding basic blocks of the callee which can be proven to be dead for this
@@ -1310,7 +1310,7 @@ InlineCost InlineCostAnalysis::getInline
<< "...\n");
CallAnalyzer CA(Callee->getDataLayout(), *TTI,
- ACT->getAssumptionCache(*Callee), *Callee, Threshold);
+ ACT, *Callee, Threshold);
bool ShouldInline = CA.analyzeCall(CS);
DEBUG(CA.dump());
Modified: projects/clang360-import/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/Analysis/TypeBasedAliasAnalysis.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -623,8 +623,8 @@ void Instruction::getAAMetadata(AAMDNode
N.TBAA = getMetadata(LLVMContext::MD_tbaa);
if (Merge)
- N.Scope =
- MDNode::intersect(N.Scope, getMetadata(LLVMContext::MD_alias_scope));
+ N.Scope = MDNode::getMostGenericAliasScope(
+ N.Scope, getMetadata(LLVMContext::MD_alias_scope));
else
N.Scope = getMetadata(LLVMContext::MD_alias_scope);
Modified: projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/Bitcode/Reader/BitReader.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -9,9 +9,11 @@
#include "llvm-c/BitReader.h"
#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/IR/DiagnosticPrinter.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
#include <cstring>
#include <string>
@@ -30,11 +32,20 @@ LLVMBool LLVMParseBitcodeInContext(LLVMC
LLVMMemoryBufferRef MemBuf,
LLVMModuleRef *OutModule,
char **OutMessage) {
- ErrorOr<Module *> ModuleOrErr =
- parseBitcodeFile(unwrap(MemBuf)->getMemBufferRef(), *unwrap(ContextRef));
- if (std::error_code EC = ModuleOrErr.getError()) {
- if (OutMessage)
- *OutMessage = strdup(EC.message().c_str());
+ MemoryBufferRef Buf = unwrap(MemBuf)->getMemBufferRef();
+ LLVMContext &Ctx = *unwrap(ContextRef);
+
+ std::string Message;
+ raw_string_ostream Stream(Message);
+ DiagnosticPrinterRawOStream DP(Stream);
+
+ ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(
+ Buf, Ctx, [&](const DiagnosticInfo &DI) { DI.print(DP); });
+ if (ModuleOrErr.getError()) {
+ if (OutMessage) {
+ Stream.flush();
+ *OutMessage = strdup(Message.c_str());
+ }
*OutModule = wrap((Module*)nullptr);
return 1;
}
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -121,8 +121,7 @@ computeActionsTable(const SmallVectorImp
for (unsigned J = NumShared, M = TypeIds.size(); J != M; ++J) {
int TypeID = TypeIds[J];
assert(-1 - TypeID < (int)FilterOffsets.size() && "Unknown filter id!");
- int ValueForTypeID =
- isFilterEHSelector(TypeID) ? FilterOffsets[-1 - TypeID] : TypeID;
+ int ValueForTypeID = TypeID < 0 ? FilterOffsets[-1 - TypeID] : TypeID;
unsigned SizeTypeID = getSLEB128Size(ValueForTypeID);
int NextAction = SizeAction ? -(SizeAction + SizeTypeID) : 0;
@@ -270,14 +269,14 @@ computeCallSiteTable(SmallVectorImpl<Cal
CallSiteEntry Site = {
BeginLabel,
LastLabel,
- LandingPad,
+ LandingPad->LandingPadLabel,
FirstActions[P.PadIndex]
};
// Try to merge with the previous call-site. SJLJ doesn't do this
if (PreviousIsInvoke && !IsSJLJ) {
CallSiteEntry &Prev = CallSites.back();
- if (Site.LPad == Prev.LPad && Site.Action == Prev.Action) {
+ if (Site.PadLabel == Prev.PadLabel && Site.Action == Prev.Action) {
// Extend the range of the previous entry.
Prev.EndLabel = Site.EndLabel;
continue;
@@ -577,15 +576,15 @@ void EHStreamer::emitExceptionTable() {
// Offset of the landing pad, counted in 16-byte bundles relative to the
// @LPStart address.
- if (!S.LPad) {
+ if (!S.PadLabel) {
if (VerboseAsm)
Asm->OutStreamer.AddComment(" has no landing pad");
Asm->OutStreamer.EmitIntValue(0, 4/*size*/);
} else {
if (VerboseAsm)
Asm->OutStreamer.AddComment(Twine(" jumps to ") +
- S.LPad->LandingPadLabel->getName());
- Asm->EmitLabelDifference(S.LPad->LandingPadLabel, EHFuncBeginSym, 4);
+ S.PadLabel->getName());
+ Asm->EmitLabelDifference(S.PadLabel, EHFuncBeginSym, 4);
}
// Offset of the first associated action record, relative to the start of
@@ -682,7 +681,7 @@ void EHStreamer::emitTypeInfos(unsigned
unsigned TypeID = *I;
if (VerboseAsm) {
--Entry;
- if (isFilterEHSelector(TypeID))
+ if (TypeID != 0)
Asm->OutStreamer.AddComment("FilterInfo " + Twine(Entry));
}
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.h
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.h Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/EHStreamer.h Sat Feb 14 14:13:00 2015 (r278757)
@@ -23,8 +23,6 @@ class MachineModuleInfo;
class MachineInstr;
class MachineFunction;
class AsmPrinter;
-class MCSymbol;
-class MCSymbolRefExpr;
template <typename T>
class SmallVectorImpl;
@@ -62,11 +60,11 @@ protected:
/// Structure describing an entry in the call-site table.
struct CallSiteEntry {
// The 'try-range' is BeginLabel .. EndLabel.
- MCSymbol *BeginLabel; // Null indicates the start of the function.
- MCSymbol *EndLabel; // Null indicates the end of the function.
+ MCSymbol *BeginLabel; // zero indicates the start of the function.
+ MCSymbol *EndLabel; // zero indicates the end of the function.
- // LPad contains the landing pad start labels.
- const LandingPadInfo *LPad; // Null indicates that there is no landing pad.
+ // The landing pad starts at PadLabel.
+ MCSymbol *PadLabel; // zero indicates that there is no landing pad.
unsigned Action;
};
@@ -114,13 +112,6 @@ protected:
virtual void emitTypeInfos(unsigned TTypeEncoding);
- // Helpers for for identifying what kind of clause an EH typeid or selector
- // corresponds to. Negative selectors are for filter clauses, the zero
- // selector is for cleanups, and positive selectors are for catch clauses.
- static bool isFilterEHSelector(int Selector) { return Selector < 0; }
- static bool isCleanupEHSelector(int Selector) { return Selector == 0; }
- static bool isCatchEHSelector(int Selector) { return Selector > 0; }
-
public:
EHStreamer(AsmPrinter *A);
virtual ~EHStreamer();
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -99,156 +99,9 @@ void Win64Exception::endFunction(const M
if (shouldEmitPersonality) {
Asm->OutStreamer.PushSection();
-
- // Emit an UNWIND_INFO struct describing the prologue.
Asm->OutStreamer.EmitWinEHHandlerData();
-
- // Emit either MSVC-compatible tables or the usual Itanium-style LSDA after
- // the UNWIND_INFO struct.
- if (Asm->MAI->getExceptionHandlingType() == ExceptionHandling::MSVC) {
- const Function *Per = MMI->getPersonalities()[MMI->getPersonalityIndex()];
- if (Per->getName() == "__C_specific_handler")
- emitCSpecificHandlerTable();
- else
- report_fatal_error(Twine("unexpected personality function: ") +
- Per->getName());
- } else {
- emitExceptionTable();
- }
-
+ emitExceptionTable();
Asm->OutStreamer.PopSection();
}
Asm->OutStreamer.EmitWinCFIEndProc();
}
-
-const MCSymbolRefExpr *Win64Exception::createImageRel32(const MCSymbol *Value) {
- return MCSymbolRefExpr::Create(Value, MCSymbolRefExpr::VK_COFF_IMGREL32,
- Asm->OutContext);
-}
-
-/// Emit the language-specific data that __C_specific_handler expects. This
-/// handler lives in the x64 Microsoft C runtime and allows catching or cleaning
-/// up after faults with __try, __except, and __finally. The typeinfo values
-/// are not really RTTI data, but pointers to filter functions that return an
-/// integer (1, 0, or -1) indicating how to handle the exception. For __finally
-/// blocks and other cleanups, the landing pad label is zero, and the filter
-/// function is actually a cleanup handler with the same prototype. A catch-all
-/// entry is modeled with a null filter function field and a non-zero landing
-/// pad label.
-///
-/// Possible filter function return values:
-/// EXCEPTION_EXECUTE_HANDLER (1):
-/// Jump to the landing pad label after cleanups.
-/// EXCEPTION_CONTINUE_SEARCH (0):
-/// Continue searching this table or continue unwinding.
-/// EXCEPTION_CONTINUE_EXECUTION (-1):
-/// Resume execution at the trapping PC.
-///
-/// Inferred table structure:
-/// struct Table {
-/// int NumEntries;
-/// struct Entry {
-/// imagerel32 LabelStart;
-/// imagerel32 LabelEnd;
-/// imagerel32 FilterOrFinally; // Zero means catch-all.
-/// imagerel32 LabelLPad; // Zero means __finally.
-/// } Entries[NumEntries];
-/// };
-void Win64Exception::emitCSpecificHandlerTable() {
- const std::vector<LandingPadInfo> &PadInfos = MMI->getLandingPads();
-
- // Simplifying assumptions for first implementation:
- // - Cleanups are not implemented.
- // - Filters are not implemented.
-
- // The Itanium LSDA table sorts similar landing pads together to simplify the
- // actions table, but we don't need that.
- SmallVector<const LandingPadInfo *, 64> LandingPads;
- LandingPads.reserve(PadInfos.size());
- for (const auto &LP : PadInfos)
- LandingPads.push_back(&LP);
-
- // Compute label ranges for call sites as we would for the Itanium LSDA, but
- // use an all zero action table because we aren't using these actions.
- SmallVector<unsigned, 64> FirstActions;
- FirstActions.resize(LandingPads.size());
- SmallVector<CallSiteEntry, 64> CallSites;
- computeCallSiteTable(CallSites, LandingPads, FirstActions);
-
- MCSymbol *EHFuncBeginSym =
- Asm->GetTempSymbol("eh_func_begin", Asm->getFunctionNumber());
- MCSymbol *EHFuncEndSym =
- Asm->GetTempSymbol("eh_func_end", Asm->getFunctionNumber());
-
- // Emit the number of table entries.
- unsigned NumEntries = 0;
- for (const CallSiteEntry &CSE : CallSites) {
- if (!CSE.LPad)
- continue; // Ignore gaps.
- for (int Selector : CSE.LPad->TypeIds) {
- // Ignore C++ filter clauses in SEH.
- // FIXME: Implement cleanup clauses.
- if (isCatchEHSelector(Selector))
- ++NumEntries;
- }
- }
- Asm->OutStreamer.EmitIntValue(NumEntries, 4);
-
- // Emit the four-label records for each call site entry. The table has to be
- // sorted in layout order, and the call sites should already be sorted.
- for (const CallSiteEntry &CSE : CallSites) {
- // Ignore gaps. Unlike the Itanium model, unwinding through a frame without
- // an EH table entry will propagate the exception rather than terminating
- // the program.
- if (!CSE.LPad)
- continue;
- const LandingPadInfo *LPad = CSE.LPad;
-
- // Compute the label range. We may reuse the function begin and end labels
- // rather than forming new ones.
- const MCExpr *Begin =
- createImageRel32(CSE.BeginLabel ? CSE.BeginLabel : EHFuncBeginSym);
- const MCExpr *End;
- if (CSE.EndLabel) {
- // The interval is half-open, so we have to add one to include the return
- // address of the last invoke in the range.
- End = MCBinaryExpr::CreateAdd(createImageRel32(CSE.EndLabel),
- MCConstantExpr::Create(1, Asm->OutContext),
- Asm->OutContext);
- } else {
- End = createImageRel32(EHFuncEndSym);
- }
-
- // These aren't really type info globals, they are actually pointers to
- // filter functions ordered by selector. The zero selector is used for
- // cleanups, so slot zero corresponds to selector 1.
- const std::vector<const GlobalValue *> &SelectorToFilter = MMI->getTypeInfos();
-
- // Do a parallel iteration across typeids and clause labels, skipping filter
- // clauses.
- assert(LPad->TypeIds.size() == LPad->ClauseLabels.size());
- for (size_t I = 0, E = LPad->TypeIds.size(); I < E; ++I) {
- // AddLandingPadInfo stores the clauses in reverse, but there is a FIXME
- // to change that.
- int Selector = LPad->TypeIds[E - I - 1];
- MCSymbol *ClauseLabel = LPad->ClauseLabels[I];
-
- // Ignore C++ filter clauses in SEH.
- // FIXME: Implement cleanup clauses.
- if (!isCatchEHSelector(Selector))
- continue;
-
- Asm->OutStreamer.EmitValue(Begin, 4);
- Asm->OutStreamer.EmitValue(End, 4);
- if (isCatchEHSelector(Selector)) {
- assert(unsigned(Selector - 1) < SelectorToFilter.size());
- const GlobalValue *TI = SelectorToFilter[Selector - 1];
- if (TI) // Emit the filter function pointer.
- Asm->OutStreamer.EmitValue(createImageRel32(Asm->getSymbol(TI)), 4);
- else // Otherwise, this is a "catch i8* null", or catch all.
- Asm->OutStreamer.EmitIntValue(0, 4);
- }
- Asm->OutStreamer.EmitValue(createImageRel32(ClauseLabel), 4);
- }
- }
-}
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.h
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.h Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/AsmPrinter/Win64Exception.h Sat Feb 14 14:13:00 2015 (r278757)
@@ -29,10 +29,6 @@ class Win64Exception : public EHStreamer
/// Per-function flag to indicate if frame moves info should be emitted.
bool shouldEmitMoves;
- void emitCSpecificHandlerTable();
-
- const MCSymbolRefExpr *createImageRel32(const MCSymbol *Value);
-
public:
//===--------------------------------------------------------------------===//
// Main entry points.
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -452,14 +452,6 @@ void MachineModuleInfo::addCleanup(Machi
LP.TypeIds.push_back(0);
}
-MCSymbol *
-MachineModuleInfo::addClauseForLandingPad(MachineBasicBlock *LandingPad) {
- MCSymbol *ClauseLabel = Context.CreateTempSymbol();
- LandingPadInfo &LP = getOrCreateLandingPadInfo(LandingPad);
- LP.ClauseLabels.push_back(ClauseLabel);
- return ClauseLabel;
-}
-
/// TidyLandingPads - Remap landing pad labels and remove any deleted landing
/// pads.
void MachineModuleInfo::TidyLandingPads(DenseMap<MCSymbol*, uintptr_t> *LPMap) {
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/Passes.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/Passes.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/Passes.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -449,9 +449,9 @@ void TargetPassConfig::addPassesToHandle
case ExceptionHandling::DwarfCFI:
case ExceptionHandling::ARM:
case ExceptionHandling::ItaniumWinEH:
- case ExceptionHandling::MSVC: // FIXME: Needs preparation.
addPass(createDwarfEHPass(TM));
break;
+ case ExceptionHandling::MSVC: // FIXME: Add preparation.
case ExceptionHandling::None:
addPass(createLowerInvokePass());
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -6544,19 +6544,15 @@ SDValue DAGCombiner::visitBITCAST(SDNode
// If the input is a constant, let getNode fold it.
if (isa<ConstantSDNode>(N0) || isa<ConstantFPSDNode>(N0)) {
- SDValue Res = DAG.getNode(ISD::BITCAST, SDLoc(N), VT, N0);
- if (Res.getNode() != N) {
- if (!LegalOperations ||
- TLI.isOperationLegal(Res.getNode()->getOpcode(), VT))
- return Res;
-
- // Folding it resulted in an illegal node, and it's too late to
- // do that. Clean up the old node and forego the transformation.
- // Ideally this won't happen very often, because instcombine
- // and the earlier dagcombine runs (where illegal nodes are
- // permitted) should have folded most of them already.
- deleteAndRecombine(Res.getNode());
- }
+ // If we can't allow illegal operations, we need to check that this is just
+ // a fp -> int or int -> conversion and that the resulting operation will
+ // be legal.
+ if (!LegalOperations ||
+ (isa<ConstantSDNode>(N0) && VT.isFloatingPoint() && !VT.isVector() &&
+ TLI.isOperationLegal(ISD::ConstantFP, VT)) ||
+ (isa<ConstantFPSDNode>(N0) && VT.isInteger() && !VT.isVector() &&
+ TLI.isOperationLegal(ISD::Constant, VT)))
+ return DAG.getNode(ISD::BITCAST, SDLoc(N), VT, N0);
}
// (conv (conv x, t1), t2) -> (conv x, t2)
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -390,7 +390,8 @@ SDValue VectorLegalizer::Promote(SDValue
if (Op.getOperand(j)
.getValueType()
.getVectorElementType()
- .isFloatingPoint())
+ .isFloatingPoint() &&
+ NVT.isVector() && NVT.getVectorElementType().isFloatingPoint())
Operands[j] = DAG.getNode(ISD::FP_EXTEND, dl, NVT, Op.getOperand(j));
else
Operands[j] = DAG.getNode(ISD::BITCAST, dl, NVT, Op.getOperand(j));
@@ -399,8 +400,9 @@ SDValue VectorLegalizer::Promote(SDValue
}
Op = DAG.getNode(Op.getOpcode(), dl, NVT, Operands);
- if (VT.isFloatingPoint() ||
- (VT.isVector() && VT.getVectorElementType().isFloatingPoint()))
+ if ((VT.isFloatingPoint() && NVT.isFloatingPoint()) ||
+ (VT.isVector() && VT.getVectorElementType().isFloatingPoint() &&
+ NVT.isVector() && NVT.getVectorElementType().isFloatingPoint()))
return DAG.getNode(ISD::FP_ROUND, dl, VT, Op, DAG.getIntPtrConstant(0));
else
return DAG.getNode(ISD::BITCAST, dl, VT, Op);
@@ -554,9 +556,9 @@ SDValue VectorLegalizer::ExpandLoad(SDVa
BitOffset += SrcEltBits;
if (BitOffset >= WideBits) {
WideIdx++;
- Offset -= WideBits;
- if (Offset > 0) {
- ShAmt = DAG.getConstant(SrcEltBits - Offset,
+ BitOffset -= WideBits;
+ if (BitOffset > 0) {
+ ShAmt = DAG.getConstant(SrcEltBits - BitOffset,
TLI.getShiftAmountTy(WideVT));
Hi = DAG.getNode(ISD::SHL, dl, WideVT, LoadVals[WideIdx], ShAmt);
Hi = DAG.getNode(ISD::AND, dl, WideVT, Hi, SrcEltBitMask);
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -2071,14 +2071,10 @@ void SelectionDAGBuilder::visitLandingPa
// Get the two live-in registers as SDValues. The physregs have already been
// copied into virtual registers.
SDValue Ops[2];
- if (FuncInfo.ExceptionPointerVirtReg) {
- Ops[0] = DAG.getZExtOrTrunc(
- DAG.getCopyFromReg(DAG.getEntryNode(), getCurSDLoc(),
- FuncInfo.ExceptionPointerVirtReg, TLI.getPointerTy()),
- getCurSDLoc(), ValueVTs[0]);
- } else {
- Ops[0] = DAG.getConstant(0, TLI.getPointerTy());
- }
+ Ops[0] = DAG.getZExtOrTrunc(
+ DAG.getCopyFromReg(DAG.getEntryNode(), getCurSDLoc(),
+ FuncInfo.ExceptionPointerVirtReg, TLI.getPointerTy()),
+ getCurSDLoc(), ValueVTs[0]);
Ops[1] = DAG.getZExtOrTrunc(
DAG.getCopyFromReg(DAG.getEntryNode(), getCurSDLoc(),
FuncInfo.ExceptionSelectorVirtReg, TLI.getPointerTy()),
@@ -2090,27 +2086,6 @@ void SelectionDAGBuilder::visitLandingPa
setValue(&LP, Res);
}
-unsigned
-SelectionDAGBuilder::visitLandingPadClauseBB(GlobalValue *ClauseGV,
- MachineBasicBlock *LPadBB) {
- SDValue Chain = getControlRoot();
-
- // Get the typeid that we will dispatch on later.
- const TargetLowering &TLI = DAG.getTargetLoweringInfo();
- const TargetRegisterClass *RC = TLI.getRegClassFor(TLI.getPointerTy());
- unsigned VReg = FuncInfo.MF->getRegInfo().createVirtualRegister(RC);
- unsigned TypeID = DAG.getMachineFunction().getMMI().getTypeIDFor(ClauseGV);
- SDValue Sel = DAG.getConstant(TypeID, TLI.getPointerTy());
- Chain = DAG.getCopyToReg(Chain, getCurSDLoc(), VReg, Sel);
-
- // Branch to the main landing pad block.
- MachineBasicBlock *ClauseMBB = FuncInfo.MBB;
- ClauseMBB->addSuccessor(LPadBB);
- DAG.setRoot(DAG.getNode(ISD::BR, getCurSDLoc(), MVT::Other, Chain,
- DAG.getBasicBlock(LPadBB)));
- return VReg;
-}
-
/// handleSmallSwitchCaseRange - Emit a series of specific tests (suitable for
/// small case ranges).
bool SelectionDAGBuilder::handleSmallSwitchRange(CaseRec& CR,
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h Sat Feb 14 14:13:00 2015 (r278757)
@@ -713,8 +713,6 @@ public:
void visitJumpTable(JumpTable &JT);
void visitJumpTableHeader(JumpTable &JT, JumpTableHeader &JTH,
MachineBasicBlock *SwitchBB);
- unsigned visitLandingPadClauseBB(GlobalValue *ClauseGV,
- MachineBasicBlock *LPadMBB);
private:
// These all get lowered before this pass.
Modified: projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -19,7 +19,6 @@
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Analysis/BranchProbabilityInfo.h"
#include "llvm/Analysis/CFG.h"
-#include "llvm/CodeGen/Analysis.h"
#include "llvm/CodeGen/FastISel.h"
#include "llvm/CodeGen/FunctionLoweringInfo.h"
#include "llvm/CodeGen/GCMetadata.h"
@@ -41,7 +40,6 @@
#include "llvm/IR/Intrinsics.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
-#include "llvm/MC/MCAsmInfo.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
@@ -909,8 +907,6 @@ void SelectionDAGISel::DoInstructionSele
void SelectionDAGISel::PrepareEHLandingPad() {
MachineBasicBlock *MBB = FuncInfo->MBB;
- const TargetRegisterClass *PtrRC = TLI->getRegClassFor(TLI->getPointerTy());
-
// Add a label to mark the beginning of the landing pad. Deletion of the
// landing pad can thus be detected via the MachineModuleInfo.
MCSymbol *Label = MF->getMMI().addLandingPad(MBB);
@@ -922,66 +918,8 @@ void SelectionDAGISel::PrepareEHLandingP
BuildMI(*MBB, FuncInfo->InsertPt, SDB->getCurDebugLoc(), II)
.addSym(Label);
- if (TM.getMCAsmInfo()->getExceptionHandlingType() ==
- ExceptionHandling::MSVC) {
- // Make virtual registers and a series of labels that fill in values for the
- // clauses.
- auto &RI = MF->getRegInfo();
- FuncInfo->ExceptionSelectorVirtReg = RI.createVirtualRegister(PtrRC);
-
- // Get all invoke BBs that will unwind into the clause BBs.
- SmallVector<MachineBasicBlock *, 4> InvokeBBs(MBB->pred_begin(),
- MBB->pred_end());
-
- // Emit separate machine basic blocks with separate labels for each clause
- // before the main landing pad block.
- const BasicBlock *LLVMBB = MBB->getBasicBlock();
- const LandingPadInst *LPadInst = LLVMBB->getLandingPadInst();
- MachineInstrBuilder SelectorPHI = BuildMI(
- *MBB, MBB->begin(), SDB->getCurDebugLoc(), TII->get(TargetOpcode::PHI),
- FuncInfo->ExceptionSelectorVirtReg);
- for (unsigned I = 0, E = LPadInst->getNumClauses(); I != E; ++I) {
- MachineBasicBlock *ClauseBB = MF->CreateMachineBasicBlock(LLVMBB);
- MF->insert(MBB, ClauseBB);
-
- // Add the edge from the invoke to the clause.
- for (MachineBasicBlock *InvokeBB : InvokeBBs)
- InvokeBB->addSuccessor(ClauseBB);
-
- // Mark the clause as a landing pad or MI passes will delete it.
- ClauseBB->setIsLandingPad();
-
- GlobalValue *ClauseGV = ExtractTypeInfo(LPadInst->getClause(I));
-
- // Start the BB with a label.
- MCSymbol *ClauseLabel = MF->getMMI().addClauseForLandingPad(MBB);
- BuildMI(*ClauseBB, ClauseBB->begin(), SDB->getCurDebugLoc(), II)
- .addSym(ClauseLabel);
-
- // Construct a simple BB that defines a register with the typeid constant.
- FuncInfo->MBB = ClauseBB;
- FuncInfo->InsertPt = ClauseBB->end();
- unsigned VReg = SDB->visitLandingPadClauseBB(ClauseGV, MBB);
- CurDAG->setRoot(SDB->getRoot());
- SDB->clear();
- CodeGenAndEmitDAG();
-
- // Add the typeid virtual register to the phi in the main landing pad.
- SelectorPHI.addReg(VReg).addMBB(ClauseBB);
- }
-
- // Remove the edge from the invoke to the lpad.
- for (MachineBasicBlock *InvokeBB : InvokeBBs)
- InvokeBB->removeSuccessor(MBB);
-
- // Restore FuncInfo back to its previous state and select the main landing
- // pad block.
- FuncInfo->MBB = MBB;
- FuncInfo->InsertPt = MBB->end();
- return;
- }
-
// Mark exception register as live in.
+ const TargetRegisterClass *PtrRC = TLI->getRegClassFor(TLI->getPointerTy());
if (unsigned Reg = TLI->getExceptionPointerRegister())
FuncInfo->ExceptionPointerVirtReg = MBB->addLiveIn(Reg, PtrRC);
Modified: projects/clang360-import/contrib/llvm/lib/IR/DebugInfo.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/IR/DebugInfo.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/IR/DebugInfo.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -525,12 +525,15 @@ bool DISubprogram::Verify() const {
while ((IA = DL.getInlinedAt()))
DL = DebugLoc::getFromDILocation(IA);
DL.getScopeAndInlinedAt(Scope, IA);
+ if (!Scope)
+ return false;
assert(!IA);
while (!DIDescriptor(Scope).isSubprogram()) {
DILexicalBlockFile D(Scope);
Scope = D.isLexicalBlockFile()
? D.getScope()
: DebugLoc::getFromDILexicalBlock(Scope).getScope();
+ assert(Scope && "lexical block file has no scope");
}
if (!DISubprogram(Scope).describes(F))
return false;
Modified: projects/clang360-import/contrib/llvm/lib/IR/Metadata.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/IR/Metadata.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/IR/Metadata.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -826,6 +826,28 @@ MDNode *MDNode::intersect(MDNode *A, MDN
return getOrSelfReference(A->getContext(), MDs);
}
+MDNode *MDNode::getMostGenericAliasScope(MDNode *A, MDNode *B) {
+ if (!A || !B)
+ return nullptr;
+
+ SmallVector<Metadata *, 4> MDs(B->op_begin(), B->op_end());
+ for (unsigned i = 0, ie = A->getNumOperands(); i != ie; ++i) {
+ Metadata *MD = A->getOperand(i);
+ bool insert = true;
+ for (unsigned j = 0, je = B->getNumOperands(); j != je; ++j)
+ if (MD == B->getOperand(j)) {
+ insert = false;
+ break;
+ }
+ if (insert)
+ MDs.push_back(MD);
+ }
+
+ // FIXME: This preserves long-standing behaviour, but is it really the right
+ // behaviour? Or was that an unintended side-effect of node uniquing?
+ return getOrSelfReference(A->getContext(), MDs);
+}
+
MDNode *MDNode::getMostGenericFPMath(MDNode *A, MDNode *B) {
if (!A || !B)
return nullptr;
Modified: projects/clang360-import/contrib/llvm/lib/IR/Type.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/IR/Type.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/IR/Type.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -708,9 +708,10 @@ VectorType::VectorType(Type *ElType, uns
VectorType *VectorType::get(Type *elementType, unsigned NumElements) {
Type *ElementType = const_cast<Type*>(elementType);
assert(NumElements > 0 && "#Elements of a VectorType must be greater than 0");
- assert(isValidElementType(ElementType) &&
- "Elements of a VectorType must be a primitive type");
-
+ assert(isValidElementType(ElementType) && "Element type of a VectorType must "
+ "be an integer, floating point, or "
+ "pointer type.");
+
LLVMContextImpl *pImpl = ElementType->getContext().pImpl;
VectorType *&Entry = ElementType->getContext().pImpl
->VectorTypes[std::make_pair(ElementType, NumElements)];
Modified: projects/clang360-import/contrib/llvm/lib/MC/MCSectionCOFF.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/MC/MCSectionCOFF.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/MC/MCSectionCOFF.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -47,6 +47,10 @@ void MCSectionCOFF::PrintSwitchToSection
}
OS << "\t.section\t" << getSectionName() << ",\"";
+ if (getCharacteristics() & COFF::IMAGE_SCN_CNT_INITIALIZED_DATA)
+ OS << 'd';
+ if (getCharacteristics() & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA)
+ OS << 'b';
if (getCharacteristics() & COFF::IMAGE_SCN_MEM_EXECUTE)
OS << 'x';
if (getCharacteristics() & COFF::IMAGE_SCN_MEM_WRITE)
@@ -55,10 +59,6 @@ void MCSectionCOFF::PrintSwitchToSection
OS << 'r';
else
OS << 'y';
- if (getCharacteristics() & COFF::IMAGE_SCN_CNT_INITIALIZED_DATA)
- OS << 'd';
- if (getCharacteristics() & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA)
- OS << 'b';
if (getCharacteristics() & COFF::IMAGE_SCN_LNK_REMOVE)
OS << 'n';
if (getCharacteristics() & COFF::IMAGE_SCN_MEM_SHARED)
Modified: projects/clang360-import/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -710,17 +710,22 @@ void WinCOFFObjectWriter::RecordRelocati
CrossSection = &Symbol.getSection() != &B->getSection();
// Offset of the symbol in the section
- int64_t a = Layout.getSymbolOffset(&B_SD);
+ int64_t OffsetOfB = Layout.getSymbolOffset(&B_SD);
- // Offset of the relocation in the section
- int64_t b = Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
-
- FixedValue = b - a;
// In the case where we have SymbA and SymB, we just need to store the delta
// between the two symbols. Update FixedValue to account for the delta, and
// skip recording the relocation.
- if (!CrossSection)
+ if (!CrossSection) {
+ int64_t OffsetOfA = Layout.getSymbolOffset(&A_SD);
+ FixedValue = (OffsetOfA - OffsetOfB) + Target.getConstant();
return;
+ }
+
+ // Offset of the relocation in the section
+ int64_t OffsetOfRelocation =
+ Layout.getFragmentOffset(Fragment) + Fixup.getOffset();
+
+ FixedValue = OffsetOfRelocation - OffsetOfB;
} else {
FixedValue = Target.getConstant();
}
Modified: projects/clang360-import/contrib/llvm/lib/Support/regcomp.c
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Support/regcomp.c Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/Support/regcomp.c Sat Feb 14 14:13:00 2015 (r278757)
@@ -49,6 +49,14 @@
#include "regcclass.h"
#include "regcname.h"
+#include "llvm/Config/config.h"
+#if HAVE_STDINT_H
+#include <stdint.h>
+#else
+/* Pessimistically bound memory use */
+#define SIZE_MAX UINT_MAX
+#endif
+
/*
* parse structure, passed up and down to avoid global variables and
* other clumsinesses
@@ -1069,6 +1077,8 @@ allocset(struct parse *p)
p->ncsalloc += CHAR_BIT;
nc = p->ncsalloc;
+ if (nc > SIZE_MAX / sizeof(cset))
+ goto nomem;
assert(nc % CHAR_BIT == 0);
nbytes = nc / CHAR_BIT * css;
@@ -1412,6 +1422,11 @@ enlarge(struct parse *p, sopno size)
if (p->ssize >= size)
return;
+ if ((unsigned long)size > SIZE_MAX / sizeof(sop)) {
+ SETERROR(REG_ESPACE);
+ return;
+ }
+
sp = (sop *)realloc(p->strip, size*sizeof(sop));
if (sp == NULL) {
SETERROR(REG_ESPACE);
@@ -1428,6 +1443,12 @@ static void
stripsnug(struct parse *p, struct re_guts *g)
{
g->nstates = p->slen;
+ if ((unsigned long)p->slen > SIZE_MAX / sizeof(sop)) {
+ g->strip = p->strip;
+ SETERROR(REG_ESPACE);
+ return;
+ }
+
g->strip = (sop *)realloc((char *)p->strip, p->slen * sizeof(sop));
if (g->strip == NULL) {
SETERROR(REG_ESPACE);
Modified: projects/clang360-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -6287,6 +6287,8 @@ static SDValue EmitVectorComparison(SDVa
AArch64CC::CondCode CC, bool NoNans, EVT VT,
SDLoc dl, SelectionDAG &DAG) {
EVT SrcVT = LHS.getValueType();
+ assert(VT.getSizeInBits() == SrcVT.getSizeInBits() &&
+ "function only supposed to emit natural comparisons");
BuildVectorSDNode *BVN = dyn_cast<BuildVectorSDNode>(RHS.getNode());
APInt CnstBits(VT.getSizeInBits(), 0);
@@ -6381,13 +6383,15 @@ SDValue AArch64TargetLowering::LowerVSET
ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(2))->get();
SDValue LHS = Op.getOperand(0);
SDValue RHS = Op.getOperand(1);
+ EVT CmpVT = LHS.getValueType().changeVectorElementTypeToInteger();
SDLoc dl(Op);
if (LHS.getValueType().getVectorElementType().isInteger()) {
assert(LHS.getValueType() == RHS.getValueType());
AArch64CC::CondCode AArch64CC = changeIntCCToAArch64CC(CC);
- return EmitVectorComparison(LHS, RHS, AArch64CC, false, Op.getValueType(),
- dl, DAG);
+ SDValue Cmp =
+ EmitVectorComparison(LHS, RHS, AArch64CC, false, CmpVT, dl, DAG);
+ return DAG.getSExtOrTrunc(Cmp, dl, Op.getValueType());
}
assert(LHS.getValueType().getVectorElementType() == MVT::f32 ||
@@ -6401,19 +6405,21 @@ SDValue AArch64TargetLowering::LowerVSET
bool NoNaNs = getTargetMachine().Options.NoNaNsFPMath;
SDValue Cmp =
- EmitVectorComparison(LHS, RHS, CC1, NoNaNs, Op.getValueType(), dl, DAG);
+ EmitVectorComparison(LHS, RHS, CC1, NoNaNs, CmpVT, dl, DAG);
if (!Cmp.getNode())
return SDValue();
if (CC2 != AArch64CC::AL) {
SDValue Cmp2 =
- EmitVectorComparison(LHS, RHS, CC2, NoNaNs, Op.getValueType(), dl, DAG);
+ EmitVectorComparison(LHS, RHS, CC2, NoNaNs, CmpVT, dl, DAG);
if (!Cmp2.getNode())
return SDValue();
- Cmp = DAG.getNode(ISD::OR, dl, Cmp.getValueType(), Cmp, Cmp2);
+ Cmp = DAG.getNode(ISD::OR, dl, CmpVT, Cmp, Cmp2);
}
+ Cmp = DAG.getSExtOrTrunc(Cmp, dl, Op.getValueType());
+
if (ShouldInvert)
return Cmp = DAG.getNOT(dl, Cmp, Cmp.getValueType());
Modified: projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -2400,7 +2400,8 @@ optimizeCompareInstr(MachineInstr *CmpIn
else if (MI->getParent() != CmpInstr->getParent() || CmpValue != 0) {
// Conservatively refuse to convert an instruction which isn't in the same
// BB as the comparison.
- // For CMPri, we need to check Sub, thus we can't return here.
+ // For CMPri w/ CmpValue != 0, a Sub may still be a candidate.
+ // Thus we cannot return here.
if (CmpInstr->getOpcode() == ARM::CMPri ||
CmpInstr->getOpcode() == ARM::t2CMPri)
MI = nullptr;
@@ -2479,8 +2480,8 @@ optimizeCompareInstr(MachineInstr *CmpIn
case ARM::t2EORrr:
case ARM::t2EORri: {
// Scan forward for the use of CPSR
- // When checking against MI: if it's a conditional code requires
- // checking of V bit, then this is not safe to do.
+ // When checking against MI: if it's a conditional code that requires
+ // checking of the V bit or C bit, then this is not safe to do.
// It is safe to remove CmpInstr if CPSR is redefined or killed.
// If we are done with the basic block, we need to check whether CPSR is
// live-out.
@@ -2547,19 +2548,30 @@ optimizeCompareInstr(MachineInstr *CmpIn
OperandsToUpdate.push_back(
std::make_pair(&((*I).getOperand(IO - 1)), NewCC));
}
- } else
+ } else {
+ // No Sub, so this is x = <op> y, z; cmp x, 0.
switch (CC) {
- default:
+ case ARMCC::EQ: // Z
+ case ARMCC::NE: // Z
+ case ARMCC::MI: // N
+ case ARMCC::PL: // N
+ case ARMCC::AL: // none
// CPSR can be used multiple times, we should continue.
break;
- case ARMCC::VS:
- case ARMCC::VC:
- case ARMCC::GE:
- case ARMCC::LT:
- case ARMCC::GT:
- case ARMCC::LE:
+ case ARMCC::HS: // C
+ case ARMCC::LO: // C
+ case ARMCC::VS: // V
+ case ARMCC::VC: // V
+ case ARMCC::HI: // C Z
+ case ARMCC::LS: // C Z
+ case ARMCC::GE: // N V
+ case ARMCC::LT: // N V
+ case ARMCC::GT: // Z N V
+ case ARMCC::LE: // Z N V
+ // The instruction uses the V bit or C bit which is not safe.
return false;
}
+ }
}
}
Modified: projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp Sat Feb 14 13:12:03 2015 (r278756)
+++ projects/clang360-import/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp Sat Feb 14 14:13:00 2015 (r278757)
@@ -565,7 +565,6 @@ ARMTargetLowering::ARMTargetLowering(con
setTargetDAGCombine(ISD::FP_TO_SINT);
setTargetDAGCombine(ISD::FP_TO_UINT);
setTargetDAGCombine(ISD::FDIV);
- setTargetDAGCombine(ISD::LOAD);
// It is legal to extload from v4i8 to v4i16 or v4i32.
MVT Tys[6] = {MVT::v8i8, MVT::v4i8, MVT::v2i8,
@@ -4488,6 +4487,7 @@ static SDValue LowerVSETCC(SDValue Op, S
SDValue Op0 = Op.getOperand(0);
SDValue Op1 = Op.getOperand(1);
SDValue CC = Op.getOperand(2);
+ EVT CmpVT = Op0.getValueType().changeVectorElementTypeToInteger();
EVT VT = Op.getValueType();
ISD::CondCode SetCCOpcode = cast<CondCodeSDNode>(CC)->get();
SDLoc dl(Op);
@@ -4517,8 +4517,8 @@ static SDValue LowerVSETCC(SDValue Op, S
TmpOp0 = Op0;
TmpOp1 = Op1;
Opc = ISD::OR;
- Op0 = DAG.getNode(ARMISD::VCGT, dl, VT, TmpOp1, TmpOp0);
- Op1 = DAG.getNode(ARMISD::VCGT, dl, VT, TmpOp0, TmpOp1);
+ Op0 = DAG.getNode(ARMISD::VCGT, dl, CmpVT, TmpOp1, TmpOp0);
+ Op1 = DAG.getNode(ARMISD::VCGT, dl, CmpVT, TmpOp0, TmpOp1);
break;
case ISD::SETUO: Invert = true; // Fallthrough
case ISD::SETO:
@@ -4526,8 +4526,8 @@ static SDValue LowerVSETCC(SDValue Op, S
TmpOp0 = Op0;
TmpOp1 = Op1;
Opc = ISD::OR;
- Op0 = DAG.getNode(ARMISD::VCGT, dl, VT, TmpOp1, TmpOp0);
- Op1 = DAG.getNode(ARMISD::VCGE, dl, VT, TmpOp0, TmpOp1);
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Sat Feb 14 19:24:46 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 7B4756F5;
Sat, 14 Feb 2015 19:24:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::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 62927B03;
Sat, 14 Feb 2015 19:24:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1EJOkww030088;
Sat, 14 Feb 2015 19:24:46 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1EJOcrE030052;
Sat, 14 Feb 2015 19:24:38 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502141924.t1EJOcrE030052@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 14 Feb 2015 19:24:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r278777 - in projects/building-blocks: bin/pkill/tests
cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io etc/rc.d lib/libc/gen
lib/libc/include lib/libc/regex lib/libc/sys lib/libi...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2015 19:24:46 -0000
Author: ngie
Date: Sat Feb 14 19:24:38 2015
New Revision: 278777
URL: https://svnweb.freebsd.org/changeset/base/278777
Log:
MFhead @ r278776
Deleted:
projects/building-blocks/lib/libiconv/
Modified:
projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh
projects/building-blocks/bin/pkill/tests/pkill-j_test.sh
projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c
projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d
projects/building-blocks/etc/rc.d/LOGIN
projects/building-blocks/etc/rc.d/local_unbound
projects/building-blocks/etc/rc.d/utx
projects/building-blocks/lib/libc/gen/_spinlock_stub.c
projects/building-blocks/lib/libc/gen/dlopen.3
projects/building-blocks/lib/libc/gen/ulimit.c
projects/building-blocks/lib/libc/include/libc_private.h
projects/building-blocks/lib/libc/regex/regcomp.c
projects/building-blocks/lib/libc/sys/interposing_table.c
projects/building-blocks/lib/libproc/proc_sym.c
projects/building-blocks/lib/libthr/thread/thr_private.h
projects/building-blocks/lib/libthr/thread/thr_spinlock.c
projects/building-blocks/lib/libthr/thread/thr_syscalls.c
projects/building-blocks/sbin/sysctl/sysctl.8
projects/building-blocks/sbin/sysctl/sysctl.c
projects/building-blocks/share/mk/bsd.lib.mk
projects/building-blocks/share/mk/bsd.prog.mk
projects/building-blocks/sys/amd64/amd64/db_disasm.c
projects/building-blocks/sys/arm/arm/cpuinfo.c
projects/building-blocks/sys/cam/ctl/ctl_backend_block.c
projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_beacon.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_gpio.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_keycache.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_osprey22.ini
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit.c
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9340.ini
projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9580.ini
projects/building-blocks/sys/contrib/vchiq/interface/compat/vchi_bsd.h
projects/building-blocks/sys/dev/ath/if_ath_pci.c
projects/building-blocks/sys/dev/dwc/if_dwc.c
projects/building-blocks/sys/dev/netmap/netmap.c
projects/building-blocks/sys/dev/oce/oce_mbox.c
projects/building-blocks/sys/dev/smc/if_smc.c
projects/building-blocks/sys/dev/vt/font/vt_mouse_cursor.c
projects/building-blocks/sys/dev/wpi/if_wpi.c
projects/building-blocks/sys/dev/wpi/if_wpireg.h
projects/building-blocks/sys/i386/i386/db_disasm.c
projects/building-blocks/sys/kern/imgact_elf.c
projects/building-blocks/sys/kern/sysv_shm.c
projects/building-blocks/sys/kern/vfs_subr.c
projects/building-blocks/sys/net/if_bridge.c
projects/building-blocks/sys/netgraph/ng_base.c
projects/building-blocks/sys/ofed/include/linux/gfp.h
projects/building-blocks/sys/ofed/include/linux/kernel.h
projects/building-blocks/sys/ofed/include/linux/kref.h
projects/building-blocks/sys/ofed/include/linux/pci.h
projects/building-blocks/sys/sys/disk.h
projects/building-blocks/sys/sys/sockbuf.h
projects/building-blocks/sys/x86/acpica/madt.c
projects/building-blocks/sys/x86/include/vmware.h
projects/building-blocks/tools/tools/netmap/pkt-gen.c
projects/building-blocks/usr.bin/gcore/elfcore.c
projects/building-blocks/usr.sbin/flowctl/flowctl.c
projects/building-blocks/usr.sbin/freebsd-update/freebsd-update.sh
projects/building-blocks/usr.sbin/gssd/Makefile
projects/building-blocks/usr.sbin/gssd/gssd.c
projects/building-blocks/usr.sbin/pw/tests/pw_usernext.sh
Directory Properties:
projects/building-blocks/ (props changed)
projects/building-blocks/cddl/ (props changed)
projects/building-blocks/cddl/contrib/opensolaris/ (props changed)
projects/building-blocks/etc/ (props changed)
projects/building-blocks/lib/libc/ (props changed)
projects/building-blocks/sbin/ (props changed)
projects/building-blocks/share/ (props changed)
projects/building-blocks/sys/ (props changed)
Modified: projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/bin/pkill/tests/pgrep-j_test.sh Sat Feb 14 19:24:38 2015 (r278777)
@@ -4,17 +4,7 @@
jail_name_to_jid()
{
local check_name="$1"
- (
- line="$(jls -n 2> /dev/null | grep name=$check_name )"
- for nv in $line; do
- local name="${nv%=*}"
- if [ "${name}" = "jid" ]; then
- eval $nv
- echo $jid
- break
- fi
- done
- )
+ jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
}
base=pgrep_j_test
@@ -37,10 +27,19 @@ jail -c path=/ name=${base}_1_1 ip4.addr
jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
-jid1=$(jail_name_to_jid ${base}_1_1)
-jid2=$(jail_name_to_jid ${base}_1_2)
-jid="${jid1},${jid2}"
-pid1="$(pgrep -f -x -j $jid "$sleep $sleep_amount" | sort)"
+for i in `seq 1 10`; do
+ jid1=$(jail_name_to_jid ${base}_1_1)
+ jid2=$(jail_name_to_jid ${base}_1_2)
+ jid="${jid1},${jid2}"
+ case "$jid" in
+ [0-9]+,[0-9]+)
+ break
+ ;;
+ esac
+ sleep 0.1
+done
+
+pid1="$(pgrep -f -x -j "$jid" "$sleep $sleep_amount" | sort)"
pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \
$(cat ${PWD}/${base}_1_2.pid) | sort)
if [ "$pid1" = "$pid2" ]; then
@@ -50,6 +49,7 @@ else
fi
[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+wait
name="pgrep -j any"
sleep_amount=6
@@ -70,6 +70,7 @@ else
fi
[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+wait
name="pgrep -j none"
sleep_amount=7
Modified: projects/building-blocks/bin/pkill/tests/pkill-j_test.sh
==============================================================================
--- projects/building-blocks/bin/pkill/tests/pkill-j_test.sh Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/bin/pkill/tests/pkill-j_test.sh Sat Feb 14 19:24:38 2015 (r278777)
@@ -4,99 +4,90 @@
jail_name_to_jid()
{
local check_name="$1"
- (
- line="$(jls -n 2> /dev/null | grep name=$check_name )"
- for nv in $line; do
- local name="${nv%=*}"
- if [ "${name}" = "jid" ]; then
- eval $nv
- echo $jid
- break
- fi
- done
- )
+ jls -j "$check_name" -s 2>/dev/null | tr ' ' '\n' | grep jid= | sed -e 's/.*=//g'
}
base=pkill_j_test
+if [ `id -u` -ne 0 ]; then
+ echo "1..0 # skip Test needs uid 0."
+ exit 0
+fi
+
echo "1..3"
+sleep=$(pwd)/sleep.txt
+ln -sf /bin/sleep $sleep
+
name="pkill -j <jid>"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 &
+sleep_amount=5
+jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount &
- jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 &
+$sleep $sleep_amount &
- $sleep 5 &
- sleep 0.5
+for i in `seq 1 10`; do
jid1=$(jail_name_to_jid ${base}_1_1)
jid2=$(jail_name_to_jid ${base}_1_2)
jid="${jid1},${jid2}"
- if pkill -f -j "$jid" $sleep && sleep 0.5 &&
- ! -f ${PWD}/${base}_1_1.pid &&
- ! -f ${PWD}/${base}_1_2.pid ; then
- echo "ok 1 - $name"
- else
- echo "not ok 1 - $name"
- fi 2>/dev/null
- rm -f $sleep
- [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
- [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
- wait
+ case "$jid" in
+ [0-9]+,[0-9]+)
+ break
+ ;;
+ esac
+ sleep 0.1
+done
+
+if pkill -f -j "$jid" $sleep && sleep 0.5 &&
+ ! -f ${PWD}/${base}_1_1.pid &&
+ ! -f ${PWD}/${base}_1_2.pid ; then
+ echo "ok 1 - $name"
else
- echo "ok 1 - $name # skip Test needs uid 0."
-fi
+ echo "not ok 1 - $name"
+fi 2>/dev/null
+[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid)
+[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid)
+wait
name="pkill -j any"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 &
-
- jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 &
-
- $sleep 5 &
- sleep 0.5
- chpid3=$!
- if pkill -f -j any $sleep && sleep 0.5 &&
- [ ! -f ${PWD}/${base}_2_1.pid -a
- ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then
- echo "ok 2 - $name"
- else
- echo "not ok 2 - $name"
- fi 2>/dev/null
- rm -f $sleep
- [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
- [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
- wait
+sleep_amount=6
+jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount &
+
+$sleep $sleep_amount &
+chpid3=$!
+sleep 0.5
+if pkill -f -j any $sleep && sleep 0.5 &&
+ [ ! -f ${PWD}/${base}_2_1.pid -a
+ ! -f ${PWD}/${base}_2_2.pid ] && kill $chpid3; then
+ echo "ok 2 - $name"
else
- echo "ok 2 - $name # skip Test needs uid 0."
-fi
+ echo "not ok 2 - $name"
+fi 2>/dev/null
+[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid)
+[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid)
+wait
name="pkill -j none"
-if [ `id -u` -eq 0 ]; then
- sleep=$(pwd)/sleep.txt
- ln -sf /bin/sleep $sleep
- daemon -p ${PWD}/${base}_3_1.pid $sleep 5
- jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
- command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 &
- sleep 1
- if pkill -f -j none "$sleep 5" && sleep 1 &&
- [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then
- echo "ok 3 - $name"
- else
- ls ${PWD}/*.pid
- echo "not ok 3 - $name"
- fi 2>/dev/null
- rm -f $sleep
- [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
- [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
+sleep_amount=7
+daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount
+jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \
+ command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount &
+sleep 1
+if pkill -f -j none "$sleep $sleep_amount" && sleep 1 &&
+ [ ! -f ${PWD}/${base}_3_1.pid -a -f ${PWD}/${base}_3_2.pid ] ; then
+ echo "ok 3 - $name"
else
- echo "ok 3 - $name # skip Test needs uid 0."
-fi
+ ls ${PWD}/*.pid
+ echo "not ok 3 - $name"
+fi 2>/dev/null
+[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
+[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
+
+rm -f $sleep
Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -26,6 +26,8 @@
#pragma ident "%Z%%M% %I% %E% SMI"
+#include <sys/ioctl.h>
+
#include <assert.h>
#include <setjmp.h>
#include <signal.h>
@@ -69,7 +71,7 @@ main(int argc, char *argv[])
*/
if (sigsetjmp(env, 1) == 0) {
for (;;)
- (void) ioctl(-1, -1, NULL);
+ (void) ioctl(-1, 0, NULL);
}
/*
@@ -80,20 +82,19 @@ main(int argc, char *argv[])
fds[n++] = open(file, O_WRONLY);
fds[n++] = open(file, O_RDWR);
- fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT | O_DSYNC |
- O_LARGEFILE | O_NOCTTY | O_NONBLOCK | O_NDELAY | O_RSYNC |
- O_SYNC | O_TRUNC | O_XATTR, 0666);
+ fds[n++] = open(file, O_RDWR | O_APPEND | O_CREAT |
+ O_NOCTTY | O_NONBLOCK | O_NDELAY | O_SYNC | O_TRUNC | 0666);
fds[n++] = open(file, O_RDWR);
(void) lseek(fds[n - 1], 123, SEEK_SET);
/*
* Once we have all the file descriptors in the state we want to test,
- * issue a bogus ioctl() on each fd with cmd -1 and arg NULL to whack
+ * issue a bogus ioctl() on each fd with cmd 0 and arg NULL to whack
* our DTrace script into recording the content of the fds[] array.
*/
for (i = 0; i < n; i++)
- (void) ioctl(fds[i], -1, NULL);
+ (void) ioctl(fds[i], 0, NULL);
assert(n <= sizeof (fds) / sizeof (fds[0]));
exit(0);
Modified: projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d
==============================================================================
--- projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d Sat Feb 14 19:24:38 2015 (r278777)
@@ -36,7 +36,7 @@ syscall::ioctl:entry
}
syscall::ioctl:entry
-/pid == $1 && arg0 != -1u && arg1 == -1u && arg2 == NULL/
+/pid == $1 && arg0 != -1u && arg1 == 0 && arg2 == NULL/
{
printf("fds[%d] fi_name = %s\n", arg0, fds[arg0].fi_name);
printf("fds[%d] fi_dirname = %s\n", arg0, fds[arg0].fi_dirname);
Modified: projects/building-blocks/etc/rc.d/LOGIN
==============================================================================
--- projects/building-blocks/etc/rc.d/LOGIN Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/etc/rc.d/LOGIN Sat Feb 14 19:24:38 2015 (r278777)
@@ -4,7 +4,7 @@
#
# PROVIDE: LOGIN
-# REQUIRE: DAEMON utx
+# REQUIRE: DAEMON
# This is a dummy dependency to ensure user services such as xdm,
# inetd, cron and kerberos are started after everything else, in case
Modified: projects/building-blocks/etc/rc.d/local_unbound
==============================================================================
--- projects/building-blocks/etc/rc.d/local_unbound Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/etc/rc.d/local_unbound Sat Feb 14 19:24:38 2015 (r278777)
@@ -5,6 +5,7 @@
# PROVIDE: local_unbound DNS
# REQUIRE: FILESYSTEMS netif resolv routing
+# BEFORE: NETWORKING
# KEYWORD: shutdown
. /etc/rc.subr
Modified: projects/building-blocks/etc/rc.d/utx
==============================================================================
--- projects/building-blocks/etc/rc.d/utx Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/etc/rc.d/utx Sat Feb 14 19:24:38 2015 (r278777)
@@ -5,6 +5,7 @@
# PROVIDE: utx
# REQUIRE: DAEMON FILESYSTEMS
+# BEFORE: LOGIN
# KEYWORD: shutdown
. /etc/rc.subr
Modified: projects/building-blocks/lib/libc/gen/_spinlock_stub.c
==============================================================================
--- projects/building-blocks/lib/libc/gen/_spinlock_stub.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libc/gen/_spinlock_stub.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -33,51 +33,48 @@ __FBSDID("$FreeBSD$");
#include <stdio.h>
#include "spinlock.h"
+#include "libc_private.h"
long _atomic_lock_stub(volatile long *);
void _spinlock_stub(spinlock_t *);
void _spinunlock_stub(spinlock_t *);
void _spinlock_debug_stub(spinlock_t *, char *, int);
-/*
- * Declare weak definitions in case the application is not linked
- * with libpthread.
- */
__weak_reference(_atomic_lock_stub, _atomic_lock);
-__weak_reference(_spinlock_stub, _spinlock);
-__weak_reference(_spinunlock_stub, _spinunlock);
-__weak_reference(_spinlock_debug_stub, _spinlock_debug);
-
-/*
- * This function is a stub for the _atomic_lock function in libpthread.
- */
+
long
_atomic_lock_stub(volatile long *lck __unused)
{
return (0L);
}
+__weak_reference(_spinlock, _spinlock_debug);
+#pragma weak _spinlock
+void
+_spinlock(spinlock_t *lck)
+{
+
+ ((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinlock])
+ (lck);
-/*
- * This function is a stub for the spinlock function in libpthread.
- */
+}
+
+#pragma weak _spinlock
void
-_spinlock_stub(spinlock_t *lck __unused)
+_spinunlock(spinlock_t *lck)
{
+
+ ((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinunlock])
+ (lck);
+
}
-/*
- * This function is a stub for the spinunlock function in libpthread.
- */
void
-_spinunlock_stub(spinlock_t *lck __unused)
+__libc_spinlock_stub(spinlock_t *lck __unused)
{
}
-/*
- * This function is a stub for the debug spinlock function in libpthread.
- */
void
-_spinlock_debug_stub(spinlock_t *lck __unused, char *fname __unused, int lineno __unused)
+__libc_spinunlock_stub(spinlock_t *lck __unused)
{
}
Modified: projects/building-blocks/lib/libc/gen/dlopen.3
==============================================================================
--- projects/building-blocks/lib/libc/gen/dlopen.3 Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libc/gen/dlopen.3 Sat Feb 14 19:24:38 2015 (r278777)
@@ -32,7 +32,7 @@
.\" @(#) dlopen.3 1.6 90/01/31 SMI
.\" $FreeBSD$
.\"
-.Dd December 21, 2011
+.Dd February 14, 2015
.Dt DLOPEN 3
.Os
.Sh NAME
@@ -236,7 +236,7 @@ as follows, in the given order:
The referencing object itself (or the object from which the call to
.Fn dlsym
is made), if that object was linked using the
-.Fl Wsymbolic
+.Fl Bsymbolic
option to
.Xr ld 1 .
.It
Modified: projects/building-blocks/lib/libc/gen/ulimit.c
==============================================================================
--- projects/building-blocks/lib/libc/gen/ulimit.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libc/gen/ulimit.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -53,13 +53,13 @@ ulimit(int cmd, ...)
va_start(ap, cmd);
arg = va_arg(ap, long);
va_end(ap);
- if (arg > RLIM_INFINITY / 512 || arg < 0)
- arg = RLIM_INFINITY / 512;
limit.rlim_max = limit.rlim_cur = (rlim_t)arg * 512;
/* The setrlimit() function sets errno to EPERM if needed. */
if (setrlimit(RLIMIT_FSIZE, &limit) == -1)
return (-1);
+ if (arg * 512 > LONG_MAX)
+ return (LONG_MAX);
return (arg);
} else {
errno = EINVAL;
Modified: projects/building-blocks/lib/libc/include/libc_private.h
==============================================================================
--- projects/building-blocks/lib/libc/include/libc_private.h Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libc/include/libc_private.h Sat Feb 14 19:24:38 2015 (r278777)
@@ -95,6 +95,9 @@ do { \
_SPINUNLOCK(&__stdio_thread_lock); \
} while (0)
+void __libc_spinlock_stub(struct _spinlock *);
+void __libc_spinunlock_stub(struct _spinlock *);
+
/*
* Indexes into the pthread jump table.
*
@@ -216,6 +219,8 @@ enum {
INTERPOS_write,
INTERPOS_writev,
INTERPOS__pthread_mutex_init_calloc_cb,
+ INTERPOS_spinlock,
+ INTERPOS_spinunlock,
INTERPOS_MAX
};
Modified: projects/building-blocks/lib/libc/regex/regcomp.c
==============================================================================
--- projects/building-blocks/lib/libc/regex/regcomp.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libc/regex/regcomp.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -192,6 +192,7 @@ regcomp(regex_t * __restrict preg,
struct parse *p = &pa;
int i;
size_t len;
+ size_t maxlen;
#ifdef REDEBUG
# define GOODFLAGS(f) (f)
#else
@@ -213,7 +214,23 @@ regcomp(regex_t * __restrict preg,
g = (struct re_guts *)malloc(sizeof(struct re_guts));
if (g == NULL)
return(REG_ESPACE);
+ /*
+ * Limit the pattern space to avoid a 32-bit overflow on buffer
+ * extension. Also avoid any signed overflow in case of conversion
+ * so make the real limit based on a 31-bit overflow.
+ *
+ * Likely not applicable on 64-bit systems but handle the case
+ * generically (who are we to stop people from using ~715MB+
+ * patterns?).
+ */
+ maxlen = ((size_t)-1 >> 1) / sizeof(sop) * 2 / 3;
+ if (len >= maxlen) {
+ free((char *)g);
+ return(REG_ESPACE);
+ }
p->ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
+ assert(p->ssize >= len);
+
p->strip = (sop *)malloc(p->ssize * sizeof(sop));
p->slen = 0;
if (p->strip == NULL) {
Modified: projects/building-blocks/lib/libc/sys/interposing_table.c
==============================================================================
--- projects/building-blocks/lib/libc/sys/interposing_table.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libc/sys/interposing_table.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -73,6 +73,8 @@ interpos_func_t __libc_interposing[INTER
SLOT(write, __sys_write),
SLOT(writev, __sys_writev),
SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),
+ SLOT(spinlock, __libc_spinlock_stub),
+ SLOT(spinunlock, __libc_spinunlock_stub),
};
#undef SLOT
Modified: projects/building-blocks/lib/libproc/proc_sym.c
==============================================================================
--- projects/building-blocks/lib/libproc/proc_sym.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libproc/proc_sym.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -82,6 +82,21 @@ fail:
strlcpy(buf, symbol, len);
}
+static int
+find_dbg_obj(const char *path)
+{
+ int fd;
+ char dbg_path[PATH_MAX];
+
+ snprintf(dbg_path, sizeof(dbg_path),
+ "/usr/lib/debug/%s.debug", path);
+ fd = open(dbg_path, O_RDONLY);
+ if (fd > 0)
+ return (fd);
+ else
+ return (open(path, O_RDONLY));
+}
+
static void
proc_rdl2prmap(rd_loadobj_t *rdl, prmap_t *map)
{
@@ -295,7 +310,7 @@ proc_addr2sym(struct proc_handle *p, uin
if ((map = proc_addr2map(p, addr)) == NULL)
return (-1);
- if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) {
+ if ((fd = find_dbg_obj(map->pr_mapname)) < 0) {
DPRINTF("ERROR: open %s failed", map->pr_mapname);
goto err0;
}
@@ -443,7 +458,7 @@ proc_name2sym(struct proc_handle *p, con
DPRINTFX("ERROR: couldn't find object %s", object);
goto err0;
}
- if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) {
+ if ((fd = find_dbg_obj(map->pr_mapname)) < 0) {
DPRINTF("ERROR: open %s failed", map->pr_mapname);
goto err0;
}
@@ -539,7 +554,7 @@ proc_iter_symbyaddr(struct proc_handle *
if ((map = proc_name2map(p, object)) == NULL)
return (-1);
- if ((fd = open(map->pr_mapname, O_RDONLY)) < 0) {
+ if ((fd = find_dbg_obj(map->pr_mapname)) < 0) {
DPRINTF("ERROR: open %s failed", map->pr_mapname);
goto err0;
}
Modified: projects/building-blocks/lib/libthr/thread/thr_private.h
==============================================================================
--- projects/building-blocks/lib/libthr/thread/thr_private.h Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libthr/thread/thr_private.h Sat Feb 14 19:24:38 2015 (r278777)
@@ -928,6 +928,10 @@ int __thr_sigwait(const sigset_t *set, i
int __thr_sigwaitinfo(const sigset_t *set, siginfo_t *info);
int __thr_swapcontext(ucontext_t *oucp, const ucontext_t *ucp);
+struct _spinlock;
+void __thr_spinunlock(struct _spinlock *lck);
+void __thr_spinlock(struct _spinlock *lck);
+
struct tcb *_tcb_ctor(struct pthread *, int);
void _tcb_dtor(struct tcb *);
Modified: projects/building-blocks/lib/libthr/thread/thr_spinlock.c
==============================================================================
--- projects/building-blocks/lib/libthr/thread/thr_spinlock.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libthr/thread/thr_spinlock.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -61,7 +61,7 @@ static void init_spinlock(spinlock_t *lc
*/
void
-_spinunlock(spinlock_t *lck)
+__thr_spinunlock(spinlock_t *lck)
{
struct spinlock_extra *_extra;
@@ -70,7 +70,7 @@ _spinunlock(spinlock_t *lck)
}
void
-_spinlock(spinlock_t *lck)
+__thr_spinlock(spinlock_t *lck)
{
struct spinlock_extra *_extra;
@@ -84,12 +84,6 @@ _spinlock(spinlock_t *lck)
THR_UMUTEX_LOCK(_get_curthread(), &_extra->lock);
}
-void
-_spinlock_debug(spinlock_t *lck, char *fname __unused, int lineno __unused)
-{
- _spinlock(lck);
-}
-
static void
init_spinlock(spinlock_t *lck)
{
Modified: projects/building-blocks/lib/libthr/thread/thr_syscalls.c
==============================================================================
--- projects/building-blocks/lib/libthr/thread/thr_syscalls.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/lib/libthr/thread/thr_syscalls.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -597,6 +597,8 @@ __thr_interpose_libc(void)
SLOT(wait4);
SLOT(write);
SLOT(writev);
+ SLOT(spinlock);
+ SLOT(spinunlock);
#undef SLOT
*(__libc_interposing_slot(
INTERPOS__pthread_mutex_init_calloc_cb)) =
Modified: projects/building-blocks/sbin/sysctl/sysctl.8
==============================================================================
--- projects/building-blocks/sbin/sysctl/sysctl.8 Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sbin/sysctl/sysctl.8 Sat Feb 14 19:24:38 2015 (r278777)
@@ -28,7 +28,7 @@
.\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd December 13, 2012
+.Dd February 12, 2015
.Dt SYSCTL 8
.Os
.Sh NAME
@@ -37,11 +37,13 @@
.Sh SYNOPSIS
.Nm
.Op Fl bdehiNnoRTqx
+.Op Fl B Ar bufsize
.Op Fl f Ar filename
.Ar name Ns Op = Ns Ar value
.Ar ...
.Nm
.Op Fl bdehNnoRTqx
+.Op Fl B Ar bufsize
.Fl a
.Sh DESCRIPTION
The
@@ -68,6 +70,15 @@ the command line.
Force the value of the variable(s) to be output in raw, binary format.
No names are printed and no terminating newlines are output.
This is mostly useful with a single variable.
+.It Fl B Ar bufsize
+Set the buffer size to read from the
+.Nm
+to
+.Ar bufsize .
+This is necessary for a
+.Nm
+that has variable length, and the probe value of 0 is a valid length, such as
+.Va kern.arandom .
.It Fl d
Print the description of the variable instead of its value.
.It Fl e
@@ -128,7 +139,7 @@ Suppress some warnings generated by
.Nm
to standard error.
.It Fl T
-Display only variables that are setable via loader (CTLFLAG_TUN).
+Display only variables that are settable via loader (CTLFLAG_TUN).
.It Fl W
Display only writable variables that are not statistical.
Useful for determining the set of runtime tunable sysctls.
Modified: projects/building-blocks/sbin/sysctl/sysctl.c
==============================================================================
--- projects/building-blocks/sbin/sysctl/sysctl.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sbin/sysctl/sysctl.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -71,7 +71,7 @@ static const char rcsid[] =
static const char *conffile;
-static int aflag, bflag, dflag, eflag, hflag, iflag;
+static int aflag, bflag, Bflag, dflag, eflag, hflag, iflag;
static int Nflag, nflag, oflag, qflag, Tflag, Wflag, xflag;
static int oidfmt(int *, int, char *, u_int *);
@@ -112,8 +112,8 @@ usage(void)
{
(void)fprintf(stderr, "%s\n%s\n",
- "usage: sysctl [-bdehiNnoqTWx] [-f filename] name[=value] ...",
- " sysctl [-bdehNnoqTWx] -a");
+ "usage: sysctl [-bdehiNnoqTWx] [ -B <bufsize> ] [-f filename] name[=value] ...",
+ " sysctl [-bdehNnoqTWx] [ -B <bufsize> ] -a");
exit(1);
}
@@ -127,7 +127,7 @@ main(int argc, char **argv)
setbuf(stdout,0);
setbuf(stderr,0);
- while ((ch = getopt(argc, argv, "Aabdef:hiNnoqTwWxX")) != -1) {
+ while ((ch = getopt(argc, argv, "AabB:def:hiNnoqTwWxX")) != -1) {
switch (ch) {
case 'A':
/* compatibility */
@@ -139,6 +139,9 @@ main(int argc, char **argv)
case 'b':
bflag = 1;
break;
+ case 'B':
+ Bflag = strtol(optarg, NULL, 0);
+ break;
case 'd':
dflag = 1;
break;
@@ -222,7 +225,7 @@ parse(const char *string, int lineno)
unsigned int uintval;
long longval;
unsigned long ulongval;
- size_t newsize = 0;
+ size_t newsize = Bflag;
int64_t i64val;
uint64_t u64val;
int mib[CTL_MAXNAME];
@@ -815,9 +818,13 @@ show_var(int *oid, int nlen)
return (0);
}
/* find an estimate of how much we need for this var */
- j = 0;
- i = sysctl(oid, nlen, 0, &j, 0, 0);
- j += j; /* we want to be sure :-) */
+ if (Bflag)
+ j = Bflag;
+ else {
+ j = 0;
+ i = sysctl(oid, nlen, 0, &j, 0, 0);
+ j += j; /* we want to be sure :-) */
+ }
val = oval = malloc(j + 1);
if (val == NULL) {
Modified: projects/building-blocks/share/mk/bsd.lib.mk
==============================================================================
--- projects/building-blocks/share/mk/bsd.lib.mk Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/share/mk/bsd.lib.mk Sat Feb 14 19:24:38 2015 (r278777)
@@ -286,7 +286,7 @@ _EXTRADEPEND:
mv $$TMP ${DEPENDFILE}
.if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME)
.if defined(DPADD) && !empty(DPADD)
- echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE}
+ echo ${SHLIB_NAME_FULL}: ${DPADD} >> ${DEPENDFILE}
.endif
.endif
Modified: projects/building-blocks/share/mk/bsd.prog.mk
==============================================================================
--- projects/building-blocks/share/mk/bsd.prog.mk Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/share/mk/bsd.prog.mk Sat Feb 14 19:24:38 2015 (r278777)
@@ -168,15 +168,15 @@ CLEANFILES+= ${OBJS}
_EXTRADEPEND:
.if defined(LDFLAGS) && !empty(LDFLAGS:M-nostdlib)
.if defined(DPADD) && !empty(DPADD)
- echo ${PROG}: ${DPADD} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${DPADD} >> ${DEPENDFILE}
.endif
.else
- echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
.if defined(PROG_CXX)
.if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++)
- echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
.else
- echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
+ echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE}
.endif
.endif
.endif
Modified: projects/building-blocks/sys/amd64/amd64/db_disasm.c
==============================================================================
--- projects/building-blocks/sys/amd64/amd64/db_disasm.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sys/amd64/amd64/db_disasm.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -250,6 +250,26 @@ static const struct inst db_inst_0f0x[]
/*0f*/ { "", FALSE, NONE, 0, 0 },
};
+static const struct inst db_inst_0f1x[] = {
+/*10*/ { "", FALSE, NONE, 0, 0 },
+/*11*/ { "", FALSE, NONE, 0, 0 },
+/*12*/ { "", FALSE, NONE, 0, 0 },
+/*13*/ { "", FALSE, NONE, 0, 0 },
+/*14*/ { "", FALSE, NONE, 0, 0 },
+/*15*/ { "", FALSE, NONE, 0, 0 },
+/*16*/ { "", FALSE, NONE, 0, 0 },
+/*17*/ { "", FALSE, NONE, 0, 0 },
+
+/*18*/ { "", FALSE, NONE, 0, 0 },
+/*19*/ { "", FALSE, NONE, 0, 0 },
+/*1a*/ { "", FALSE, NONE, 0, 0 },
+/*1b*/ { "", FALSE, NONE, 0, 0 },
+/*1c*/ { "", FALSE, NONE, 0, 0 },
+/*1d*/ { "", FALSE, NONE, 0, 0 },
+/*1e*/ { "", FALSE, NONE, 0, 0 },
+/*1f*/ { "nopl", TRUE, SDEP, 0, "nopw" },
+};
+
static const struct inst db_inst_0f2x[] = {
/*20*/ { "mov", TRUE, LONG, op2(CR,El), 0 },
/*21*/ { "mov", TRUE, LONG, op2(DR,El), 0 },
@@ -431,7 +451,7 @@ static const struct inst db_inst_0fcx[]
static const struct inst * const db_inst_0f[] = {
db_inst_0f0x,
- 0,
+ db_inst_0f1x,
db_inst_0f2x,
db_inst_0f3x,
db_inst_0f4x,
Modified: projects/building-blocks/sys/arm/arm/cpuinfo.c
==============================================================================
--- projects/building-blocks/sys/arm/arm/cpuinfo.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sys/arm/arm/cpuinfo.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -58,9 +58,13 @@ cpuinfo_init(void)
/* ARMv4T CPU */
cpuinfo.architecture = 1;
cpuinfo.revision = (cpuinfo.midr >> 16) & 0x7F;
- }
+ } else {
+ /* ARM new id scheme */
+ cpuinfo.architecture = (cpuinfo.midr >> 16) & 0x0F;
+ cpuinfo.revision = (cpuinfo.midr >> 20) & 0x0F;
+ }
} else {
- /* must be new id scheme */
+ /* non ARM -> must be new id scheme */
cpuinfo.architecture = (cpuinfo.midr >> 16) & 0x0F;
cpuinfo.revision = (cpuinfo.midr >> 20) & 0x0F;
}
Modified: projects/building-blocks/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- projects/building-blocks/sys/cam/ctl/ctl_backend_block.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sys/cam/ctl/ctl_backend_block.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -1874,7 +1874,7 @@ ctl_be_block_open_dev(struct ctl_be_bloc
struct cdev *dev;
struct cdevsw *devsw;
char *value;
- int error, atomic, maxio;
+ int error, atomic, maxio, unmap;
off_t ps, pss, po, pos, us, uss, uo, uos;
params = &be_lun->params;
@@ -1899,7 +1899,6 @@ ctl_be_block_open_dev(struct ctl_be_bloc
maxio = CTLBLK_MAX_IO_SIZE;
}
be_lun->lun_flush = ctl_be_block_flush_dev;
- be_lun->unmap = ctl_be_block_unmap_dev;
be_lun->getattr = ctl_be_block_getattr_dev;
error = VOP_GETATTR(be_lun->vn, &vattr, NOCRED);
@@ -2030,6 +2029,24 @@ ctl_be_block_open_dev(struct ctl_be_bloc
be_lun->atomicblock = atomic / be_lun->blocksize;
be_lun->opttxferlen = maxio / be_lun->blocksize;
+
+ if (be_lun->dispatch == ctl_be_block_dispatch_zvol) {
+ unmap = 1;
+ } else {
+ struct diocgattr_arg arg;
+
+ strlcpy(arg.name, "GEOM::candelete", sizeof(arg.name));
+ arg.len = sizeof(arg.value.i);
+ error = devsw->d_ioctl(dev, DIOCGATTR,
+ (caddr_t)&arg, FREAD, curthread);
+ unmap = (error == 0) ? arg.value.i : 0;
+ }
+ value = ctl_get_opt(&be_lun->ctl_be_lun.options, "unmap");
+ if (value != NULL)
+ unmap = (strcmp(value, "on") == 0);
+ if (unmap)
+ be_lun->unmap = ctl_be_block_unmap_dev;
+
return (0);
}
@@ -2182,7 +2199,7 @@ ctl_be_block_create(struct ctl_be_block_
char num_thread_str[16];
char tmpstr[32];
char *value;
- int retval, num_threads, unmap;
+ int retval, num_threads;
int tmp_num_threads;
params = &req->reqdata.create;
@@ -2275,16 +2292,12 @@ ctl_be_block_create(struct ctl_be_block_
}
num_threads = tmp_num_threads;
}
- unmap = (be_lun->dispatch == ctl_be_block_dispatch_zvol);
- value = ctl_get_opt(&be_lun->ctl_be_lun.options, "unmap");
- if (value != NULL)
- unmap = (strcmp(value, "on") == 0);
be_lun->flags = CTL_BE_BLOCK_LUN_UNCONFIGURED;
be_lun->ctl_be_lun.flags = CTL_LUN_FLAG_PRIMARY;
if (be_lun->vn == NULL)
be_lun->ctl_be_lun.flags |= CTL_LUN_FLAG_OFFLINE;
- if (unmap)
+ if (be_lun->unmap != NULL)
be_lun->ctl_be_lun.flags |= CTL_LUN_FLAG_UNMAP;
if (be_lun->dispatch != ctl_be_block_dispatch_dev)
be_lun->ctl_be_lun.flags |= CTL_LUN_FLAG_SERSEQ_READ;
@@ -2668,6 +2681,8 @@ ctl_be_block_modify(struct ctl_be_block_
* XXX: Note that this field is being updated without locking,
* which might cause problems on 32-bit architectures.
*/
+ if (be_lun->unmap != NULL)
+ be_lun->ctl_be_lun.flags |= CTL_LUN_FLAG_UNMAP;
be_lun->ctl_be_lun.maxlba = (be_lun->size_blocks == 0) ?
0 : (be_lun->size_blocks - 1);
be_lun->ctl_be_lun.blocksize = be_lun->blocksize;
Modified: projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c
==============================================================================
--- projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sys/cam/ctl/ctl_backend_ramdisk.c Sat Feb 14 19:24:38 2015 (r278777)
@@ -588,10 +588,10 @@ ctl_backend_ramdisk_create(struct ctl_be
be_lun->softc = softc;
- unmap = 0;
+ unmap = 1;
value = ctl_get_opt(&be_lun->ctl_be_lun.options, "unmap");
if (value != NULL && strcmp(value, "on") == 0)
- unmap = 1;
+ unmap = (strcmp(value, "on") == 0);
be_lun->flags = CTL_BE_RAMDISK_LUN_UNCONFIGURED;
be_lun->ctl_be_lun.flags = CTL_LUN_FLAG_PRIMARY;
Modified: projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
==============================================================================
--- projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h Sat Feb 14 19:24:38 2015 (r278777)
@@ -576,6 +576,9 @@ struct ath_hal_9300 {
u_int8_t ah_tx_chainmask; /* tx chain mask */
u_int8_t ah_rx_chainmask; /* rx chain mask */
+ /* optional tx chainmask */
+ u_int8_t ah_tx_chainmaskopt;
+
u_int8_t ah_tx_cal_chainmask; /* tx cal chain mask */
u_int8_t ah_rx_cal_chainmask; /* rx cal chain mask */
@@ -845,6 +848,7 @@ struct ath_hal_9300 {
HAL_BOOL ah_aic_enabled;
u_int32_t ah_aic_sram[ATH_AIC_MAX_BT_CHANNEL];
#endif
+
#endif /* ATH_SUPPORT_MCI */
u_int8_t ah_cac_quiet_enabled;
#if ATH_WOW_OFFLOAD
@@ -852,6 +856,14 @@ struct ath_hal_9300 {
u_int32_t ah_mcast_filter_u32_set;
#endif
HAL_BOOL ah_reduced_self_gen_mask;
+ HAL_BOOL ah_chip_reset_done;
+ HAL_BOOL ah_abort_txdma_norx;
+ /* store previous passive RX Cal info */
+ HAL_BOOL ah_skip_rx_iq_cal;
+ HAL_BOOL ah_rx_cal_complete; /* previous rx cal completed or not */
+ u_int32_t ah_rx_cal_chan; /* chan on which rx cal is done */
+ u_int32_t ah_rx_cal_chan_flag;
+ u_int32_t ah_rx_cal_corr[AR9300_MAX_CHAINS];
/* Local additions for FreeBSD */
/*
@@ -877,7 +889,6 @@ struct ath_hal_9300 {
struct ar9300NfLimits nf_2GHz;
struct ar9300NfLimits nf_5GHz;
struct ar9300NfLimits *nfp;
-
};
#define AH9300(_ah) ((struct ath_hal_9300 *)(_ah))
@@ -1194,7 +1205,8 @@ extern HAL_BOOL ar9300_get_channel_edge
extern HAL_BOOL ar9300_fill_capability_info(struct ath_hal *ah);
extern void ar9300_beacon_init(struct ath_hal *ah,
- u_int32_t next_beacon, u_int32_t beacon_period, HAL_OPMODE opmode);
+ u_int32_t next_beacon, u_int32_t beacon_period,
+ u_int32_t beacon_period_fraction, HAL_OPMODE opmode);
extern void ar9300_set_sta_beacon_timers(struct ath_hal *ah,
const HAL_BEACON_STATE *);
@@ -1217,12 +1229,21 @@ extern HAL_BOOL ar9300_set_key_cache_en
extern HAL_BOOL ar9300_set_key_cache_entry(struct ath_hal *ah, u_int16_t entry,
const HAL_KEYVAL *k, const u_int8_t *mac, int xor_key);
extern HAL_BOOL ar9300_print_keycache(struct ath_hal *ah);
+#if ATH_SUPPORT_KEYPLUMB_WAR
+extern HAL_BOOL ar9300_check_key_cache_entry(struct ath_hal *ah, u_int16_t entry,
+ const HAL_KEYVAL *k, int xorKey);
+#endif
extern void ar9300_get_mac_address(struct ath_hal *ah, u_int8_t *mac);
extern HAL_BOOL ar9300_set_mac_address(struct ath_hal *ah, const u_int8_t *);
extern void ar9300_get_bss_id_mask(struct ath_hal *ah, u_int8_t *mac);
extern HAL_BOOL ar9300_set_bss_id_mask(struct ath_hal *, const u_int8_t *);
extern HAL_STATUS ar9300_select_ant_config(struct ath_hal *ah, u_int32_t cfg);
+#if 0
+extern u_int32_t ar9300_ant_ctrl_common_get(struct ath_hal *ah, HAL_BOOL is_2ghz);
+#endif
+extern HAL_BOOL ar9300_ant_swcom_sel(struct ath_hal *ah, u_int8_t ops,
+ u_int32_t *common_tbl1, u_int32_t *common_tbl2);
extern HAL_BOOL ar9300_set_regulatory_domain(struct ath_hal *ah,
u_int16_t reg_domain, HAL_STATUS *stats);
extern u_int ar9300_get_wireless_modes(struct ath_hal *ah);
@@ -1397,6 +1418,8 @@ extern HAL_BOOL ar9300_set_tx_power_limi
u_int16_t extra_txpow, u_int16_t tpc_in_db);
extern void ar9300_chain_noise_floor(struct ath_hal *ah, int16_t *nf_buf,
struct ieee80211_channel *chan, int is_scan);
+extern int16_t ar9300_get_nf_from_reg(struct ath_hal *ah, struct ieee80211_channel *chan, int wait_time);
+extern int ar9300_get_rx_nf_offset(struct ath_hal *ah, struct ieee80211_channel *chan, int8_t *nf_pwr, int8_t *nf_cal);
extern HAL_BOOL ar9300_load_nf(struct ath_hal *ah, int16_t nf[]);
extern HAL_RFGAIN ar9300_get_rfgain(struct ath_hal *ah);
@@ -1681,6 +1704,8 @@ extern void ar9300_tx99_start(struct ath
extern void ar9300_tx99_stop(struct ath_hal *ah);
#endif /* ATH_SUPPORT_HTC */
#endif /* ATH_TX99_DIAG */
+extern HAL_BOOL ar9300_set_ctl_pwr(struct ath_hal *ah, u_int8_t *ctl_array);
+extern void ar9300_set_txchainmaskopt(struct ath_hal *ah, u_int8_t mask);
enum {
AR9300_COEFF_TX_TYPE = 0,
Modified: projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
==============================================================================
--- projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c Sat Feb 14 19:21:04 2015 (r278776)
+++ projects/building-blocks/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c Sat Feb 14 19:24:38 2015 (r278777)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***