Author: branden
Date: 2005-06-22 12:30:31 -0500 (Wed, 22 Jun 2005)
New Revision: 248
Removed:
branches/migrate-from-dbs-to-quilt/debian/scripts/up-scripts
Modified:
branches/migrate-from-dbs-to-quilt/debian/changelog
branches/migrate-from-dbs-to-quilt/debian/rules
branches/migrate-from-dbs-to-quilt/debian/setperms
Log:
Adjust method for creating patched source tree:
+ Stop using dbs's "setup" phony target. Because it is phony, it provokes
gratuitous rebuilds of targets if the package build fails. (I.e., it
pretty much forces the entire build to start over from the beginning.)
+ Drop debian/scripts/up-scripts (invoked by "setup") and all references to
it.
+ Add new target "$(SOURCE_TREE)", which copies the source tree into
build-tree using hardlinks (as up-scripts did).
+ Make dbs's target "$(patched)" depend on "$(SOURCE_TREE)".
+ Make targets dependend on an unpacked source tree depend on "$(patched)"
(reverting r197).
Modified: branches/migrate-from-dbs-to-quilt/debian/changelog
===================================================================
--- branches/migrate-from-dbs-to-quilt/debian/changelog 2005-06-22 17:09:38 UTC
(rev 247)
+++ branches/migrate-from-dbs-to-quilt/debian/changelog 2005-06-22 17:30:31 UTC
(rev 248)
@@ -143,14 +143,10 @@
* Rework source package to consist of an unpacked source tree, instead of
shipping a .tar.gz inside the .orig.tar.gz.
- + Add debian/scripts/up-scripts (called automatically by dbs's "setup"
- target), which copies the source tree into build-tree using hardlinks.
- + Update debian/setperms to ensure that up-scripts is executable.
+ + Add new target "$(SOURCE_TREE)", which copies the source tree into
+ build-tree using hardlinks.
+ + Make dbs's target "$(patched)" depend on "$(SOURCE_TREE)".
+ Update debian/vars to stop defining SOURCE_DIR variable.
- + Put debian/scripts in PATH and export it from debian/rules, so that dbs
- can find up-scripts.
- + Update target dependencies in debian/rules from "$(patched)" to "setup",
- so that we can be sure up-scripts is run.
* Make .orig.tar.gz preparation less opaque.
+ Add prune-upstream-tree and make-orig-tar-gz phony targets to
Modified: branches/migrate-from-dbs-to-quilt/debian/rules
===================================================================
--- branches/migrate-from-dbs-to-quilt/debian/rules 2005-06-22 17:09:38 UTC
(rev 247)
+++ branches/migrate-from-dbs-to-quilt/debian/rules 2005-06-22 17:30:31 UTC
(rev 248)
@@ -33,10 +33,6 @@
include $(SCRIPT_DIR)/dpkg-arch.mk
endif
-# Update $PATH so that dbs will be able to find our "up-scripts" script.
-PATH = $(shell echo $$PATH:debian/scripts)
-export PATH
-
# This is a horrendous kludge to ensure that some scripts we need are
executable.
DUMMY:=$(shell if ! [ -x debian/setperms ]; then chmod 755 debian/setperms; fi)
DUMMY:=$(shell debian/setperms)
@@ -145,6 +141,22 @@
rm -f debian/xserver-xorg-dbg.templates
rm -f $(STAMP_DIR)/genscripts
+# This rule sets up a copy of the source tree. Populating the directory is not
+# an atomic operation, so copy to a temporary location and then move the
+# directory into place when we're done.
+$(SOURCE_TREE):
+ mkdir -p build-tree
+ if [ -e [EMAIL PROTECTED] ]; then \
+ echo "Problem creating $(SOURCE_TREE); [EMAIL PROTECTED] is in the
way." >&2; \
+ exit 1; \
+ fi
+ cp -drl xc [EMAIL PROTECTED]
+ mv [EMAIL PROTECTED] $@
+
+# Add a dependency on $(SOURCE_TREE) to dbs's "$(patched)" target so that dbs
+# does not attempt to patch a source tree that isn't present.
+$(patched): $(SOURCE_TREE)
+
# This is a temporary hack to tide us over until we've weaned ourselves off of
# dbs. If this were meant to be good enough for dbs itself, it would be
# submitted to the Debian BTS as a patch to dbs.
@@ -245,7 +257,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE
build-server RULE BELOW
real-build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: setup $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build: $(patched) $(STAMP_DIR)/genscripts
dh_testdir
# Symlink some of the libraries on which we build-depend into
# imports/{lib,include} so we don't have to pull in -L/usr/include and
@@ -577,7 +589,7 @@
# DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build
RULE ABOVE
build-server: $(STAMP_DIR)/build-server
-$(STAMP_DIR)/build-server: setup $(STAMP_DIR)/genscripts
+$(STAMP_DIR)/build-server: $(patched) $(STAMP_DIR)/genscripts
dh_testdir
# Create source tree for static, debuggable Xorg server.
cp -drl $(SOURCE_TREE) $(SOURCE_TREE)-xserver-xorg-dbg
@@ -783,7 +795,7 @@
#
# Note: This rule is for Debian package maintainers' convenience, and is not
# needed for conventional build scenarios.
-patch-audit: setup
+patch-audit: $(patched)
@if egrep -il 'Hunk.*succeeded at.*(fuzz|offset)' \
stampdir/log/patches/*; then \
echo "The above patches had fuzz or offsets. Please fix." >&2; \
Deleted: branches/migrate-from-dbs-to-quilt/debian/scripts/up-scripts
===================================================================
--- branches/migrate-from-dbs-to-quilt/debian/scripts/up-scripts
2005-06-22 17:09:38 UTC (rev 247)
+++ branches/migrate-from-dbs-to-quilt/debian/scripts/up-scripts
2005-06-22 17:30:31 UTC (rev 248)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-if ! [ -d build-tree/xc ]; then
- mkdir -p build-tree
- cp -drl xc build-tree
-fi
-
-# vim:set ai sts=4 sw=4 tw=80:
Modified: branches/migrate-from-dbs-to-quilt/debian/setperms
===================================================================
--- branches/migrate-from-dbs-to-quilt/debian/setperms 2005-06-22 17:09:38 UTC
(rev 247)
+++ branches/migrate-from-dbs-to-quilt/debian/setperms 2005-06-22 17:30:31 UTC
(rev 248)
@@ -5,7 +5,6 @@
set -e
for FILE in getglibcversion \
- up-scripts \
vars*; do
chmod 755 debian/scripts/$FILE
done
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
