Check-in [f5b36f77c2]
Not logged in

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

Overview

SHA1 Hash:f5b36f77c24fa4a80105849ee5fdd3557a38996c
Date: 2012-01-06 00:16:35
User: BarryK
Comment:noryb009: patch -4 for arch linux, speedup in 0setup

Tags And Properties
Changes

Changes to woof-code/0setup

@@ -151,11 +151,10 @@
     slackware)
      RETSTAT=0
      mv -f $xDLFILE ${PKGLISTFILE}pre
     ;;
     arch)
-     #have to do heavy pre-pre-processing to create one compact database file...
      echo "Processing $DLFILE please wait..."
      xDLFILE="`basename $DLFILE .gz`" #actually it's a tarball: core.db.tar.gz, extra.db.tar.gz, community.db.tar.gz
      gunzip $DLFILE
      RETSTAT=$?
      if [ $RETSTAT -eq 0 ];then
@@ -164,21 +163,24 @@
       mv -f $xDLFILE sandbox0/
       cd sandbox0
       tar -x -f $xDLFILE
       rm -f $xDLFILE
       xxDLFILE="`basename $xDLFILE .db.tar`" #this will be core, extra, community
-      echo -n "" > ../${PKGLISTFILE}pre
+      echo -n "" > ../${PKGLISTFILE}
       for ONEDESCFOLDER in `ls`
       do
