Check-in [afe97bc120]
Not logged in

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

Overview

SHA1 Hash:afe97bc120e795192391974fde7b4782d0b72683
Date: 2012-08-04 07:12:42
User: BarryK
Comment:for pet-based builds, fixed a bug in 0setup and in support/fix-puppy-dbs -- this is for wary and racy

Tags And Properties
Changes

Changes to woof-code/0setup

@@ -9,10 +9,11 @@
 #111203 noryb009: arch linux -2 patch.
 #120126 mavrothal: offer option to skip specific repos. refer http://bkhome.org/blog/?viewDetailed=02650
 #120315 pkg list entries may have optional forced repo field. Ref: http://bkhome.org/blog/?viewDetailed=02414
 #120515 build from "gentoo" binary tarballs (refer support/gentoo). --no need to modify anything in 0setup.
 #120719 support raspbian. fix debian db format change.
+#120804 fix when only have pkgname_DEV, no pkgname.
 
 export LANG=C #faster.
 
 if [ -f ./DISTRO_SPECS ];then
 . ./DISTRO_SPECS
@@ -423,17 +424,19 @@
 echo "
 Checking that compat-distro pkgs specified in PKGS_SPECS_TABLE actually exist..." >> /var/woof/0setup_fail_report_$RUNNINGPUP
 FAILCHK="no"
 #BINARYPARTNAMES="`echo "$PKGS_SPECS_TABLE" | grep '^yes' | cut -f 3 -d '|' | tr ',' '\n' | grep -v '^-' | tr '\n' ' '`"
 #120315 extra field on end to force repo...
-FIELDS135="`echo "$PKGS_SPECS_TABLE" | grep '^yes' | cut -f 2,3,5 -d '|' | cut -f 1 -d ' ' | grep -v '|pet:' | tr '\n' ' '`"
-for AFIELD135 in $FIELDS135
+FIELDS2345="`echo "$PKGS_SPECS_TABLE" | grep '^yes' | cut -f 2,3,4,5 -d '|' | cut -f 1 -d ' ' | grep -v '|pet:' | tr '\n' ' '`"
+for AFIELD2345 in $FIELDS2345
 do
- if [ "`echo -n "$AFIELD135" | grep '||[a-zA-Z0-9]*:'`" = "" ];then #ex: abiword||wary5:
-  BINARYPARTNAMES="`echo -n "$AFIELD135" | cut -f 2 -d '|' | tr ',' '\n' | grep -v '^-' | tr '\n' ' '`" #ex: "abiword|abiword0,libabiword|" becomes "abiword0 libabiword"
+ ASSIGNFIELD="`echo -n "$AFIELD2345" | cut -f 3 -d '|'`" #120804 ex: exe>dev,dev,doc,nls
+ AFIELD235="`echo -n "$AFIELD2345" | cut -f 1,2,4 -d '|'`" #120804
+ if [ "`echo -n "$AFIELD235" | grep '||[a-zA-Z0-9]*:'`" = "" ];then #ex: abiword||wary5:
+  BINARYPARTNAMES="`echo -n "$AFIELD235" | cut -f 2 -d '|' | tr ',' '\n' | grep -v '^-' | tr '\n' ' '`" #ex: "abiword|abiword0,libabiword|" becomes "abiword0 libabiword"
  else
-  BINARYPARTNAMES="`echo -n "$AFIELD135" | cut -f 1 -d '|'`" #use the generic name.
+  BINARYPARTNAMES="`echo -n "$AFIELD235" | cut -f 1 -d '|'`" #use the generic name.
  fi
  for ONEBINARYPARTNAME in $BINARYPARTNAMES
  do
   #ONEBINARYPARTNAME may match multiple pkgs...
   #i think that dashes need to be backslashed...
