[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r5615 - in glibc-package/trunk/debian: . control.in rules.d



Author: aurel32
Date: 2013-06-01 20:03:16 +0000 (Sat, 01 Jun 2013)
New Revision: 5615

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/control
   glibc-package/trunk/debian/control.in/main
   glibc-package/trunk/debian/rules.d/build.mk
Log:
  * rules.d/build.mk: use rdfind + symlinks instead of fdupes + handcoded
    shell script to optimize disk space.




Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2013-05-31 22:50:28 UTC (rev 5614)
+++ glibc-package/trunk/debian/changelog	2013-06-01 20:03:16 UTC (rev 5615)
@@ -20,6 +20,8 @@
     (Closes: #708741).
   * Update testsuite-checking/expected-results-powerpc-linux-gnuspe-libc
     (Closes: #693895).
+  * rules.d/build.mk: use rdfind + symlinks instead of fdupes + handcoded
+    shell script to optimize disk space.
 
  -- Adam Conrad <adconrad@0c3.net>  Thu, 16 May 2013 16:09:55 -0600
 

Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control	2013-05-31 22:50:28 UTC (rev 5614)
+++ glibc-package/trunk/debian/control	2013-06-01 20:03:16 UTC (rev 5615)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: required
 Build-Depends: gettext, dpkg-dev (>= 1.16.0), bzip2, xz-utils, file, quilt,
- autoconf, gawk, debhelper (>= 7.4.3), fdupes,
+ autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks,
  linux-libc-dev (>= 3.2.1) [linux-any], linux-libc-dev (>= 3.4) [amd64 i386 x32],
  libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev (>= 2:1.3.99.dfsg.git20120923~) [hurd-i386],

Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main	2013-05-31 22:50:28 UTC (rev 5614)
+++ glibc-package/trunk/debian/control.in/main	2013-06-01 20:03:16 UTC (rev 5615)
@@ -2,7 +2,7 @@
 Section: libs
 Priority: required
 Build-Depends: gettext, dpkg-dev (>= 1.16.0), bzip2, xz-utils, file, quilt,
- autoconf, gawk, debhelper (>= 7.4.3), fdupes,
+ autoconf, gawk, debhelper (>= 7.4.3), rdfind, symlinks,
  linux-libc-dev (>= 3.2.1) [linux-any], linux-libc-dev (>= 3.4) [amd64 i386 x32],
  libaudit-dev [linux-any], libcap-dev [linux-any], libselinux-dev [linux-any],
  mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20120520-2~) [hurd-i386], gnumach-dev (>= 2:1.3.99.dfsg.git20120923~) [hurd-i386],

Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk	2013-05-31 22:50:28 UTC (rev 5614)
+++ glibc-package/trunk/debian/rules.d/build.mk	2013-06-01 20:03:16 UTC (rev 5615)
@@ -106,18 +106,8 @@
 	    objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/build-tree/locales-all \
 	    localedata/install-locales; \
 	  sync; \
-	  cd $(CURDIR)/build-tree/locales-all/usr/lib/locale ; \
-	  fdupes -1 -H -q -R . | while read line ; do \
-	    set -- $${line} ; \
-	    tgt="$${1##./}" ; \
-	    shift ; \
-	    while [ "$$#" != 0 ] ; do \
-	      link="$${1##./}" ; \
-	      reltgt="$$(echo $$link | sed -e 's,[^/]\+$$,,g' -e 's,[^/]\+,..,g')$${tgt}" ; \
-	      ln -sf $${reltgt} $${link} ; \
-	      shift ; \
-	    done ; \
-	  done ; \
+	  rdfind -outputname /dev/null -makesymlinks true -removeidentinode false $(CURDIR)/build-tree/locales-all/usr/lib/locale ; \
+	  symlinks -r -s -c $(CURDIR)/build-tree/locales-all/usr/lib/locale ; \
 	fi
 endif
 	touch $@


Reply to: