October 2008 - darwinbuild-changes - lists.macosforge.org

[397] trunk/darwinup
by source_changes＠macosforge.org 24 Oct '08

24 Oct '08

Revision: 397 http://trac.macosforge.org/projects/darwinbuild/changeset/397 Author: kvv(a)apple.com Date: 2008-10-24 00:35:48 -0700 (Fri, 24 Oct 2008) Log Message: ----------- use flock(2) to serialize Depot access Modified Paths: -------------- trunk/darwinup/Depot.cpp trunk/darwinup/Depot.h Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2008-10-24 05:42:44 UTC (rev 396) +++ trunk/darwinup/Depot.cpp 2008-10-24 07:35:48 UTC (rev 397) @@ -45,6 +45,7 @@ m_database_path = NULL; m_archives_path = NULL; m_db = NULL; + m_lock_fd = -1; } Depot::Depot(const char* prefix) { @@ -55,6 +56,8 @@ mkdir(m_depot_path, m_depot_mode); mkdir(m_archives_path, m_depot_mode); + (void)this->lock(LOCK_SH); + int exists = is_regular_file(m_database_path); int res = sqlite3_open(m_database_path, &m_db); @@ -73,6 +76,7 @@ } Depot::~Depot() { + if (m_lock_fd != -1) this->unlock(); if (m_db) sqlite3_close(m_db); if (m_depot_path) free(m_depot_path); if (m_database_path) free(m_database_path); @@ -454,6 +458,8 @@ // res = this->check_consistency(); // if (res != 0) return res; + res = this->lock(LOCK_EX); + if (res != 0) return res; // // The fun starts here @@ -530,6 +536,8 @@ if (rollback_path) free(rollback_path); if (archive_path) free(archive_path); + (void)this->lock(LOCK_SH); + return res; } @@ -652,6 +660,9 @@ // res = this->check_consistency(); // if (res != 0) return res; + res = this->lock(LOCK_EX); + if (res != 0) return res; + // XXX: this may be superfluous // uninstall_file should be smart enough to do a mtime check... if (res == 0) res = this->prune_directories(); @@ -682,6 +693,8 @@ if (res == 0) res = prune_archives(); + (void)this->lock(LOCK_SH); + return res; } @@ -920,6 +933,33 @@ return this->SQL("COMMIT TRANSACTION"); } +int Depot::lock(int operation) { + int res = 0; + if (m_lock_fd == -1) { + m_lock_fd = open(m_depot_path, O_RDONLY); + if (m_lock_fd == -1) { + perror(m_depot_path); + res = -1; + } + } + res = flock(m_lock_fd, operation); + if (res == -1) { + perror(m_depot_path); + } + return res; +} + +int Depot::unlock(void) { + int res = 0; + res = flock(m_lock_fd, LOCK_UN); + if (res == -1) { + perror(m_depot_path); + } + close(m_lock_fd); + m_lock_fd = -1; + return res; +} + int Depot::insert(Archive* archive) { // Don't insert an archive that is already in the database assert(archive->serial() == 0); Modified: trunk/darwinup/Depot.h =================================================================== --- trunk/darwinup/Depot.h 2008-10-24 05:42:44 UTC (rev 396) +++ trunk/darwinup/Depot.h 2008-10-24 07:35:48 UTC (rev 397) @@ -72,6 +72,10 @@ protected: + // Serialize access to the Depot via flock(2). + int lock(int operation); + int unlock(void); + // Inserts an Archive into the database. // This modifies the Archive's serial number. // If the Archive already has a serial number, it cannot be inserted. @@ -109,4 +113,5 @@ char* m_depot_path; char* m_database_path; char* m_archives_path; + int m_lock_fd; };

1 0

[396] trunk/darwinup/File.cpp
by source_changes＠macosforge.org 24 Oct '08

24 Oct '08

Revision: 396 http://trac.macosforge.org/projects/darwinbuild/changeset/396 Author: kvv(a)apple.com Date: 2008-10-23 22:42:44 -0700 (Thu, 23 Oct 2008) Log Message: ----------- build with -Wformat-security Modified Paths: -------------- trunk/darwinup/File.cpp Modified: trunk/darwinup/File.cpp =================================================================== --- trunk/darwinup/File.cpp 2008-10-24 01:10:36 UTC (rev 395) +++ trunk/darwinup/File.cpp 2008-10-24 05:42:44 UTC (rev 396) @@ -122,12 +122,13 @@ void File::print(FILE* stream) { - char* dig = m_digest ? m_digest->string() : strdup(""); + char* dig = m_digest ? m_digest->string() : + strdup(" "); char mode_str[12]; strmode(m_mode, mode_str); - fprintf(stream, "%s % 4d % 4d % 40s %s\n", mode_str, m_uid, m_gid, dig, m_path); + fprintf(stream, "%s % 4d % 4d %s %s\n", mode_str, m_uid, m_gid, dig, m_path); free(dig); } @@ -371,4 +372,4 @@ file = FileFactory(0, NULL, FILE_INFO_NONE, path, sb.st_mode, sb.st_uid, sb.st_gid, sb.st_size, NULL); return file; -} \ No newline at end of file +}

1 0

[395] trunk/plists/8A428.plist
by source_changes＠macosforge.org 24 Oct '08

24 Oct '08

Revision: 395 http://trac.macosforge.org/projects/darwinbuild/changeset/395 Author: wsiegrist(a)apple.com Date: 2008-10-23 18:10:36 -0700 (Thu, 23 Oct 2008) Log Message: ----------- Add gnutar dependency to Tokend Modified Paths: -------------- trunk/plists/8A428.plist Modified: trunk/plists/8A428.plist =================================================================== --- trunk/plists/8A428.plist 2008-10-15 01:01:09 UTC (rev 394) +++ trunk/plists/8A428.plist 2008-10-24 01:10:36 UTC (rev 395) @@ -5837,6 +5837,7 @@ file_cmds, gcc_os, gcc_select, + gnutar, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities,

1 0

[394] trunk/plists/9A581.plist
by source_changes＠macosforge.org 15 Oct '08

15 Oct '08

Revision: 394 http://trac.macosforge.org/projects/darwinbuild/changeset/394 Author: wsiegrist(a)apple.com Date: 2008-10-14 18:01:09 -0700 (Tue, 14 Oct 2008) Log Message: ----------- More IOKitUser dependencies Modified Paths: -------------- trunk/plists/9A581.plist Modified: trunk/plists/9A581.plist =================================================================== --- trunk/plists/9A581.plist 2008-10-07 22:01:58 UTC (rev 393) +++ trunk/plists/9A581.plist 2008-10-15 01:01:09 UTC (rev 394) @@ -2673,6 +2673,12 @@ dependencies = { build = ( bootstrap_cmds, + gcc_select, + Libc_headers, + IOHIDFamily, + IONetworkingFamily, + IOGraphics, + AppleRAID, xnu, system_cmds, shell_cmds,

1 0

propchange - r392 svn:log
by source_changes＠macosforge.org 07 Oct '08

07 Oct '08

Author: wsiegrist(a)apple.com Revision: 392 Property Name: svn:log @@ -1 +1,3 @@ -Do not copy xcode resources separately since they are included in the dynamic dependency list \ No newline at end of file +* Do not copy xcode resources separately since they are included in the dynamic dependency list. +* Load gcc(42) roots as necessary +

1 0

[393] trunk/plists/9A581.plist
by source_changes＠macosforge.org 07 Oct '08

07 Oct '08