@@ -440,10 +443,27 @@
   multiPATTERN="`echo -n "$ONEBINARYPARTNAME" | sed -e 's%\\-%\\\\-%g'`"
   #may have blob * wildcard, change to reg.expr....
   multiPATTERN="`echo -n "$multiPATTERN" | sed -e 's%\\*%.*%g'`"
   xPATTERN='|'"$multiPATTERN"'|'
   [ "`echo "$PKGNAMES" | grep "$xPATTERN"`" != "" ] && continue #success.
+  if [ "$ASSIGNFIELD" ];then #120804
+   #this will find entry in PKGS_SPECS_TABLE like 'yes|apr|apr|exe>dev,dev,doc,nls', where pkg apr-123 does not exist, only apr_DEV-123...
+   EXEASSIGNED=''
+   [ "`echo -n "$ASSIGNFIELD" | grep 'exe>dev'`" != "" ] && EXEASSIGNED='dev'
+   [ "`echo -n "$ASSIGNFIELD" | grep 'exe>null'`" != "" ] && EXEASSIGNED='null'
+   if [ "$EXEASSIGNED" ];then
+    xxPATTERN='^'"${ONEBINARYPARTNAME}_DEV"
+    [ "`echo "$PKGNAMES" | grep "$xxPATTERN"`" != "" ] && continue #success.
+   fi
+   #this entry 'yes|perl-digest-sha1|perl-digest-sha1|exe,dev>null,doc>null,nls>null' also only has a _DEV pkg...
+   DEVASSIGNED=''
+   [ "`echo -n "$ASSIGNFIELD" | grep 'dev>exe'`" != "" ] && DEVASSIGNED='exe'
+   if [ "$DEVASSIGNED" = "exe" ];then
+    xxPATTERN='^'"${ONEBINARYPARTNAME}_DEV"
+    [ "`echo "$PKGNAMES" | grep "$xxPATTERN"`" != "" ] && continue #success.
+   fi
+  fi
   #if [ "`echo -n "$ONEBINARYPARTNAME" | grep '[a-z]\\-[0-9]'`" != "" ];then
   if [ "`echo -n "$ONEBINARYPARTNAME" | grep '\\*'`" != "" ];then
    zPATTERN='^'"$multiPATTERN"
    [ "`echo "$PKGNAMES" | grep "$zPATTERN"`" != "" ] && continue #success.
   fi

Changes to woof-code/rootfs-skeleton/usr/sbin/momanager

@@ -727,10 +727,11 @@
 
 The tarball can be sent to whoever is the author/maintainer of the \Zb${APKGNAME}\ZB package, however, we recommend that they be sent to the maintainer of the \Zb${ORIGLANG1} langpack\ZB PET package. At the time of writing this, these are some maintainers:
 \Zbde\ZB L18L
 \Zbes\ZB vicmz
 \Zbfr\ZB esmourguit
+\Zbpl\ZB robwoj44
 \Zbru\ZB rodin.s
 ...these people can be contacted via the Puppy Linux Forum.
 
 If there is no maintainer for a langpack for \Zb${ORIGLANG1}\ZB, then the invitation is extended to volunteer. You will notice the \ZbPET\ZB button on the main window -- a very easy way to create a PET package of all of the translations. Maintainers may also throw in any other relevant translations that they can find, even dictionary files, but not any binary executables as the PET has to be architecture-independent. When you have it working nicely, send it to me \ZbBarryK\ZB via the Puppy Forum."
  pupdialog --background green --colors --backtitle "MoManager: edit completed" --msgbox "${TARBALLMSG}" 0 0

Changes to woof-code/support/fix-puppy-dbs

@@ -147,10 +147,14 @@
    done
   done
  fi
 
 fi
+
+
+#120804 the code below doesn't seem to be relevant anymore...
+exit ###EXIT HERE###
 
 #the files that have compatible-distro pkg docs (these were downloaded by 0setup)...
 PKGLISTS_COMPAT="`echo "$PKG_DOCS_DISTRO_COMPAT" | tr ' ' '\n' | cut -f 3 -d '|' | tr '\n' ' ' | sed -e 's% $%%'`" #see file DISTRO_PKGS_SPECS-ubuntu
 #...format Upup ex: 'Packages-ubuntu-intrepid-main Packages-ubuntu-intrepid-universe'
 #...Ppup ex: 'Packages-puppy-4xx-official'