-       EXTRACTEDINFO="`awk '{
+       EXTRACTEDINFO="`awk -v pkgpath="$xxDLFILE" -v FIND_CAT="$FIND_CAT" '{
         if($1 == \"%FILENAME%\"){getline filename}
         if($1 == \"%NAME%\"){getline pkgname}
         if($1 == \"%VERSION%\"){getline pkgver; split(pkgver, pkgverarr, \"-\")}
         if($1 == \"%DESC%\"){getline pkgdesc}
         if($1 == \"%ISIZE%\"){getline pkgsize; pkgsize = pkgsize / 1024}
        }END{
-        printf(\"%s-%s|%s|%s|%s|CAT|%sK|PATH|%s|DEPS|%s|\", pkgname, pkgverarr[1], pkgname, pkgverarr[1], pkgverarr[2], pkgsize, filename, pkgdesc)
+        if(pkgdesc==""){cmd=\"../\" FIND_CAT \" \" pkgname \" \\\"nothing\\\"\"}
+        else{cmd=\"../\" FIND_CAT \" \" pkgname \" \\\"\" pkgdesc \"\\\"\"}
+        cmd |getline pkgcat;
+        printf(\"%s-%s|%s|%s|%s|%s|%sK|%s/os/i686|%s|DEPS|%s|\", pkgname, pkgverarr[1], pkgname, pkgverarr[1], pkgverarr[2], pkgcat, pkgsize, pkgpath, filename, pkgdesc)
        }' ${ONEDESCFOLDER}/desc`"
 
        #dependencies
        if [ "`cat \"${ONEDESCFOLDER}/depends\" | grep '%DEPENDS%'`" = "" ]; then
         DEPS=""
@@ -193,18 +195,14 @@
        DEPS="`echo -n "$DEPS" | sed -e 's% $%%' | sed -e 's% %,+%g' | sed -e 's%^%+%'`"
        [ "$DEPS" = "+" ] && DEPS="" #w016 bugfix. some don't have any deps specified.
 
        EXTRACTEDINFO="`echo \"$EXTRACTEDINFO\" | sed \"s/DEPS/${DEPS}/\" | sed 's/[ ]*|/|/g' | sed 's/|[ ]*/|/g'`" #add deps, then trim spaces
 
-       echo "$EXTRACTEDINFO" >> ../${PKGLISTFILE}pre
+       echo "$EXTRACTEDINFO" >> ../${PKGLISTFILE}
       done
       cd ..
       rm -rf sandbox0 2>/dev/null
-      #w016 bugfix remove lines that failed to get a pkgname (only one, amarok-engine-xine)...
-      sort --field-separator='"' --key=2 ${PKGLISTFILE}pre | grep -v 'pkgname="" ' > /tmp/$PKGLISTFILE
-      sync
-      mv -f /tmp/$PKGLISTFILE ${PKGLISTFILE}pre
      fi
     ;;
     t2) #w017
      RETSTAT=0
     ;;
@@ -349,30 +347,11 @@
     echo "$DB_pkgname|$DB_nameonly|$DB_version|$DB_pkgrelease|$DB_category|$DB_size|$DB_path|$DB_fullfilename|$DB_dependencies|$DB_description|" >> $ONE_PKGLISTS_COMPAT
     echo -n "$DB_nameonly "
    done
   ;;
   arch)
-   #each line in ${ONE_PKGLISTS_COMPAT}pre is like this:
-   #acl-2.2.51|acl|2.2.51|1|CAT|608K|PATH|acl-2.2.51-1-i686.pkg.tar.xz|+attr>=2.4.46|Access control list utilities, libraries and headers|
-   PKGLISTS_REPO_BASE="`echo -n "${ONE_PKGLISTS_COMPAT}" | rev | cut -f 1 -d '-' | rev`" #core, extra, community
-   DB_path="${PKGLISTS_REPO_BASE}/os/i686"
-   cat ${ONE_PKGLISTS_COMPAT}pre |
-   while read DB_ONELINE
-   do
-    [ "$DB_ONELINE" = "" ] && continue #w016 bugfix.
-    #w016 bugfix, some authors have put trailing tabs (now space) or spaces on the fields, remove...
-    DB_nameonly="`echo -n "$DB_ONELINE" | cut -f 2 -d '|'`" #acl
-    DB_description="`echo -n "$DB_ONELINE" | cut -f 10 -d '|'`" #Access control list utilities, libraries and headers
-    #w015 find_cat_func replaced by compiled app...
-    [ "$DB_description" = "" ] && DB_description="nothing"
-    DB_category="`${FIND_CAT} $DB_nameonly \"$DB_description\"`"
-
-    DB_ONELINE="`echo \"$DB_ONELINE\" | sed \"s/CAT/$DB_category/\" | sed \"s%PATH%$DB_path%\"`"
-
-    echo "$DB_ONELINE" >> $ONE_PKGLISTS_COMPAT
-    echo -n "$DB_nameonly "
-   done
+   echo "...it's already in the Puppy standard format."
   ;;
   t2) #w017
    echo "...it's already in the Puppy standard format."
   ;;
   puppy)

Changes to woof-code/rootfs-skeleton/usr/local/simple_network_setup/rc.network

@@ -11,10 +11,11 @@
 #100703 fix disconnect/reconnect.
 #100804 while testing for module loaded, also test for valid macaddress.
 #101122 wait for module to load.
 #101216 more logging, to /tmp/simple_network_setup.
 #110203 improve scanning.
+#120104 try longer wait for modules to load and interface to become available (12 to 16 seconds).
 
 #each line of /etc/simple_network_setup/connections has everything known about a connection:
 #(please ignore spaces, put here for readability only)
 #Wireless:
 #        1         2          3         4       5                                   6                 7           8                 9            10           11                 12         13                         14       15         16          17
@@ -66,11 +67,11 @@
  while [ 1 ];do #101122 wait for module to load.
   [ "`lsmod  | grep -v '^Module' | cut -f 1 -d ' ' | grep "$oPATTERN"`" != "" ] && break
   [ "`echo "$TESTLIST" | grep "$mPATTERN"`" != "" ] && continue 2 #avoid re-waiting on same module
   sleep 1
   WAITCNT=$(($WAITCNT + 1))
-  [ $WAITCNT -gt 8 ] && continue 2 #no module loaded.
+  [ $WAITCNT -gt 12 ] && continue 2 #no module loaded. 120104 8 to 12.
  done
  MACADDRESSES="`grep "$mPATTERN" /etc/simple_network_setup/connections | cut -f 6 -d '|' | sort -u | tr '\n' ' '`" #100804
  for MACADDRESS in $MACADDRESSES #100804
  do
   while [ 1 ];do
@@ -81,11 +82,11 @@
     MACMATCH="`grep "$mPATTERN" /etc/simple_network_setup/connections | grep "$macPATTERN"`"
     [ "$MACMATCH" ] && echo "$MACMATCH" >> /tmp/sns_connections_available
     break
    fi
    WAITCNT=`expr $WAITCNT + 1`
-   [ $WAITCNT -gt 12 ] && break 2 #timeout.
+   [ $WAITCNT -gt 16 ] && break 2 #timeout. 120104 12 to 16.
    sleep 1
   done
  done
 done