summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-03-22 10:49:20 (GMT)
committerColin Watson <cjwatson@debian.org>2011-03-22 10:49:20 (GMT)
commitfc9499f925aac4c88570ee164e6f2bef565beca2 (patch)
treeb762fd9f1451f2aef848cd92a6b633c7153af5d6
parentb46263b4f796bd06f58c1cb962c8c55e934ba402 (diff)
downloaddebootstrap-fc9499f925aac4c88570ee164e6f2bef565beca2.zip
debootstrap-fc9499f925aac4c88570ee164e6f2bef565beca2.tar.gz
debootstrap-fc9499f925aac4c88570ee164e6f2bef565beca2.tar.bz2
Revert multiarch symlink; this is no longer needed now that dpkg has returned to a single-directory db layout.
-rw-r--r--debian/changelog2
-rw-r--r--scripts/gutsy1
-rw-r--r--scripts/sid1
3 files changed, 0 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 2594381..919d367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,6 @@ debootstrap (1.0.29) UNRELEASED; urgency=low
using that suite name.)
[ Colin Watson ]
- * For sid and gutsy (a.k.a. natty), install /var/lib/dpkg/info/$(dpkg
- --print-architecture) -> . symlink, to cope with multiarch dpkg.
* Add (Ubuntu) oneiric as a symlink to gutsy.
-- Joey Hess <joeyh@debian.org> Fri, 25 Feb 2011 16:10:44 -0400
diff --git a/scripts/gutsy b/scripts/gutsy
index 307de25..24c6a3f 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -69,7 +69,6 @@ first_stage_install () {
local ver="$(extract_deb_field "$TARGET/$deb" Version)"
mkdir -p "$TARGET/var/lib/dpkg/info"
- ln -nsf . "$TARGET/var/lib/dpkg/info/$ARCH"
echo \
"Package: $pkg
diff --git a/scripts/sid b/scripts/sid
index 442755a..5febdcc 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -58,7 +58,6 @@ first_stage_install () {
local ver="$(extract_deb_field "$TARGET/$deb" Version)"
mkdir -p "$TARGET/var/lib/dpkg/info"
- ln -nsf . "$TARGET/var/lib/dpkg/info/$ARCH"
echo \
"Package: $pkg