Changes to woof-distro/arm/Packages-puppy-armv6-official

@@ -99,12 +99,12 @@
 jasper-1.900.1-armv6|jasper|1.900.1-armv6||BuildingBlock|304K||jasper-1.900.1-armv6.pet||JPEG2000 Part1 standard i.e. ISOIEC 154441 implementation, needed by ayttm|puppy|||
 jasper_DEV-1.900.1-armv6|jasper_DEV|1.900.1-armv6||BuildingBlock|196K||jasper_DEV-1.900.1-armv6.pet|+jasper|jpeg2000 library and utilities|puppy|||
 jasper_DOC-1.900.1-armv6|jasper_DOC|1.900.1-armv6||BuildingBlock|32K||jasper_DOC-1.900.1-armv6.pet||jpeg2000 library and utilities||||
 jimtcl-20120426-armv6|jimtcl|20120426-armv6||BuildingBlock|280K||jimtcl-20120426-armv6.pet||tiny tcl interpreter, used by usb_modeswitch|puppy|||
 jimtcl_DOC-20120426-armv6|jimtcl_DOC|20120426-armv6||BuildingBlock|348K||jimtcl_DOC-20120426-armv6.pet||tiny tcl interpreter||||
-jwm2-579-sap6|jwm2|579-sap6||Desktop|224K||jwm2-579-sap6.pet||joes window manager and tray|debian|squeeze||
-jwm2_DOC-579-sap6|jwm2_DOC|579-sap6||Desktop|52K||jwm2_DOC-579-sap6.pet||joes window manager and tray||||
+jwm2-574-sap6|jwm2|574-sap6||Desktop|224K||jwm2-574-sap6.pet||joes window manager and tray, no fribidi support|debian|squeeze||
+jwm2_DOC-574-sap6|jwm2_DOC|574-sap6||Desktop|52K||jwm2_DOC-574-sap6.pet||joes window manager and tray||||
 kbd-1.15.3-sap6|kbd|1.15.3-sap6||BuildingBlock|3336K||kbd-1.15.3-sap6.pet||console keyboard layout and screen fonts, this is the full package|debian|squeeze||
 kbd_DOC-1.15.3-sap6|kbd_DOC|1.15.3-sap6||BuildingBlock|156K||kbd_DOC-1.15.3-sap6.pet||console keyboard layout and screen fonts||||
 kbd_NLS-1.15.3-sap6|kbd_NLS|1.15.3-sap6||BuildingBlock|800K||kbd_NLS-1.15.3-sap6.pet|+kbd|console keyboard layout and screen fonts||||
 leafpad-0.8.18.1-armv6|leafpad|0.8.18.1-armv6||Document|128K||leafpad-0.8.18.1-armv6.pet|+gtk+|A GTK+ based simple text editor|puppy|||
 leafpad_NLS-0.8.18.1-armv6|leafpad_NLS|0.8.18.1-armv6||Document|592K||leafpad_NLS-0.8.18.1-armv6.pet|+leafpad|simple text editor||||

Changes to woof-distro/x86/Packages-puppy-common-official

@@ -322,13 +322,13 @@
 setvol-1.1|setvol|1.1||BuildingBlock|32K||setvol-1.1.pet||Console volume control|puppy|4||
 sfs-converter-1.3.2-1|sfs-converter|1.3.2-1||Setup|44K||sfs-converter-1.3.2-1.pet|+gtkdialog3,+squashfs-tools,+squashfs-tools4|Utility to convert sfs 3 to 4, vice versa||||
 shared-mime-info-0.70-5|shared-mime-info|0.70-5||BuildingBlock|272K||shared-mime-info-0.70-5.pet||mime information||||
 shared-mime-info_DEV-0.70-5|shared-mime-info_DEV|0.70-5||BuildingBlock|3772K||shared-mime-info_DEV-0.70-5.pet|+shared-mime-info|mime information||||
 simplegtk-0.7b|simplegtk|0.7b||Desktop|44K||simplegtk-0.7b.pet|+yad|SimpleGTK GTK theme maker||||
