Well... a bit long... hope it helps Samuel! ;-)
paul@kibar:~/own3/debian-cd$ patch -p1 < patch-debian-cd
patching file CONF.sh
patching file Makefile
patching file data/bullseye/README.html.in
patching file data/bullseye/exclude-udebs
patching file debian/changelog
Hunk #1 succeeded at 58 (offset 16 lines).
patching file easy-build.sh
patching file tasks/bullseye/include
patching file tools/apt-selection
patching file tools/make_disc_trees.pl
Hunk #1 succeeded at 754 (offset 4 lines).
patching file tools/start_new_disc
Hunk #1 FAILED at 351.
1 out of 1 hunk FAILED -- saving rejects to file tools/start_new_disc.rej
patching file update-cd
paul@kibar:~/own3/debian-cd$ patch -p1 < patch-debootstrap
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/debootstrap b/debootstrap
|index fef1ab5..6e6b340 100755
|--- a/debootstrap
|+++ b/debootstrap
--------------------------
File to patch: ^C
paul@kibar:~/own3/debian-cd$ cat tools/start_new_disc.rej
--- tools/start_new_disc
+++ tools/start_new_disc
@@ -351,150 +351,87 @@ if [ -n "$LOCAL" ] ; then
SECTIONS="$SECTIONS local"
fi
-# these two lines can be inserted below the "Architectures" line below,
-# to sort out broken Release files just after the testing --> stable
-# transition
-# sed -e "s/^Suite: .*$/Suite: stable/" | \
-# sed -e "s/^Description: .*$/Description: Debian $DEBVERSION/" | \
-
-if [ -e "$MIRROR/dists/$CODENAME/Release" ] ; then
- # Strip the MD5Sum and SHA1 fields
- # Update some other information as well
- sed -e "s/^Architectures: .*$/Architectures: $ARCHES/" \
- $MIRROR/dists/$CODENAME/Release | \
- sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
- perl -ne 'if (/^(MD5Sum|SHA1|SHA256|SHA512):/i) { $f=1; next }
- if ($f) {
- unless (/^ /) { print; $f=0 }
- } else { print }' > dists/$CODENAME/Release
- if [ "$EARLY_BUILD_HACK"x = "1"x ] ; then
- RDATE=`awk '/^Date:/ { print $2,$3,$4,$5}' dists/$CODENAME/Release`
- sed -i -e "s/^Suite: .*$/Suite: stable/" dists/$CODENAME/Release
- sed -i -e "s/^Description: .*$/Description: Debian $DEBVERSION
Released $RDATE/" dists/$CODENAME/Release
- fi
-
- # Create the suite symlink
- SUITE=$(sed -n "/^Suite:/ s/.*: //p" dists/$CODENAME/Release)
- if [ -n "$SUITE" ] && [ x"$SUITE" != x"$CODENAME" ]; then
- ln -sf $CODENAME dists/$SUITE
- fi
-else
- echo "ERROR: Release file ($MIRROR/dists/$CODENAME/Release) is missing !"
- exit 1
-fi
-
-if [ "$BACKPORTS"x != ""x ]; then
- if [ -e "$MIRROR/dists/$CODENAME-backports/Release" ] ; then
+start_new_release() {
+ DIST=$1
+ # these two lines can be inserted below the "Architectures" line below,
+ # to sort out broken Release files just after the testing --> stable
+ # transition
+ # sed -e "s/^Suite: .*$/Suite: stable/" | \
+ # sed -e "s/^Description: .*$/Description: Debian $DEBVERSION/" | \
+
+ if [ -e "$MIRROR/dists/$DIST/Release" ] ; then
# Strip the MD5Sum and SHA1 fields
# Update some other information as well
sed -e "s/^Architectures: .*$/Architectures: $ARCHES/" \
- $MIRROR/dists/$CODENAME-backports/Release | \
- sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
- perl -ne 'if (/^(MD5Sum|SHA1|SHA256|SHA512):/i) { $f=1; next }
- if ($f) {
- unless (/^ /) { print; $f=0 }
- } else { print }' > dists/$CODENAME-backports/Release
+ $MIRROR/dists/$DIST/Release | \
+ sed -e "s|^Components: .*$|Components: $SECTIONS|" | \
+ perl -ne 'if (/^(MD5Sum|SHA1|SHA256|SHA512):/i) { $f=1; next }
+ if ($f) {
+ unless (/^ /) { print; $f=0 }
+ } else { print }' > dists/$DIST/Release
if [ "$EARLY_BUILD_HACK"x = "1"x ] ; then
- RDATE=`awk '/^Date:/ { print $2,$3,$4,$5}'
dists/$CODENAME-backports/Release`
- sed -i -e "s/^Suite: .*$/Suite: stable/"
dists/$CODENAME-backports/Release
- sed -i -e "s/^Description: .*$/Description: Debian $DEBVERSION
Released $RDATE/" dists/$CODENAME-backports/Release
+ RDATE=`awk '/^Date:/ { print $2,$3,$4,$5}' dists/$DIST/Release`
+ sed -i -e "s/^Suite: .*$/Suite: stable/" dists/$DIST/Release
+ sed -i -e "s/^Description: .*$/Description: Debian $DEBVERSION
Released $RDATE/" dists/$DIST/Release
fi
# Create the suite symlink
- SUITE=$(sed -n "/^Suite:/ s/.*: //p" dists/$CODENAME-backports/Release)
- if [ -n "$SUITE" ] && [ x"$SUITE" != x"$CODENAME-backports" ]; then
- ln -sf $CODENAME-backports dists/$SUITE
+ SUITE=$(sed -n "/^Suite:/ s/.*: //p" dists/$DIST/Release)
+ if [ -n "$SUITE" ] && [ x"$SUITE" != x"$DIST" ]; then
+ ln -sf $DIST dists/$SUITE
fi
else
- echo "ERROR: Release file ($MIRROR/dists/$CODENAME-backports/Release)
is missing !"
+ echo "ERROR: Release file ($MIRROR/dists/$DIST/Release) is missing !"
exit 1
fi
-fi
-# Copying individual release files
-for ARCH in $ARCHES
-do
- for SECT in $SECTIONS
- do
- # Install the release files
- if [ -e "$MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release" ] ; then
- mkdir -p dists/$CODENAME/$SECT/binary-$ARCH
- cp $MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release \
- dists/$CODENAME/$SECT/binary-$ARCH/
- if [ "$DEBVERSION" != "testing" ] ; then
- sed -i "s/^Archive:.*$/Archive: stable/"
dists/$CODENAME/$SECT/binary-$ARCH/Release
- fi
- fi
- if [ -n "$NONUS" -a -e
"$NONUS/dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release" ] ; then
- mkdir -p dists/$CODENAME/non-US/$SECT/binary-$ARCH
- cp $NONUS/dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release \
- dists/$CODENAME/non-US/$SECT/binary-$ARCH/
- if [ "$DEBVERSION" != "testing" ] ; then
- sed -i "s/^Archive:.*$/Archive: stable/"
dists/$CODENAME/non-US/$SECT/binary-$ARCH/Release
- fi
- fi
- done
-
- if [ -n "$LOCALDEBS" -a -n "$LOCAL" ] ; then
- if [ -e $LOCALDEBS/dists/$CODENAME/local/binary-$ARCH/Release ] ; then
- mkdir -p dists/$CODENAME/local/binary-$ARCH
- cp $LOCALDEBS/dists/$CODENAME/local/binary-$ARCH/Release \
- dists/$CODENAME/local/binary-$ARCH/
- fi
- fi
-
- if [ -e
"$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release" ] ; then
- mkdir -p dists/$CODENAME/main/debian-installer/binary-$ARCH
- cp
$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
- dists/$CODENAME/main/debian-installer/binary-$ARCH/
- if [ "$DEBVERSION" != "testing" ] ; then
- sed -i "s/^Archive:.*$/Archive: stable/"
dists/$CODENAME/main/debian-installer/binary-$ARCH/Release
- fi
- fi
-done
-
-# Copying individual release files for backports
-if [ "$BACKPORTS"x != ""x ]; then
+ # Copying individual release files
for ARCH in $ARCHES
do
for SECT in $SECTIONS
do
- # Install the release files
- if [ -e
"$MIRROR/dists/$CODENAME-backports/$SECT/binary-$ARCH/Release" ] ; then
- mkdir -p dists/$CODENAME-backports/$SECT/binary-$ARCH
- cp $MIRROR/dists/$CODENAME-backports/$SECT/binary-$ARCH/Release
\
- dists/$CODENAME-backports/$SECT/binary-$ARCH/
+ # Install the release files
+ if [ -e "$MIRROR/dists/$DIST/$SECT/binary-$ARCH/Release" ] ; then
+ mkdir -p dists/$DIST/$SECT/binary-$ARCH
+ cp $MIRROR/dists/$DIST/$SECT/binary-$ARCH/Release \
+ dists/$DIST/$SECT/binary-$ARCH/
if [ "$DEBVERSION" != "testing" ] ; then
- sed -i "s/^Archive:.*$/Archive: stable/"
dists/$CODENAME-backports/$SECT/binary-$ARCH/Release
+ sed -i "s/^Archive:.*$/Archive: stable/"
dists/$DIST/$SECT/binary-$ARCH/Release
fi
- fi
- if [ -n "$NONUS" -a -e
"$NONUS/dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/Release" ] ; then
- mkdir -p dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH
- cp
$NONUS/dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/Release \
- dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/
+ fi
+ if [ -n "$NONUS" -a -e
"$NONUS/dists/$DIST/non-US/$SECT/binary-$ARCH/Release" ] ; then
+ mkdir -p dists/$DIST/non-US/$SECT/binary-$ARCH
+ cp $NONUS/dists/$DIST/non-US/$SECT/binary-$ARCH/Release \
+ dists/$DIST/non-US/$SECT/binary-$ARCH/
if [ "$DEBVERSION" != "testing" ] ; then
- sed -i "s/^Archive:.*$/Archive: stable/"
dists/$CODENAME-backports/non-US/$SECT/binary-$ARCH/Release
+ sed -i "s/^Archive:.*$/Archive: stable/"
dists/$DIST/non-US/$SECT/binary-$ARCH/Release
fi
- fi
+ fi
done
if [ -n "$LOCALDEBS" -a -n "$LOCAL" ] ; then
- if [ -e
$LOCALDEBS/dists/$CODENAME-backports/local/binary-$ARCH/Release ] ; then
- mkdir -p dists/$CODENAME-backports/local/binary-$ARCH
- cp
$LOCALDEBS/dists/$CODENAME-backports/local/binary-$ARCH/Release \
- dists/$CODENAME-backports/local/binary-$ARCH/
- fi
+ if [ -e $LOCALDEBS/dists/$DIST/local/binary-$ARCH/Release ] ; then
+ mkdir -p dists/$DIST/local/binary-$ARCH
+ cp $LOCALDEBS/dists/$DIST/local/binary-$ARCH/Release \
+ dists/$DIST/local/binary-$ARCH/
+ fi
fi
if [ -e
"$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release" ] ; then
- mkdir -p
dists/$CODENAME-backports/main/debian-installer/binary-$ARCH
- cp
$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
- dists/$CODENAME-backports/main/debian-installer/binary-$ARCH/
- if [ "$DEBVERSION" != "testing" ] ; then
- sed -i "s/^Archive:.*$/Archive: stable/"
dists/$CODENAME-backports/main/debian-installer/binary-$ARCH/Release
- fi
+ mkdir -p dists/$DIST/main/debian-installer/binary-$ARCH
+ cp
$MIRROR/dists/$DI_CODENAME/main/debian-installer/binary-$ARCH/Release \
+ dists/$DIST/main/debian-installer/binary-$ARCH/
+ if [ "$DEBVERSION" != "testing" ] ; then
+ sed -i "s/^Archive:.*$/Archive: stable/"
dists/$DIST/main/debian-installer/binary-$ARCH/Release
+ fi
fi
done
+}
+
+start_new_release $CODENAME
+
+if [ "$BACKPORTS"x != ""x ]; then
+ start_new_release $CODENAME-backports
fi
# Upgrade packages / kernels
paul@kibar:~/own3/debian-cd$
paul@kibar:~/own3/debian-cd$ . CONF.sh
paul@kibar:~/own3/debian-cd$ make
Can't find a working Packages file, tried
/home/sthibault/archive/merge/dists/sid/main/binary-hurd-i386/Packages.gz and
/home/sthibault/archive/merge/dists/sid/main/binary-hurd-i386/Packages.xz
Please refer to the README file for more information
about the different targets available.
