[Glibc-bsd-commits] r4867 - trunk/kfreebsd-10/debian

[Robert Millan]

Author: rmh
Date: 2013-08-04 20:55:17 +0000 (Sun, 04 Aug 2013)
New Revision: 4867

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Use config(8) from freebsd-buildutils.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-08-04 20:53:14 UTC (rev 4866)
+++ trunk/kfreebsd-10/debian/changelog	2013-08-04 20:55:17 UTC (rev 4867)
@@ -6,6 +6,7 @@
       be no particular reason to diverge on these.
     - Don't include LINPROCFS and COMPAT_LINUX in GENERIC. DEBIAN already does.
   * Add INCLUDE_CONFIG_FILE option.  (Closes: #706736)
+  * Use config(8) from freebsd-buildutils.
 
  -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 21:44:17 +0200
 

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-08-04 20:53:14 UTC (rev 4866)
+++ trunk/kfreebsd-10/debian/rules	2013-08-04 20:55:17 UTC (rev 4867)
@@ -45,7 +45,7 @@
 ORIG_DIR	:= kfreebsd-$(major)-$(tar_version)
 ORIG_TAR	:= kfreebsd-$(major)_$(tar_version).orig.tar.xz
 MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) WERROR= -DWITHOUT_SOURCELESS
-PATH		:= $(CURDIR)/config:/usr/lib/freebsd:$(PATH)
+PATH		:= /usr/lib/freebsd:$(PATH)
 
 MAKE += -DWITHOUT_CLANG_IS_CC
 
@@ -65,9 +65,7 @@
 
 get-orig-source:
 	rm -rf $(ORIG_DIR)
-	for i in sys usr.sbin/config ; do \
-		svn export -r $(svn_revision) $(SVN)/$$i $(ORIG_DIR)/$$i ; \
-	done
+	svn export -r $(svn_revision) $(SVN)/sys $(ORIG_DIR)/sys
 	cd $(ORIG_DIR) && $(CURDIR)/debian/prune.sh
 	tar --numeric-owner --owner 0 --group 0 -cJf ../$(ORIG_TAR) $(ORIG_DIR)
 	rm -rf $(ORIG_DIR)
@@ -109,7 +107,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -rf src kfreebsd-source-* flavor-* config
+	rm -rf src kfreebsd-source-* flavor-*
 	rm -f debian/kfreebsd-image-*.preinst
 	rm -f debian/kfreebsd-image-*.prerm
 	rm -f debian/kfreebsd-image-*.postinst
@@ -148,15 +146,8 @@
 
 	touch install-indep-stamp
 
-config: config-stamp
-config-stamp: src
-	rm -rf config
-	cp -af src/usr.sbin/config config
-	CFLAGS="$(shell pkg-config --cflags libbsd-overlay) -lbsd" $(MAKE) -C config
-	touch $@
-
 build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)
-src-flavor-%-stamp: src config
+src-flavor-%-stamp: src
 	cp -af src $(FLAVOR_DIR)-$*
 	touch $@
 build-flavor-%-stamp: src-flavor-%-stamp