-softmakeroffice-2008-1-x86|softmakeroffice|2008-1-x86||Document|31944K||softmakeroffice-2008-1-x86.pet||Commercial Office suite with word processor, spreadsheet, presentation, MS-Office-compatible||||
-softmakeroffice_DOC-2008-1-x86|softmakeroffice_DOC|2008-1-x86||Document|15520K||softmakeroffice_DOC-2008-1-x86.pet||Office suite, word-processor, spreadsheet, presentation||||
-softmakeroffice_NLS-2008-1-x86|softmakeroffice_NLS|2008-1-x86||Document|69268K||softmakeroffice_NLS-2008-1-x86.pet|+softmakeroffice|Office suite, word-processor, spreadsheet, presentation||||
+softmakeroffice-2008-2-x86|softmakeroffice|2008-2-x86||Document|31944K||softmakeroffice-2008-2-x86.pet||Commercial Office suite with word processor, spreadsheet, presentation, MS-Office-compatible||||
+softmakeroffice_DOC-2008-2-x86|softmakeroffice_DOC|2008-2-x86||Document|15520K||softmakeroffice_DOC-2008-2-x86.pet||Office suite, word-processor, spreadsheet, presentation||||
+softmakeroffice_NLS-2008-2-x86|softmakeroffice_NLS|2008-2-x86||Document|69268K||softmakeroffice_NLS-2008-2-x86.pet|+softmakeroffice|Office suite, word-processor, spreadsheet, presentation||||
 squashfs-tools-3.3|squashfs-tools|3.3||BuildingBlock|148K||squashfs-tools-3.3.pet||A compressed read-only filesystem for Linux, for squashfs 3.x filesystems|puppy|4||
 squashfs-tools4-4.0-pup4|squashfs-tools4|4.0-pup4||BuildingBlock|176K||squashfs-tools4-4.0-pup4.pet||squashfs utilities|puppy|4||
 squashfs-tools4-4.2-gzip-xz-w5|squashfs-tools4|4.2-gzip-xz-w5||BuildingBlock|200K||squashfs-tools4-4.2-gzip-xz-w5.pet|+linux_kernel&ge2.6.39|squashfs utilities, with gzip and xz compression support, use with kernel 2.6.39 or later and with xz support|puppy|wary5||
 ssh_gui-0.7.1-1-p4|ssh_gui|0.7.1-1-p4||Internet|40K||ssh_gui-0.7.1-1-p4.pet|+gtk+,+openssh_client|secure telnet gui|puppy|4||
 streamripper-1.64.6-w5c|streamripper|1.64.6-w5c||BuildingBlock|132K||streamripper-1.64.6-w5c.pet|+libmad,+faad2,+libogg,+libvorbis|rip streams|puppy|wary5||

Changes to woof-distro/x86/pet-based/racy/DISTRO_PKGS_SPECS-puppy-wary5

@@ -497,15 +497,15 @@
 yes|peasyprint||exe| #print graphics files png/jpg.
 yes|peasyscan||exe
 yes|perl|perl|exe>dev,dev,doc,nls
 yes|perl_tiny|perl_tiny|exe,dev>null,doc>null,nls>null
 yes|perl-digest-sha1|perl-digest-sha1|exe>dev,dev,doc,nls
-yes|perl-digest-sha1|perl-digest-sha1|exe,dev>null,doc>null,nls>null
+yes|perl-digest-sha1|perl-digest-sha1|exe,dev>exe,doc>null,nls>null
 yes|perl-extutils-depends|perl-extutils-depends|exe>dev,dev,doc,nls
 yes|perl-extutils-pkgconfig|perl-extutils-pkgconfig|exe>dev,dev,doc,nls
 yes|perl-html-parser|perl-html-parser|exe>dev,dev,doc,nls
