Check-in [969643fd37]
Not logged in

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

Overview

SHA1 Hash:969643fd37e5d98070c8277add999104c1570751
Date: 2012-10-28 10:05:53
User: BarryK
Comment:use strings utility in pkg util-linux if exists. for slackware, other distros have strings in pkg binutils

Tags And Properties
Changes

Changes to woof-code/PKGS_MANAGEMENT

@@ -53,18 +53,18 @@
 #110206 now building 2.6.32.28 (and later) kernels with aufs 2.1...
 #PKG_PREFER_OLDER='2.6.31|aufs2-util|aufs2-util-old 2.6.38|squashfs-tools42|squashfs-tools4 '
 ####NOTICE: THIS MECHANISM IS NO LONGER USED####
 PKG_PREFER_OLDER=''
 
-#used in /usr/local/petget/filterpkgs.sh
-#The Puppy Package Manager screens out packages that are installed in the 'devx' SFS
-#(file used for C/C++ package compiling). However, you may want to install some
-#packages without the 'devx' being loaded, so they need to be listed in the Package
-#Manager so that you can choose them. List these exceptions here:
-#(note, live-cd has a cutdown perl already)
-
-DISTRO_PPM_DEVX_EXCEPTIONS='python perl'
+#121028 I don't think DISTRO_PPM_DEVX_EXCEPTIONS needed anymore...
+##used in /usr/local/petget/filterpkgs.sh
+##The Puppy Package Manager screens out packages that are installed in the 'devx' SFS
+##(file used for C/C++ package compiling). However, you may want to install some
+##packages without the 'devx' being loaded, so they need to be listed in the Package
+##Manager so that you can choose them. List these exceptions here:
+##(note, live-cd has a cutdown perl already)
+#DISTRO_PPM_DEVX_EXCEPTIONS='python perl'
 
 #PKG_NAME_ALIASES, used in findmissingpkgs.sh, filterpkgs.sh, dependencies.sh.
 #these are alternative names for pkgs that are already installed in puppy.
 #this list prevents them from being listed in the package manager gui.
 #problem arises for pet pkgs, where same pkgs in compat-db may have slightly different names.

Changes to woof-code/packages-templates/util-linux/FIXUPHACK

@@ -1,1 +1,7 @@
 
+#usr/bin/strings is not part of util-linux -- i checked sources of various versions, at
+# http://www.kernel.org/pub/linux/utils/util-linux/
+#see also: http://en.wikipedia.org/wiki/Util-linux
+#however, slackware binary pkg does have it.
+#strings is actually in pkg binutils, but slackware have renamed that 'strings-GNU'.
+#all other distros use the 'strings' in pkg binutils.

Changes to woof-code/packages-templates/util-linux/usr/bin/strings


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

@@ -40,11 +40,11 @@
 . ./DISTRO_PET_REPOS
 . ./DISTRO_SPECS
  RUNNINGWOOF='yes'
  PREPATH='./'
 else
-. /root/.packages/PKGS_MANAGEMENT #has DISTRO_PPM_DEVX_EXCEPTIONS, PKG_ALIASES_INSTALLED
+. /root/.packages/PKGS_MANAGEMENT #has PKG_ALIASES_INSTALLED
 . /root/.packages/DISTRO_PET_REPOS
 . /etc/DISTRO_SPECS
  RUNNINGWOOF='no'
  PREPATH='/root/.packages/'
 fi

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

@@ -28,11 +28,11 @@
 
 #export LANG=C
 
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
 . /root/.packages/DISTRO_PKGS_SPECS
-. /root/.packages/PKGS_MANAGEMENT #has DISTRO_PPM_DEVX_EXCEPTIONS, PKG_ALIASES_INSTALLED, PKG_NAME_ALIASES
+. /root/.packages/PKGS_MANAGEMENT #has PKG_ALIASES_INSTALLED, PKG_NAME_ALIASES
 
 #alphabetic group...
 PKG_FIRST_CHAR="`cat /tmp/petget_pkg_first_char`" #written in pkg_chooser.sh, ex: 'mn'
 [ "$PKG_FIRST_CHAR" = "ALL" ] && PKG_FIRST_CHAR='a-z0-9'
 

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

@@ -15,11 +15,11 @@
 
 DB_dependencies="$1" #in standard format of the package database, field 9.
 
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
 . /root/.packages/DISTRO_PKGS_SPECS #has PKGS_SPECS_TABLE
-. /root/.packages/PKGS_MANAGEMENT #has DISTRO_PPM_DEVX_EXCEPTIONS, PKG_ALIASES_INSTALLED
+. /root/.packages/PKGS_MANAGEMENT #has PKG_ALIASES_INSTALLED
 
 #110722 versioning info added to dependencies...
 #the dependencies field can now have &ge, &gt, &eq, &le, &lt
 #ex1: |+ncurses,+readline&ge2.3.5,+glibc|
 #chained operators allowed: ex2: |+ncurses,+readline&ge2.3.5&lt2.3.6,+glibc|