Changeset b9ec725


Ignore:
Timestamp:
05/31/2006 09:08:02 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:
5842156
Parents:
a858a78
Message:

Updated paco patch from upstream.

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • README.PACO

    ra858a78 rb9ec725  
    4343
    44444. Download the paco source package to the $BUILDDIR/sources dir.
    45    paco-1.10.7 or later is recommended.
     45   paco-1.10.8 or later is recommended.
    4646   If using a newer paco version, remember to update also the
    4747   PACO_VERSION variable.

  • contrib/jhalfs-paco.patch

    ra858a78 rb9ec725  
    11Index: LFS/master.sh
    22===================================================================
    3 --- LFS/master.sh       (revision 2727)
     3--- LFS/master.sh       (revision 2734)
    44+++ LFS/master.sh       (working copy)
    55@@ -173,6 +173,11 @@
    … …  
    6262 }
    6363 
    64 @@ -304,6 +333,14 @@
     64@@ -303,8 +332,18 @@
     65               else
    6566                 wrt_run_as_chroot2 "$this_script" "$file"
    6667               fi
     68+              wrt_paco_log "lfs-sysconf"
    6769         ;;
    6870+      *kernel)       wrt_paco_prep
    … …  
    7577+        ;;
    7678       *)        wrt_run_as_chroot2 "$this_script" "$file"
     79+                wrt_paco_log "lfs-sysconf"
    7780         ;;
    7881     esac
     82 
    7983Index: LFS/lfs.xsl
    8084===================================================================
    81 --- LFS/lfs.xsl (revision 2727)
     85--- LFS/lfs.xsl (revision 2734)
    8286+++ LFS/lfs.xsl (working copy)
    8387@@ -32,6 +32,9 @@
    … …  
    129133--- common/paco-build-hlfs.sh   (revision 0)
    130134+++ common/paco-build-hlfs.sh   (revision 0)
    131 @@ -0,0 +1,11 @@
     135@@ -0,0 +1,12 @@
    132136+#!/bin/sh
    133137+set -e
    134138+
    135139+cd $PKGDIR
    136 +./configure --with-pic \
     140+./configure --sysconfdir=/etc \
     141+       --enable-scripts \
     142+       --disable-gpaco \
    137143+       --disable-static \
    138 +       --disable-gpaco \
    139 +       --sysconfdir=/etc &&
     144+       --with-pic &&
    140145+make &&
    141146+make install &&
    … …  
    143148Index: common/config
    144149===================================================================
    145 --- common/config       (revision 2727)
     150--- common/config       (revision 2734)
    146151+++ common/config       (working copy)
    147152@@ -84,6 +84,14 @@
    … …  
    152157+#--- Use paco? 0(no)/1(yes)
    153158+USE_PACO=1
    154 +PACO_VERSION=1.10.7
     159+PACO_VERSION=1.10.8
    155160+
    156161+#--- Name of the Paco source package
    … …  
    167172+#--- Variables needed by paco
    168173+PACO_INCLUDE=/
    169 +PACO_EXCLUDE=/sys:/dev:/proc:/tmp:/usr/src:/usr/share/info/dir:/jhalfs
     174+PACO_EXCLUDE=/jhalfs
    170175+PACO_TMPFILE=/tmp/paco.tmp
    171176+LD_PRELOAD=/usr/lib/libpaco-log.so
    172177Index: common/func_validate_configs.sh
    173178===================================================================
    174 --- common/func_validate_configs.sh     (revision 2727)
     179--- common/func_validate_configs.sh     (revision 2734)
    175180+++ common/func_validate_configs.sh     (working copy)
    176181@@ -84,9 +84,9 @@
    … …  
    199204--- common/paco-functions       (revision 0)
    200205+++ common/paco-functions       (revision 0)
    201 @@ -0,0 +1,105 @@
     206@@ -0,0 +1,211 @@
    202207+#!/bin/bash
    203 +
    204208+
    205209+#----------------------------#
    … …  
    251255+fi
    252256+
    253 +if [ $USE_PACO != 0 ] && [ "$vrs" != "" ]; then
     257+check_log_package
     258+
     259+if [ $USE_PACO != 0 ] && [ $LOG_PACKAGE != 0 ]; then
    254260+(
    255261+cat  << EOF
    256262+       @echo "export PACO_INCLUDE=$PACO_INCLUDE" >> envars && \\
    257 +       echo "export PACO_EXCLUDE=\$(SRC):$JHALFSDIR:$PACO_EXCLUDE" >> envars && \\
     263+       echo "export PACO_EXCLUDE=\$(SRC):$PACO_EXCLUDE" >> envars && \\
    258264+       echo "export PACO_TMPFILE=$PACO_TMPFILE" >> envars && \\
    259265+       rm -f \$(MOUNT_PT)$PACO_TMPFILE
    … …  
    283289+fi
    284290+
    285 +if [ $USE_PACO != 0 ] && [ "$vrs" != "" ]; then
     291+check_log_package
     292+
     293+if [ $USE_PACO != 0 ]; then
     294+  if [ $LOG_PACKAGE != 0 ]; then
    286295+(
    287296+cat << EOF
    … …  
    292301+EOF
    293302+) >> $MKFILE.tmp
    294 +fi
    295 +
    296 +# Glibc uses 'sln' to install symlinks in /lib
    297 +# add these to the log since paco can't track statically linked executables
    298 +# Glibc is the first package to install into /lib, so a simple 'find' will suffice
    299 +if [ $USE_PACO != 0 ] && [ "$name" = "glibc" ]; then
    300 +(
    301 +cat << EOF
    302 +       @\$(CHROOT1) 'find /lib -type l | paco -lp+ $PACKAGE'
    303 +EOF
    304 +) >> $MKFILE.tmp
    305 +fi
     303+  fi
     304+  wrt_paco_add_log
     305+fi
     306+}
     307+
     308+
     309+#----------------------------------#
     310+wrt_paco_add_log() {               #
     311+#----------------------------------#
     312+# Some packages create files using bash redirection, which the LD_PRELOAD lib don't notice
     313+# These rules will add the missing files to the proper logs.
     314+# Most of these is not needed for HLFS, but they do no harm.
     315+if [ $USE_PACO != 0 ]; then
     316+  case $this_script in
     317+    *glibc)
     318+      echo -e "\t@\$(CHROOT1) 'find /lib -type l | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     319+      echo -e "\t@\$(CHROOT1) 'find /etc/{nsswitch.conf,ld.so.conf} | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     320+    ;;
     321+    *ncurses)
     322+      LIBS="/usr/lib/{libcurses.so,libncurses.so,libform.so,libpanel.so,libmenu.so}"
     323+      echo -e "\t@\$(CHROOT1) 'find $LIBS | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     324+    ;;
     325+    *bash)
     326+      echo -e "\t@\$(CHROOT1) 'echo /bin/sh | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     327+    ;;
     328+    *flex)
     329+      echo -e "\t@\$(CHROOT1) 'echo /usr/bin/lex | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     330+    ;;
     331+    *shadow)
     332+      echo -e "\t@\$(CHROOT1) 'echo /etc/login.defs | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     333+    ;;
     334+    *hotplug)
     335+      echo -e "\t@\$(CHROOT1) 'echo /var/log/hotplug | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     336+      echo -e "\t@\$(CHROOT1) 'echo /var/run/usb | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     337+    ;;
     338+    *sysklogd)
     339+      echo -e "\t@\$(CHROOT1) 'echo /etc/syslog.conf | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     340+    ;;
     341+    *sysvinit)
     342+      echo -e "\t@\$(CHROOT1) 'echo /etc/inittab | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     343+    ;;
     344+    *udev)
     345+      echo -e "\t@\$(CHROOT1) 'find /lib/udev/devices | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     346+      echo -e "\t@\$(CHROOT1) 'echo /lib/firmware | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     347+      echo -e "\t@\$(CHROOT1) 'find /etc/udev/rules.d -type f | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     348+    ;;
     349+    *util-linux)
     350+      echo -e "\t@\$(CHROOT1) 'echo /var/lib/hwclock | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     351+      echo -e "\t@\$(CHROOT1) 'echo /etc/nologin.txt | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     352+    ;;
     353+    *vim)
     354+      echo -e "\t@\$(CHROOT1) 'echo /etc/vimrc | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     355+    ;;
     356+    # Rules below here will log configuration files created in LFS and HLFS
     357+    # They will end up in a log named {h}lfs-sysconf
     358+    *setclock)
     359+      echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/clock | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     360+    ;;
     361+    *inputrc)
     362+      echo -e "\t@\$(CHROOT2) 'echo /etc/inputrc | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     363+    ;;
     364+    *profile)
     365+      echo -e "\t@\$(CHROOT2) 'echo /etc/profile | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     366+    ;;
     367+    *hostname)
     368+      echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/network | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     369+    ;;
     370+    *localnet)
     371+      echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/network | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     372+    ;;
     373+    *hosts)
     374+      echo -e "\t@\$(CHROOT2) 'echo /etc/hosts | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     375+    ;;
     376+    *network)
     377+      echo -e "\t@\$(CHROOT2) 'echo /etc/sysconfig/network-devices/ifconfig.eth0/ipv4 | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     378+      echo -e "\t@\$(CHROOT2) 'echo /etc/resolv.conf | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     379+    ;;
     380+    *fstab)
     381+      echo -e "\t@\$(CHROOT2) 'echo /etc/fstab | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     382+    ;;
     383+    *theend) # LFS
     384+      echo -e "\t@\$(CHROOT2) 'echo /etc/$PROGNAME-release | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     385+    ;;
     386+    *finished) # HLFS
     387+      echo -e "\t@\$(CHROOT2) 'echo /etc/$PROGNAME-release | paco -lp+ $PACKAGE'" >> $MKFILE.tmp
     388+    ;;
     389+  esac
     390+fi
     391+}
     392+
     393+
     394+#----------------------------------#
     395+check_log_package() {              #
     396+#----------------------------------#
     397+# Maybe don't need this function, but it will avoid writing some
     398+# unnecessary paco commands in the Makefile.
     399+
     400+case $this_script in
     401+  *creatingdirs)    LOG_PACKAGE=0 ;;
     402+  *createfiles)     LOG_PACKAGE=0 ;;
     403+  *strippingagain)  LOG_PACKAGE=0 ;;
     404+  *readjusting)     LOG_PACKAGE=0 ;;
     405+  *setclock)        LOG_PACKAGE=0 ;;
     406+  *inputrc)         LOG_PACKAGE=0 ;;
     407+  *profile)         LOG_PACKAGE=0 ;;
     408+  *hostname)        LOG_PACKAGE=0 ;;
     409+  *localnet)        LOG_PACKAGE=0 ;;
     410+  *hosts)           LOG_PACKAGE=0 ;;
     411+  *network)         LOG_PACKAGE=0 ;;
     412+  *fstab)           LOG_PACKAGE=0 ;;
     413+  *theend)          LOG_PACKAGE=0 ;;
     414+  *finished)        LOG_PACKAGE=0 ;;
     415+  *)                LOG_PACKAGE=1 ;;
     416+esac
    306417+}
    307418Index: common/paco-build-lfs.sh
    … …  
    309420--- common/paco-build-lfs.sh    (revision 0)
    310421+++ common/paco-build-lfs.sh    (revision 0)
    311 @@ -0,0 +1,9 @@
     422@@ -0,0 +1,10 @@
    312423+#!/bin/sh
    313424+set -e
    314425+
    315426+cd $PKGDIR
    316 +./configure --disable-gpaco \
    317 +       --sysconfdir=/etc &&
     427+./configure --sysconfdir=/etc \
     428+       --enable-scripts \
     429+       --disable-gpaco &&
    318430+make &&
    319431+make install &&
    … …  
    321433Index: common/common-functions
    322434===================================================================
    323 --- common/common-functions     (revision 2727)
     435--- common/common-functions     (revision 2734)
    324436+++ common/common-functions     (working copy)
    325437@@ -65,6 +65,9 @@
    … …  
    333445         Optimize [0-2]
    334446           0 = no optimization
    335 @@ -556,6 +559,7 @@
     447@@ -557,6 +560,7 @@
    336448                  --stringparam lc_all $LC_ALL \
    337449                  --stringparam keymap $KEYMAP \
    … …  
    341453       ;;
    342454     lfs)
    343 @@ -567,6 +571,7 @@
     455@@ -568,6 +572,7 @@
    344456                  --stringparam timezone $TIMEZONE \
    345457                  --stringparam page $PAGE \
    … …  
    351463Index: HLFS/hlfs.xsl
    352464===================================================================
    353 --- HLFS/hlfs.xsl       (revision 2727)
     465--- HLFS/hlfs.xsl       (revision 2734)
    354466+++ HLFS/hlfs.xsl       (working copy)
    355467@@ -39,6 +39,9 @@
    … …  
    402514Index: HLFS/master.sh
    403515===================================================================
    404 --- HLFS/master.sh      (revision 2727)
     516--- HLFS/master.sh      (revision 2734)
    405517+++ HLFS/master.sh      (working copy)
    406518@@ -245,6 +245,11 @@
    … …  
    462574 
    463575 }
    464 @@ -419,6 +448,15 @@
     576@@ -418,9 +447,20 @@
     577         else  # Initialize the log and run the script
    465578           wrt_run_as_chroot2 "${this_script}" "${file}"
    466579         fi
     580+        wrt_paco_log "hlfs-sysconf"
    467581         ;;
    468582+      *kernel)       wrt_paco_prep
    … …  
    477591       *)  # All other scripts
    478592         wrt_run_as_chroot2 "${this_script}" "${file}"
     593+        wrt_paco_log "hlfs-sysconf"
    479594         ;;
     595     esac
     596 
    480597Index: master.sh
    481598===================================================================
    482 --- master.sh   (revision 2727)
     599--- master.sh   (revision 2734)
    483600+++ master.sh   (working copy)
    484601@@ -147,6 +147,8 @@
    … …  
    506623 if [[ "$OPTIMIZE" != "0" ]]; then
    507624   [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization module..."
    508 @@ -482,7 +492,11 @@
     625@@ -482,6 +492,9 @@
    509626 #
    510627 if [[ "$PWD" != "$JHALFSDIR" ]]; then
    511    cp $COMMON_DIR/makefile-functions $JHALFSDIR/
     628   cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
    512629+  #
    513630+  [[ $USE_PACO != "0" ]] && cp $COMMON_DIR/paco-build-$PROGNAME.sh $JHALFSDIR/
    514631+  #
    515632   [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
    516 +  #
    517633   if [[ "$COMPARE" != "0" ]] ; then
    518634     mkdir -p $JHALFSDIR/extras
    519      cp extras/* $JHALFSDIR/extras
Note: See TracChangeset for help on using the changeset viewer.