Check-in [b558ac9d69]
Not logged in

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

Overview

SHA1 Hash:b558ac9d694f27530b5f787f4d256dae18b2548f
Date: 2012-09-25 13:08:52
User: BarryK
Comment:symlink workaround for debian/ubuntu multiarch broke builtin_files lists, fixed in 3builddistro

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -134,10 +134,12 @@
 #120830 my hunspell-en-us pet has pinstall.sh that creates symlinks of en_US.aff and en_US.dic from seamonkey and firefox. however, need to do this thoroughly.
 #120831 simplify repo-list radiobuttons for ppm.
 #120903 default radeon kms on again.
 #120909 multiarch support for /usr/bin. (see also 2createpackages).
 #120922 was getting "nv" listing twice (precise puppy) for xorg drivers-alternate.
+#120925 ignore debian/ubuntu multiarch circular symlink (these are create by 2createpackages), when creating builtin_files lists.
+
 
 #v431 accepts passed params, from woof_gui_tabs:
 #$1=$CHOICE_KERNELPKG $2=$CHOICE_SCSI $3=$CHOICE_BIGMODEM $4=$CHK_FB_STATE $5=$CHK_EXOTIC_STATE $6=$CHK_RADICAL_STATE
 #100912 add $7=CHK_SIMPLE_FILENAMES
 
@@ -2150,10 +2152,12 @@
  cat /tmp/0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/${ONEGENNAME}.files |
  while read ONELINE
  do
   [ "`echo "$ONELINE" | cut -c 1`" == "." ] && continue #catch ex: ../packages-qrky/abiword
   if [ -d "rootfs-complete${ONELINE}" ];then
+   #120925 ignore debian/ubuntu multiarch circular symlink (these are create by 2createpackages)...
+   [ -h "rootfs-complete${ONELINE}" ] && [ "$(readlink "rootfs-complete${ONELINE}")" = "./" ] && continue
    PREVPATH="$ONELINE"
    echo "$ONELINE" >> 0builtin_files_${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}/root/.packages/builtin_files/${ONEGENNAME}
   else
    NEWPATH="`dirname "$ONELINE"`"
    [ "$NEWPATH" == "/" ] && continue #ignore top-level files.