Check-in [b2e2a54947]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:b2e2a54947b5cc6417da21bcff10f343d1051c15
Date: 2012-09-03 07:10:56
User: BarryK
Comment:the fix for handling versioned deps in dependencies.sh was broken, reverted and re-implemented

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -131,10 +131,11 @@
 #120721 support ubuntu and debian arm multiarch.
 #120723 BOOT_DISABLEXORGWIZARD variable.
 #120724 'alsaconf' does not work on arm boards, BOOT_DISABLEALSACONF variable. refer /usr/sbin/alsawizard.
 #120830 my hunspell-en-us pet has pinstall.sh that creates symlinks of en_US.aff and en_US.dic from seamonkey and firefox. however, need to do this thoroughly.
 #120831 simplify repo-list radiobuttons for ppm.
+#120903 default radeon kms on again.
 
 #v431 accepts passed params, from woof_gui_tabs:
 #$1=$CHOICE_KERNELPKG $2=$CHOICE_SCSI $3=$CHOICE_BIGMODEM $4=$CHK_FB_STATE $5=$CHK_EXOTIC_STATE $6=$CHK_RADICAL_STATE
 #100912 add $7=CHK_SIMPLE_FILENAMES
 
@@ -2278,11 +2279,11 @@
   echo "Press ENTER key only to accept the default, any other char to flip:"
   for XDRIVER in $DRILIST #i915 radeon nouveau
   do
    KMSFLG='1'
    #[ "$XDRIVER" = "radeon" ] && [ "$DISTRO_BINARY_COMPAT" = "slackware" ] && KMSFLG='0' #01micko.
-   [ "$XDRIVER" = "radeon" ] && KMSFLG='0' #110918 seems need this off. 120526 try default on. 120605 turn off.
+   #[ "$XDRIVER" = "radeon" ] && KMSFLG='0' #110918 seems need this off. 120526 try default on. 120605 turn off. 120903 on again.
    echo -n "${XDRIVER} [${KMSFLG}]: "
    read KMSREPLY
    if [ "$KMSREPLY" ];then #110906 fix syntax error.
     #not the default...
     case $KMSFLG in

Changes to woof-code/rootfs-skeleton/usr/local/petget/dependencies.sh

@@ -25,10 +25,12 @@
 #111107 01micko: fix for '||' messing things up.
 #120203 BK: internationalized.
 #120221 jemimah: grep '[a-zA-Z]' so as to find deps with all capitals (ex: SDL).
 #120831 npierce, jemimah: findmissingpkgs.sh creates /tmp/petget_missingpkgs_patterns and /tmp/petget_missingpkgs_patterns_with_versioning, need to use latter here.
 #       refer: http://www.murga-linux.com/puppy/viewtopic.php?p=648934#648934
+#120903 revert 120831, broken.
+#120903 improve pkg db selection. fixes for versioned dependencies.
 
 export TEXTDOMAIN=petget___dependencies.sh
 export OUTPUT_CHARSET=UTF-8
 
 if [ -f ./PKGS_MANAGEMENT ];then #110723
@@ -60,32 +62,38 @@
 #this is the db of the main pkg...
 DB_MAIN="${PREPATH}Packages-`cat /tmp/petget/current-repo-triad`" #ex: Packages-slackware-12.2-official 110723
 if [ "$RUNNINGWOOF" = "no" ];then
  #...should have first preference when looking for dependencies...
  DB_OTHERS="`ls -1 ${PREPATH}Packages-* | grep -v "$DB_MAIN"`"
