Rename list2cds to sort_deps - more accurate name now that other code does the per-disc splitting later
This commit is contained in:
parent
bdb3e3984b
commit
b45e780519
8
Makefile
8
Makefile
|
@ -44,7 +44,7 @@ endif
|
||||||
|
|
||||||
## Internal variables
|
## Internal variables
|
||||||
apt=$(BASEDIR)/tools/apt-selection
|
apt=$(BASEDIR)/tools/apt-selection
|
||||||
list2cds=$(BASEDIR)/tools/list2cds
|
sort_deps=$(BASEDIR)/tools/sort_deps
|
||||||
md5sum=md5sum
|
md5sum=md5sum
|
||||||
jigdo_cleanup=$(BASEDIR)/tools/jigdo_cleanup
|
jigdo_cleanup=$(BASEDIR)/tools/jigdo_cleanup
|
||||||
grab_md5=$(BASEDIR)/tools/grab_md5
|
grab_md5=$(BASEDIR)/tools/grab_md5
|
||||||
|
@ -255,7 +255,7 @@ packagelists: ok apt-update genlist
|
||||||
# Build the raw list (cpp output) with doubles and spaces
|
# Build the raw list (cpp output) with doubles and spaces
|
||||||
$(BDIR)/rawlist:
|
$(BDIR)/rawlist:
|
||||||
# Dirty workaround for saving space, we add some hints to break ties.
|
# Dirty workaround for saving space, we add some hints to break ties.
|
||||||
# This is just a temporal solution, list2cds should be a little bit less
|
# This is just a temporal solution, sort_deps should be a little bit less
|
||||||
# silly so that this is not needed. For more info have a look at
|
# silly so that this is not needed. For more info have a look at
|
||||||
# http://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html
|
# http://lists.debian.org/debian-cd/2004/debian-cd-200404/msg00093.html
|
||||||
$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
|
$(Q)if [ "$(SOURCEONLY)"x != "yes"x ] ; then \
|
||||||
|
@ -322,9 +322,9 @@ $(BDIR)/list: $(BDIR)/rawlist
|
||||||
## IMAGE BUILDING ##
|
## IMAGE BUILDING ##
|
||||||
|
|
||||||
image-trees: ok genlist
|
image-trees: ok genlist
|
||||||
# Use list2cds to do the dependency sorting
|
# Use sort_deps to do the dependency sorting
|
||||||
$(Q)for ARCH in $(ARCHES_NOSRC); do \
|
$(Q)for ARCH in $(ARCHES_NOSRC); do \
|
||||||
ARCH=$$ARCH $(list2cds) $(BDIR)/list; \
|
ARCH=$$ARCH $(sort_deps) $(BDIR)/list; \
|
||||||
done
|
done
|
||||||
$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
|
$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
|
||||||
$(grab_source_list) $(BDIR) $(ADIR) $(BDIR)/list $(BDIR)/packages; \
|
$(grab_source_list) $(BDIR) $(ADIR) $(BDIR)/list $(BDIR)/packages; \
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
#
|
#
|
||||||
# and it sorts those packages such that dependencies are met in order
|
# and it sorts those packages such that dependencies are met in order
|
||||||
#
|
#
|
||||||
|
# Used to be called list2cds, renamed as it now just sorts
|
||||||
|
# dependencies. Later code in make_disc_trees.pl actually splits on a
|
||||||
|
# per-disc basis now.
|
||||||
|
|
||||||
use strict;
|
use strict;
|
||||||
|
|
||||||
|
@ -30,8 +33,8 @@ my @output;
|
||||||
|
|
||||||
$| = 1; # Autoflush for debugging
|
$| = 1; # Autoflush for debugging
|
||||||
|
|
||||||
open(LOG, ">$dir/log.list2cds.$arch")
|
open(LOG, ">$dir/log.sort_deps.$arch")
|
||||||
|| die "Can't write in $dir/log.list2cds.$arch !\n";
|
|| die "Can't write in $dir/log.sort_deps.$arch !\n";
|
||||||
|
|
||||||
sub msg {
|
sub msg {
|
||||||
my $level = shift;
|
my $level = shift;
|
||||||
|
@ -45,7 +48,7 @@ my %included;
|
||||||
my %excluded;
|
my %excluded;
|
||||||
my %packages;
|
my %packages;
|
||||||
|
|
||||||
msg(0, "Running list2cds to sort packages for $arch:\n");
|
msg(0, "Running sort_deps to sort packages for $arch:\n");
|
||||||
msg(1, "======================================================================
|
msg(1, "======================================================================
|
||||||
Here are the settings you've chosen for making the list:
|
Here are the settings you've chosen for making the list:
|
||||||
Architecture: $arch
|
Architecture: $arch
|
||||||
|
|
Loading…
Reference in New Issue