-yes|perl-html-parser|perl-html-parser|exe,dev>null,doc>null,nls>null
+yes|perl-html-parser|perl-html-parser|exe,dev>exe,doc>null,nls>null
 yes|perl-uri|perl-uri|exe>dev,dev,doc,nls
 yes|perl-xml-simple|perl-xml-simple|exe>dev,dev,doc,nls
 yes|perl-xml-parser|perl-xml-parser|exe>dev,dev,doc,nls| #note have this in devx, but think libgnomeprintui might need it.
 yes|pfilesearch||exe
 yes|pfind||exe

Changes to woof-distro/x86/pet-based/racy/DISTRO_SPECS

@@ -1,12 +1,12 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Racy Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.3
+DISTRO_VERSION=5.3.1
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='puppy'
 #Prefix for some filenames: exs: racysave.2fs, racy-5.1.107.sfs
 DISTRO_FILE_PREFIX='racy'
 #The version of the distro whose binary packages were used to build this distro:
 DISTRO_COMPAT_VERSION='wary5'
 #the kernel pet package used:
 DISTRO_KERNEL_PET='linux_kernel-3.0.25-pae-i686-aufs-w5.pet'

Changes to woof-distro/x86/pet-based/wary/DISTRO_PKGS_SPECS-puppy-wary5

@@ -496,15 +496,15 @@
 yes|peasyprint||exe| #print graphics files png/jpg.
 yes|peasyscan||exe
 yes|perl|perl|exe>dev,dev,doc,nls
 yes|perl_tiny|perl_tiny|exe,dev>null,doc>null,nls>null
 yes|perl-digest-sha1|perl-digest-sha1|exe>dev,dev,doc,nls
-yes|perl-digest-sha1|perl-digest-sha1|exe,dev>null,doc>null,nls>null
+yes|perl-digest-sha1|perl-digest-sha1|exe,dev>exe,doc>null,nls>null
 yes|perl-extutils-depends|perl-extutils-depends|exe>dev,dev,doc,nls
 yes|perl-extutils-pkgconfig|perl-extutils-pkgconfig|exe>dev,dev,doc,nls
 yes|perl-html-parser|perl-html-parser|exe>dev,dev,doc,nls
-yes|perl-html-parser|perl-html-parser|exe,dev>null,doc>null,nls>null
+yes|perl-html-parser|perl-html-parser|exe,dev>exe,doc>null,nls>null
 yes|perl-uri|perl-uri|exe>dev,dev,doc,nls
 yes|perl-xml-simple|perl-xml-simple|exe>dev,dev,doc,nls
 yes|perl-xml-parser|perl-xml-parser|exe>dev,dev,doc,nls| #note have this in devx, but think libgnomeprintui might need it.
 yes|pfilesearch||exe
 yes|pfind||exe

Changes to woof-distro/x86/pet-based/wary/DISTRO_SPECS

@@ -1,13 +1,13 @@
 #One or more words that identify this distribution:
 DISTRO_NAME='Wary Puppy'
 #version number of this distribution:
-DISTRO_VERSION=5.3
+DISTRO_VERSION=5.3.1
 #The distro whose binary packages were used to build this distribution:
 DISTRO_BINARY_COMPAT='puppy'
 #Prefix for some filenames: exs: warysave.2fs, wary-5.1.3.4.sfs
 DISTRO_FILE_PREFIX='wary'
 #The version of the distro whose binary packages were used to build this distro:
 DISTRO_COMPAT_VERSION='wary5'
 #the kernel pet package used:
 DISTRO_KERNEL_PET='linux_kernel-2.6.32.59-uni-i486-aufs-w5.pet'
 DISTRO_TARGETARCH='x86'