- #if DB_MAIN is puppy-4, puppy-3 or puppy-2, then only look in those...
- if [ "`echo "$DB_MAIN" | grep '\\-puppy\\-2'`" != "" ];then
-  DB_OTHERS="`echo "$DB_OTHERS" | grep '\\-puppy\\-2'`"
- else
-  if [ "`echo "$DB_MAIN" | grep '\\-puppy\\-3'`" != "" ];then
-   DB_OTHERS="`echo "$DB_OTHERS" | grep '\\-puppy\\-3'`"
-  else
-   if [ "`echo "$DB_MAIN" | grep '\\-puppy\\-4'`" != "" ];then
-    DB_OTHERS="`echo "$DB_OTHERS" | grep '\\-puppy\\-4'`"
-   else
-    #do not look in puppy-2, puppy-3 or puppy-4...
-    DB_OTHERS="`echo "$DB_OTHERS" | grep -v '\\-puppy\\-[234]'`"
-   fi
-  fi
- fi
+ #120903 improve pkg db selection...
+ case $DB_MAIN in
+  *-puppy-2-*) DB_OTHERS="" ;;
+  *-puppy-3-*) DB_OTHERS="" ;;
+  *-puppy-4-*) DB_OTHERS="" ;;
+  *-puppy-5-*) DB_OTHERS="" ;;
+  *) DB_OTHERS="`echo "$DB_OTHERS" | grep -v '\\-puppy\\-[2345]\\-'`" ;; #do not look in puppy-2, puppy-3, puppy-4 or puppy-5.
+ esac
+ case $DB_MAIN in
+  *-puppy-*)
+   true
+  ;;
+  *)
+   #looking in a compat-distro db, then only puppy db allow is Packages-puppy-${DISTRO_COMPAT_VERSION}-*
+   DB_OTHERS="$(echo "$DB_OTHERS" | grep -v '\-puppy\-')"
+   PUPDB="$(ls -1 ${PREPATH}Packages-puppy-${DISTRO_COMPAT_VERSION}-* 2>/dev/null)"
+   [ "$PUPDB" ] && DB_OTHERS="$DB_OTHERS
+$PUPDB"
+  ;;
+ esac
 else
  #running woof, restrict search for deps to only the one pkg db file.
  DB_OTHERS=""
 fi
 DB_OTHERS="`echo "$DB_OTHERS" | tr '\n' ' '`"
 
 #the question is, how deep to search for deps? i'll go down 2 levels... make it 3...
+echo -n "" > /tmp/petget_missingpkgs_patterns_acc #120903
 cp -f /tmp/petget_missingpkgs_patterns /tmp/petget_missingpkgs_patternsx
 echo "$(gettext 'HIERARCHY OF MISSING DEPENDENCIES OF PACKAGE') $TREE1" > /tmp/petget_deps_visualtreelog #w017
 echo "$(gettext "Format of each line: 'a-missing-dependent-pkg: missing dependencies of a-missing-dependent-pkg'")" >> /tmp/petget_deps_visualtreelog #w017
 for ONELEVEL in 1 2 3
 do
@@ -97,12 +105,14 @@
   depPATTERN="`echo -n "$depPATTERN" | sed -e 's%\\-%\\\\-%g'`" #backslash '-'
   #find database entry for this package...
   for ONEDB in $DB_MAIN $DB_OTHERS
   do
    DB_dependencies="`cat $ONEDB | cut -f 1,2,9 -d '|' | grep "$depPATTERN" | cut -f 3 -d '|' | head -n 1 | sed -e 's%,$%%'`"
+   xDB_dependencies="" #120903
    if [ "$DB_dependencies" != "" ];then
-    ALLDEPS_PATTERNS="`echo -n "$DB_dependencies" | tr ',' '\n' | grep '^+' | sed -e 's%^+%%' -e 's%$%|%' -e 's%^%|%'`" #put '|' on each end.
+    xDB_dependencies="`echo -n "$DB_dependencies" | tr ',' '\n' | cut -f 1 -d '&' | tr '\n' ','`" #120903 chop off any versioning info.
+    ALLDEPS_PATTERNS="`echo -n "$xDB_dependencies" | tr ',' '\n' | grep '^+' | sed -e 's%^+%%' -e 's%$%|%' -e 's%^%|%'`" #put '|' on each end.
     echo "$ALLDEPS_PATTERNS" > /tmp/petget_subpkg_deps_patterns
     MISSINGDEPS_PATTERNS="`grep --file=/tmp/petget_installed_patterns_all -v /tmp/petget_subpkg_deps_patterns`"
     echo "$MISSINGDEPS_PATTERNS" >> /tmp/petget_missingpkgs_patterns2
     #w017 log a visual tree...
     MISSDEPSLIST="`echo "$MISSINGDEPS_PATTERNS" | sed -e 's%|%%g' | tr '\n' ' '`"
@@ -120,80 +130,69 @@
     break
    fi
   done
  done
  sort -u /tmp/petget_missingpkgs_patterns2 > /tmp/petget_missingpkgs_patternsx
- cat /tmp/petget_missingpkgs_patternsx >> /tmp/petget_missingpkgs_patterns #accumulate them.
+ cat /tmp/petget_missingpkgs_patternsx >> /tmp/petget_missingpkgs_patterns_acc #accumulate them.
 done
-sort -u /tmp/petget_missingpkgs_patterns > /tmp/petget_missingpkgs_patternsx
-mv -f /tmp/petget_missingpkgs_patternsx /tmp/petget_missingpkgs_patterns
+
+#120903 bring back the versioning info from level1 (/tmp/petget_missingpkgs_patterns_with_versioning is created in findmissingpkgs.sh)...
+#restore the format ex |abiword|gt3.4| becomes |abiword&gt3.4| ...
+grep -v --file=/tmp/petget_missingpkgs_patterns /tmp/petget_missingpkgs_patterns_acc > /tmp/petget_missingpkgs_patterns_accx #make sure that 2nd file does not have any level1 deps.
+mv -f /tmp/petget_missingpkgs_patterns_accx /tmp/petget_missingpkgs_patterns_acc
+sed -e 's%|%\&%g' -e 's%^\&%|%' -e 's%\&$%|%' /tmp/petget_missingpkgs_patterns_with_versioning >> /tmp/petget_missingpkgs_patterns_acc
+sort -u /tmp/petget_missingpkgs_patterns_acc > /tmp/petget_missingpkgs_patternsx
+mv -f /tmp/petget_missingpkgs_patternsx /tmp/petget_missingpkgs_patterns_and_versioning_level1
+#...be careful here, _with_versioning file has |abiword|gt3.4|, _and_versioning has |abiword&gt3.4| format.
+#...a limitation, only versioning of the "level 1" deps is being retained here.
 
 #now find the entries in the databases...
 rm -f /tmp/petget_missing_dbentries* 2>/dev/null
 #for depPATTERN in `cat /tmp/petget_missingpkgs_patterns` #ex depPATTERN=|kdelibs| ex2: |kdelibs&gt2.3.6|
 #111107 01micko: fix for '||' messing things up...
-#for depPATTERN in `grep '[a-zA-Z]' /tmp/petget_missingpkgs_patterns` #ex depPATTERN=|kdelibs| ex2: |kdelibs&gt2.3.6|. 120221 jemimah
-#120831 actually, there is no version info in /tmp/petget_missingpkgs_patterns, findmissingpkgs.sh filtered it out,
-# need to use /tmp/petget_missingpkgs_patterns_with_versioning, which has lines like this: |kdebase|ge2.3.6|lt2.4.5|
-for depPATTERN in `grep '[a-zA-Z]' /tmp/petget_missingpkgs_patterns_with_versioning` #120831
+for depPATTERN in `grep '[a-zA-Z]' /tmp/petget_missingpkgs_patterns_and_versioning_level1` #ex depPATTERN=|kdelibs| ex2: |kdelibs&gt2.3.6|. 120221 jemimah. 120903 versioning.
 do
 
- depPATTERN="`echo -n "$depPATTERN" | sed -e 's%|%\&%g' -e 's%^\&%|%' -e 's%\&$%|%'`" #120831 this restores dep field, ex |kdebase|ge2.3.6|lt2.4.5| to |kdebase&ge2.3.6&lt2.4.5|
  #110722 separate out any versioning... (see also findmissingpkgs.sh)
  xdepPATTERN="`echo -n "$depPATTERN" | sed -e 's%&.*%|%'`" #ex: changes |kdelibs&gt2.3.6| to |kdelibs|
  depVERSIONING="`echo -n "$depPATTERN" | grep -o '&.*' | tr -d '|'`" #ex: &gt2.3.6
  if [ "$depVERSIONING" ];then
-  #VERTEST_OP="`echo -n "$depVERSIONING" | cut -c 2,3`" #ex: gt
-  #VERTEST_VAL="`echo -n "$depVERSIONING" | cut -f 2 -d '&' | cut -c 2-99`" #ex: 2.3.6
   #110822 similar code in support/findpkgs in woof...
   DEPCONDS="`echo -n "$depVERSIONING" | cut -f 2-9 -d '&' | tr '&' ' '`" #can have chained operators, ex: ge2.6.32 lt2.6.33
  fi
-
- depPATTERN="`echo -n "$depPATTERN" | sed -e 's%\\-%\\\\-%g'`" #backslash '-'.
+ depPATTERN="`echo -n "$xdepPATTERN" | sed -e 's%\\-%\\\\-%g'`" #backslash '-'. 120903 fix.
 
  for ONEREPODB in $DB_MAIN $DB_OTHERS
  do
   DBFILE="`basename $ONEREPODB`" #ex: Packages-slackware-12.2-official
   #find database entry(s) for this package...
-  #DB_ENTRY="`cat $ONEREPODB | grep "$depPATTERN"`"
-  #if [ "$DB_ENTRY" != "" ];then
-  #120831 there could be multiple entries found, create DB_ENTRIES instead of just one DB_ENTRY, now DB_ENTRY and DB_VERSION in a loop...
-  FOUND_IN_DB=""
-  DB_ENTRIES="`cat $ONEREPODB | grep "$xdepPATTERN"`"
-  while [ -n "$DB_ENTRIES" ] ;
-  do
-   DB_ENTRY="`echo -n "$DB_ENTRIES" | head -n 1`"
-   DB_ENTRIES="`echo -n "$DB_ENTRIES" | tail -n +2`"
-   DB_version="`echo -n "$DB_ENTRY" | cut -f 3 -d '|'`"
-   if [ "$depVERSIONING" ];then #110722
-    #110822 support chained operators...
-    condFLG='good'
-    for ACOND in $DEPCONDS #ex: gt5.6.7 lt6.7.8
-    do
-     DEPOP="`echo -n "$ACOND" | cut -c 1,2`"
-     DEPVER="`echo -n "$ACOND" | cut -c 3-99`"
-     if ! vercmp ${DB_version} ${DEPOP} ${DEPVER};then
-      condFLG='bad'
+  DB_ENTRIES="`cat $ONEREPODB | grep "$depPATTERN"`" #120903 more than one entry may have been found.
+  if [ "$DB_ENTRIES" != "" ];then
+   echo "$DB_ENTRIES" | #120903
+   while read DB_ENTRY
+   do
+    DB_version="`echo -n "$DB_ENTRY" | cut -f 3 -d '|'`"
+    if [ "$depVERSIONING" ];then #110722
+     #110822 support chained operators...
+     condFLG='good'
+     for ACOND in $DEPCONDS #ex: gt5.6.7 lt6.7.8
+     do
+      DEPOP="`echo -n "$ACOND" | cut -c 1,2`"
+      DEPVER="`echo -n "$ACOND" | cut -c 3-99`"
+      if ! vercmp ${DB_version} ${DEPOP} ${DEPVER};then
+       condFLG='bad'
+      fi
+     done
+     if [ "$condFLG" = "good" ];then
+      echo "$DB_ENTRY" >> /tmp/petget_missing_dbentries-${DBFILE}-2
+      break 2
      fi
-    done
-    if [ "$condFLG" = "good" ];then
+    else
      echo "$DB_ENTRY" >> /tmp/petget_missing_dbentries-${DBFILE}-2
-     #break
-     FOUND_IN_DB="good" #120831
+     break 2
     fi