Revision: 393 http://trac.macosforge.org/projects/darwinbuild/changeset/393 Author: wsiegrist(a)apple.com Date: 2008-10-07 15:01:58 -0700 (Tue, 07 Oct 2008) Log Message: ----------- More dependency fixes for Leopard Modified Paths: -------------- trunk/plists/9A581.plist Modified: trunk/plists/9A581.plist =================================================================== --- trunk/plists/9A581.plist 2008-10-07 22:01:41 UTC (rev 392) +++ trunk/plists/9A581.plist 2008-10-07 22:01:58 UTC (rev 393) @@ -2674,6 +2674,10 @@ build = ( bootstrap_cmds, xnu, + system_cmds, + shell_cmds, + file_cmds, + text_cmds, ); header = ( PowerManagement, @@ -8189,12 +8193,14 @@ launchd = { dependencies = { build = ( + IOKitUser, Libm, Libsystem, bash, bootstrap_cmds, bsm, cctools, + file, file_cmds, gcc, gcc_select, @@ -8667,6 +8673,12 @@ version = 32564; }; libsecurity_cdsa_client = { + dependencies = { + build = ( + Libsyscall, + Kerberos, + ); + }; environment = { RC_ARCHS = "ppc ppc64 i386 x86_64"; }; @@ -8753,6 +8765,22 @@ version = 28631; }; libsecurity_keychain = { + dependencies = { + build = ( + file_cmds, + cctools, + CF, + xnu, + Security, + Libc_headers, + architecture, + libsecurity_utilities, + libsecurity_cdsa_utilities, + libsecurity_cdsa_client, + CommonCrypto, + CarbonHeaders, + ); + }; environment = { RC_ARCHS = "ppc ppc64 i386 x86_64"; }; @@ -9172,6 +9200,7 @@ RC_ARCHS = "ppc ppc64 i386 x86_64"; }; original = mDNSResponder; + target = SystemLibraries; }; mail_cmds = { dependencies = {

1 0

[392] trunk/darwinbuild/installXcode31
by source_changes＠macosforge.org 07 Oct '08

07 Oct '08

Revision: 392 http://trac.macosforge.org/projects/darwinbuild/changeset/392 Author: wsiegrist(a)apple.com Date: 2008-10-07 15:01:41 -0700 (Tue, 07 Oct 2008) Log Message: ----------- Do not copy xcode resources separately since they are included in the dynamic dependency list Modified Paths: -------------- trunk/darwinbuild/installXcode31 Modified: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 2008-09-27 00:19:01 UTC (rev 391) +++ trunk/darwinbuild/installXcode31 2008-10-07 22:01:41 UTC (rev 392) @@ -33,7 +33,7 @@ JAMFILES="/Developer/Makefiles/pbx_jamfiles" -XCODERESOURCES="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/" +#XCODERESOURCES="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/" RPATH=/Developer/Library/PrivateFrameworks @@ -63,6 +63,19 @@ } ### +### Load opensource binaries if they dont exist so we can symlink to them +### +LoadBinaries() { + echo "Loading binaries ..." + if [ ! -f "$BUILDROOT/usr/bin/gcc" ]; then + darwinbuild -load gcc + fi + if [ ! -f "$BUILDROOT/usr/bin/gcc-4.2" ]; then + darwinbuild -load gcc_42 + fi +} + +### ### Recurse through frameworks and libraries looking for dependencies ### RecurseLibs() { @@ -154,8 +167,8 @@ ln -s loper/Library/PrivateFrameworks R popd > /dev/null - echo "Copying Jamfiles and Xcode Resources ..." - find ".$JAMFILES" ".$XCODERESOURCES" | cpio -o -c | \ + echo "Copying Jamfiles ..." + find ".$JAMFILES" | cpio -o -c | \ sed -e 's,$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks,/XCD/SY///////Library/PrivateFrameworks,g' \ -e 's,/Developer/Makefiles/pbx_jamfiles,/XCD/loper/Makefiles/pbx_jamfiles,g' \ -e 's,/Developer/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/loper/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ @@ -222,6 +235,7 @@ AppendExtraFiles GenerateFileNames CopyFiles +LoadBinaries SymlinkBinaries popd > /dev/null

1 0