Changeset 2b88404

Timestamp:

07/13/2006 07:45:35 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

f86c600

Parents:

7d1f862

Message:

Updated paco patch from upstream.

Files:

• README.PACO (modified) (1 diff)
• contrib/jhalfs-paco.patch (modified) (19 diffs)

README.PACO

@@ -4 +4 @@
 #                                         #
 ###########################################
-
-
-WARNING: AT THIS MOMENT THE PACO PATCH IS BROKEN
-================================================
 
 

contrib/jhalfs-paco.patch

@@ -1 +1 @@
 Index: LFS/master.sh
 ===================================================================
---- LFS/master.sh       (revision 2804)
+--- LFS/master.sh       (revision 2818)
 +++ LFS/master.sh       (working copy)
 @@ -176,6 +176,11 @@
@@ -41 +41 @@
 +      *)        wrt_paco_prep
 +                wrt_run_as_chroot1 "${this_script}" "$file"
-+                wrt_paco_log "$name" "$vrs" ;;
++                wrt_paco_log "$pkg_tarball" ;;
      esac
  
@@ -70 +70 @@
 +      *kernel)       wrt_paco_prep
 +                     wrt_run_as_chroot2 "$this_script" "$file"
-+                     wrt_paco_log "linux-kernel" "$vrs"
++                     wrt_paco_log "$pkg_tarball"
 +        ;;
 +      *bootscripts)  wrt_paco_prep
 +                     wrt_run_as_chroot2 "$this_script" "$file"
-+                     wrt_paco_log "lfs-bootscripts" "$vrs"
++                     wrt_paco_log "$pkg_tarball"
 +        ;;
        *)        wrt_run_as_chroot2 "$this_script" "$file"
@@ -83 +83 @@
 Index: LFS/lfs.xsl
 ===================================================================
---- LFS/lfs.xsl (revision 2804)
+--- LFS/lfs.xsl (revision 2818)
 +++ LFS/lfs.xsl (working copy)
 @@ -32,6 +32,9 @@
@@ -148 +148 @@
 Index: common/config
 ===================================================================
---- common/config       (revision 2804)
+--- common/config       (revision 2818)
 +++ common/config       (working copy)
 @@ -86,6 +86,14 @@
@@ -177 +177 @@
 Index: common/func_validate_configs.sh
 ===================================================================
---- common/func_validate_configs.sh     (revision 2804)
+--- common/func_validate_configs.sh     (revision 2818)
 +++ common/func_validate_configs.sh     (working copy)
 @@ -84,9 +84,9 @@
@@ -204 +204 @@
 --- common/paco-functions       (revision 0)
 +++ common/paco-functions       (revision 0)
-@@ -0,0 +1,211 @@
+@@ -0,0 +1,209 @@
 +#!/bin/bash
 +
@@ -236 +236 @@
 +  # Clean up
 +  wrt_remove_build_dirs "paco"
-+  echo -e '\t@touch $@' >> $MKFILE.tmp
++  wrt_touch
 +
 +  # Override the PREV variable
@@ -275 +275 @@
 +local PACKAGE
 +
-+# Allow packages to be logged without version
-+if [[ $2 != "" ]] ; then
-+  PACKAGE="$1-$2";
-+else
-+  PACKAGE="$1"
-+fi
++PACKAGE=`echo $1 | sed -e 's/.tar.*//'`
 +
 +# Not using Paco with uClibc, even if requested
@@ -399 +394 @@
 +
 +case $this_script in
++  *changingowner)   LOG_PACKAGE=0 ;;
 +  *creatingdirs)    LOG_PACKAGE=0 ;;
 +  *createfiles)     LOG_PACKAGE=0 ;;
++  *pwdgroup)        LOG_PACKAGE=0 ;;
++  *devices)         LOG_PACKAGE=0 ;;
 +  *strippingagain)  LOG_PACKAGE=0 ;;
 +  *readjusting)     LOG_PACKAGE=0 ;;
@@ -433 +431 @@
 Index: common/common-functions
 ===================================================================
---- common/common-functions     (revision 2804)
+--- common/common-functions     (revision 2818)
 +++ common/common-functions     (working copy)
 @@ -65,6 +65,9 @@
@@ -445 +443 @@
          Optimize [0-2]
            0 = no optimization
-@@ -658,6 +661,7 @@
+@@ -732,6 +735,7 @@
                   --stringparam lc_all $LC_ALL \
                   --stringparam keymap $KEYMAP \
@@ -453 +451 @@
        ;;
      lfs)
-@@ -669,6 +673,7 @@
+@@ -743,6 +747,7 @@
                   --stringparam timezone $TIMEZONE \
                   --stringparam page $PAGE \
@@ -463 +461 @@
 Index: HLFS/hlfs.xsl
 ===================================================================
---- HLFS/hlfs.xsl       (revision 2804)
+--- HLFS/hlfs.xsl       (revision 2818)
 +++ HLFS/hlfs.xsl       (working copy)
 @@ -39,6 +39,9 @@
@@ -514 +512 @@
 Index: HLFS/master.sh
 ===================================================================
---- HLFS/master.sh      (revision 2804)
+--- HLFS/master.sh      (revision 2818)
 +++ HLFS/master.sh      (working copy)
 @@ -250,6 +250,11 @@
@@ -553 +551 @@
 +        wrt_paco_prep
          wrt_run_as_chroot1 "${this_script}" "${file}"
-+        wrt_paco_log "$name" "$vrs"
++        wrt_paco_log "$pkg_tarball"
         ;;
      esac
@@ -574 +572 @@
  
  }
-@@ -426,9 +455,20 @@
+@@ -426,9 +455,19 @@
          else  # Initialize the log and run the script
            wrt_run_as_chroot2 "${this_script}" "${file}"
@@ -582 +580 @@
 +      *kernel)       wrt_paco_prep
 +                     wrt_run_as_chroot2 "$this_script" "$file"
-+                     version=`grep "^linux-version" $JHALFSDIR/packages | sed -e 's/.* //' -e 's/"//g'`
-+                     wrt_paco_log "linux-kernel" "$version"
++                     wrt_paco_log "$(get_package_tarball_name "linux")"
 +        ;;
 +      *bootscripts)  wrt_paco_prep
 +                     wrt_run_as_chroot2 "$this_script" "$file"
-+                     wrt_paco_log "hlfs-bootscripts"
++                     wrt_paco_log "$(get_package_tarball_name "lfs-bootscripts")"
 +        ;;
        *)  # All other scripts
@@ -597 +594 @@
 Index: master.sh
 ===================================================================
---- master.sh   (revision 2804)
+--- master.sh   (revision 2818)
 +++ master.sh   (working copy)
 @@ -148,6 +148,8 @@