-    #if vercmp ${DB_version} ${VERTEST_OP} ${VERTEST_VAL};then
-    # echo "$DB_ENTRY" >> /tmp/petget_missing_dbentries-${DBFILE}-2
-    # break
-    #fi
-   else
-    echo "$DB_ENTRY" >> /tmp/petget_missing_dbentries-${DBFILE}-2
-    #break
-    FOUND_IN_DB="good" #120831
-   fi
-  done #120831 DB_ENTRIES loop
-  if [ "$FOUND_IN_DB" = "good" ];then #120831
-   break
+   done
   fi
  done
 done
 #clean them up...
 for ONEREPODB in $DB_MAIN $DB_OTHERS

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -32,11 +32,11 @@
 PKGS_SPECS_TABLE='
 no|0hack1_karmic_dev||exe>dev,dev,doc,nls| #TODO might need to bring this back
 yes|0hack1_precise_dev||exe>dev,dev,doc,nls| #ubuntu has removed .la files, i think due to their multi-arch dementia.
 yes|915resolution||exe,dev,doc,nls
 no|a52dec||exe,dev,doc,nls
-yes|a52dec|liba52-0.7.4,liba52-0.7.4-dev|
+yes|a52dec|liba52-0.7.4,liba52-0.7.4-dev|exe,dev,doc,nls
 yes|abiword||exe,dev,doc,nls| #abiword compiled in luci-209
 no|abiword|abiword,abiword-common,libabiword-2.9,libabiword-2.9-dev|exe,dev,doc,nls| #NO, compiled for gtk3
 no|abiword-plugin-grammar|abiword-plugin-grammar|exe,dev,doc,nls
 no|abiword-plugin-mathview|abiword-plugin-mathview|exe,dev,doc,nls
 no|absvolume_puppy||exe
@@ -442,11 +442,11 @@
 yes|linux_firmware_dvb||exe
 yes|linux-header|linux-libc-dev|exe>dev,dev,doc,nls
 yes|linux_headers|linux_headers-3.2.28*|exe>dev,dev,doc,nls|pet:
 yes|linux-ntfs|libntfs10,libntfs-dev|exe,dev,doc,nls| #this seems to be from the old ntfsprogs.
 yes|lirc|liblircclient0,liblircclient-dev|exe,dev,doc,nls
-no|llvm|libllvm3.0|exe,dev,doc,nls| #needed by libgl1-mesa-dri, but huge 7MB deb. i left out dev components. 120605 removed.
+yes|llvm|libllvm3.0|exe,dev,doc,nls| #needed by libgl1-mesa-dri, but huge 7MB deb. i left out dev components. 120605 removed. 120902 back.
 yes|lsb-base|lsb-base|exe,dev,doc,nls
 no|lxpanel||exe,dev>null,doc,nls
 yes|lzma|lzma,lzma-dev|exe,dev,doc,nls
 yes|lzo2|liblzo2-2,liblzo2-dev|exe,dev,doc,nls
 yes|m4|m4|exe>dev,dev,doc,nls
@@ -753,9 +753,9 @@
 no|zfind||exe
 yes|zip|zip|exe,dev>null,doc,nls
 yes|zlib|zlib1g,zlib1g-dev|exe,dev,doc,nls
 no|zmixer||exe
 yes|zz_ubuntu_precise_fixup||exe,dev,doc,nls
-yes|z_mesa||exe,dev,doc,nls| #120506 kms for intel and nouveau, and ati r600 but not r300.
-yes|z_xf86-video-ati||exe,dev,doc,nls| #fix bug report kernel kms radeon module wrong version. compiled no kms.
+no|z_mesa||exe,dev,doc,nls| #120506 kms for intel and nouveau, and ati r600 but not r300. 120902 disabled.
+no|z_xf86-video-ati||exe,dev,doc,nls| #fix bug report kernel kms radeon module wrong version. compiled no kms. 120902 disabled.
 no|z_xorg_fix_precise||exe,dev,doc,nls| #server segfaults in above xserver_xorg pkg, recompiled here. also -input- drivers. 120531 try turning off.
 '

Changes to woof-distro/x86/ubuntu/precise/DISTRO_SPECS

@@ -1,9 +1,9 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Precise Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.2.72
+DISTRO_VERSION=5.3.91
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='ubuntu'
 #Prefix for some filenames: exs: precisesave.2fs, precise-4.99.0.sfs
 DISTRO_FILE_PREFIX='precise'
 #The version of the distro whose binary packages were used to build this distro: