fixes to subroutines, increased max priority

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f673817..a755580 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,3 +1,8 @@
+*) 2005-08-27
+
+- fixes to create_buildorder subroutine
+- higher max priority
+

 *) 2005-08-24
 
 - hdw-get fixes
 *) 2005-08-24
 
 - hdw-get fixes

diff --git a/scripts/Build-Distro b/scripts/Build-Distro
index c38bc35..e9dc2ce 100755 (executable)
--- a/scripts/Build-Distro
+++ b/scripts/Build-Distro
@@ -6,7 +6,7 @@
 # 
 
 # define max priority
 # 
 
 # define max priority

-max=13
+max=15

 stages="0 1"
 no_src_del=""
 
 stages="0 1"
 no_src_del=""
 

diff --git a/scripts/subroutines b/scripts/subroutines
index 705af2f..d62ac8f 100755 (executable)
--- a/scripts/subroutines
+++ b/scripts/subroutines
@@ -244,6 +244,7 @@ create_buildorder() {
                                for package in ./packages/$dir/[!C]*; do
 
                pkg=`basename $package`
                                for package in ./packages/$dir/[!C]*; do
 
                pkg=`basename $package`

+               [ -f $package -a "$pkg" != "`basename $dir`" ] && continue

                if [ -d $package -a -f $package/$pkg ] ; then
 
                [ -z "`echo $delpackages | grep $dir/$pkg`" ] && \
                if [ -d $package -a -f $package/$pkg ] ; then
 
                [ -z "`echo $delpackages | grep $dir/$pkg`" ] && \