Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Jan 2015 08:48:06 +0000 (UTC)
From:      Luigi Rizzo <luigi@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r277641 - head/release/picobsd/build
Message-ID:  <201501240848.t0O8m6dN039964@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: luigi
Date: Sat Jan 24 08:48:05 2015
New Revision: 277641
URL: https://svnweb.freebsd.org/changeset/base/277641

Log:
  do not strip /stand
  
  This is a temporary workaround until the elftoolchain's version
  of strip is fixed:
  
  The previous (GNU) strip, when acting on a file with multiple links,
  would modify the one and only file in place (which means creating
  a new stripped copy, and then writing it back to the original).
  
  The new version from elftoolchain creates the new file and then
  unlinks the old one and renames the new.
  With multiple hard links, the original remains alive.  In the /stand
  directory, this ends up creating 80+ copies of the same file.

Modified:
  head/release/picobsd/build/picobsd

Modified: head/release/picobsd/build/picobsd
==============================================================================
--- head/release/picobsd/build/picobsd	Sat Jan 24 08:35:49 2015	(r277640)
+++ head/release/picobsd/build/picobsd	Sat Jan 24 08:48:05 2015	(r277641)
@@ -734,8 +734,8 @@ populate_mfs_tree() {
     [ -n "${copy_files}" ] && do_copyfiles ${dst} copy_files
     do_copyfiles_user ${dst} || true
     [ -n "${links}" ] && do_links ${dst} links
-    strip ${dst}/libexec/* ${dst}/lib/* ${dst}/stand/* 2> /dev/null || true
-
+    strip ${dst}/libexec/* ${dst}/lib/* 2> /dev/null || true
+    # strip ${dst}/stand/* 2> /dev/null || true
     # The 'import_files' mechanism is deprecated, as it requires
     # root permissions to follow the symlinks, and also does
     # not let you rename the entries.
@@ -756,7 +756,7 @@ populate_mfs_tree() {
 	# override the owner
 	echo "/set uid=0 gid=0" > mtree.out
 	mtree -ic -p ${dst} -k "" >> mtree.out
-	log "mtre.out at ${BUILDDIR}/mtree.out"
+	log "mtree.out at ${BUILDDIR}/mtree.out size  ${MFS_SIZE}k"
 	makefs -t ffs -o bsize=4096 -o fsize=512 \
 		-s ${MFS_SIZE}k -f 1000 -F mtree.out ${c_fs} ${dst}
 	ls -l ${c_fs} )



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501240848.t0O8m6dN039964>