r3445 - in jhalfs/branches/2.3.x: BLFS/libs common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Fri Aug 10 15:47:19 PDT 2007


Author: manuel
Date: 2007-08-10 16:47:19 -0600 (Fri, 10 Aug 2007)
New Revision: 3445

Modified:
   jhalfs/branches/2.3.x/BLFS/libs/func_packages
   jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl
   jhalfs/branches/2.3.x/common/makefile-functions
Log:
Merged r3442:3444 from trunk.

Modified: jhalfs/branches/2.3.x/BLFS/libs/func_packages
===================================================================
--- jhalfs/branches/2.3.x/BLFS/libs/func_packages	2007-08-10 22:43:54 UTC (rev 3444)
+++ jhalfs/branches/2.3.x/BLFS/libs/func_packages	2007-08-10 22:47:19 UTC (rev 3445)
@@ -42,8 +42,22 @@
 #-----------------------#
   local pkg_id=$1
 
-  find $TRACKING_DIR -name "${pkg_id}-[[:digit:]]*" | sed "s/.*${pkg_id}-//"
 
+  case ${pkg_id} in
+    html-tidy )
+      find $TRACKING_DIR -name "${pkg_id}-cvs_[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+    cdparanoia )
+      find $TRACKING_DIR -name "${pkg_id}-III-[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+    psutils )
+      find $TRACKING_DIR -name "${pkg_id}-p[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+    * )
+      find $TRACKING_DIR -name "${pkg_id}-[[:digit:]]*" | sed "s/.*${pkg_id}-//"
+      ;;
+  esac
+
 }
 
 #-----------------------#
@@ -64,11 +78,11 @@
 
   # IDs clean-up (unuseful pages or commented-out packages, could be more)
   sed -i '/template/d;/ntroduction/d;/preface/d;/alsa.xml/d;/xorg.xml/d' packages.tmp
-  sed -i '/obsolete/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
+  sed -i '/obsolete/d;/ispell\t/d;/postlfs-/d;/-client.xml/d;/xorg7.xml/d' packages.tmp
   sed -i '/courier.xml/d;/-other\t/d;/others-/d;/other-/d;/^ash\t/d' packages.tmp
   sed -i '/fw-firewall\t/d;/gcc2\t/d;/cvsserver\t/d;/svnserver\t/d' packages.tmp
   sed -i '/fam\t/d;/libungif\t/d;/ncpfs\t/d;/slrn\t/d;/konq\t/d' packages.tmp
-  sed -i '/gst-plugins\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
+  sed -i '/gst-plugins\t/d;/gimp-print\t/d;/openquicktime\t/d;/compressdoc\t/d' packages.tmp
   sed -i '/errata\t/d;/foreword\t/d;/organization\t/d;/whoread\t/d' packages.tmp
 
   # Meta-packages version

Modified: jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl
===================================================================
--- jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl	2007-08-10 22:43:54 UTC (rev 3444)
+++ jhalfs/branches/2.3.x/BLFS/libs/scripts.xsl	2007-08-10 22:47:19 UTC (rev 3445)
@@ -155,7 +155,7 @@
         <xsl:text>
 if [[ -e unpacked ]] ; then
   UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
-  rm -rf $UNPACKDIR
+  [[ -n $UNPACKDIR ]] && [[ -d $UNPACKDIR ]] && rm -rf $UNPACKDIR
 fi
 tar -xvf $PACKAGE > unpacked
 UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
@@ -447,11 +447,11 @@
   <xsl:template match="screen">
     <xsl:if test="child::* = userinput and not(@role = 'nodump')">
       <xsl:if test="@role = 'root' and $sudo = 'y'">
-        <xsl:text>sudo sh -c "</xsl:text>
+        <xsl:text>sudo sh -c '</xsl:text>
       </xsl:if>
       <xsl:apply-templates select="userinput"/>
       <xsl:if test="@role = 'root' and $sudo = 'y'">
-        <xsl:text>"</xsl:text>
+        <xsl:text>'</xsl:text>
       </xsl:if>
       <xsl:text>&#xA;</xsl:text>
     </xsl:if>

Modified: jhalfs/branches/2.3.x/common/makefile-functions
===================================================================
--- jhalfs/branches/2.3.x/common/makefile-functions	2007-08-10 22:43:54 UTC (rev 3444)
+++ jhalfs/branches/2.3.x/common/makefile-functions	2007-08-10 22:47:19 UTC (rev 3445)
@@ -64,6 +64,7 @@
 define remove_existing_dirs
   @PKG_PATH=`ls -t $(SRCSDIR)/$(1) | head -n1` && \
   ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
+  test -n "$$ROOT" -a -d $(SRCSDIR)/$$ROOT && \
   rm -rf $(SRCSDIR)/$$ROOT && \
   rm -rf $(SRCSDIR)/$${ROOT%-*}-build
 endef
@@ -71,6 +72,7 @@
 define remove_existing_dirs2
   @PKG_PATH=`ls -t $(SRC)/$(1) | head -n1` && \
   ROOT=`tar -tf $$PKG_PATH | head -n1 | sed -e 's@^./@@;s@/.*@@'` && \
+  test -n "$$ROOT" -a -d $(SRC)/$$ROOT && \
   rm -rf $(SRC)/$$ROOT && \
   rm -rf $(SRC)/$${ROOT%-*}-build
 endef




More information about the alfs-log mailing list