Check-in [da49a4dae4]
Not logged in

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

Overview

SHA1 Hash:da49a4dae45e8190f72d9543e7bb90b25ef4556b
Date: 2012-10-23 00:20:31
User: BarryK
Comment:fixes for python in main f.s. now building precise 5.4-final

Tags And Properties
Changes

Changes to woof-code/3builddistro

@@ -136,10 +136,11 @@
 #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.
 #121010 fix for 120925.
+#121022 fix for python not in devx, in main f.s.
 
 #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
 
@@ -2322,18 +2323,21 @@
 if [ "`grep 'ru_RU\.utf8' rootfs-complete/usr/share/X11/locale/locale.alias`" = "" ];then
  echo 'ru_RU.utf8:					ru_RU.UTF-8' >> rootfs-complete/usr/share/X11/locale/locale.alias
 fi
 
 #110329 some python files, move to 'devx'...
-PYTHONDIR=''
-[ -d rootfs-complete/usr/lib/python2.5 ] && PYTHONDIR='python2.5'
-[ -d rootfs-complete/usr/lib/python2.6 ] && PYTHONDIR='python2.6'
-[ -d rootfs-complete/usr/lib/python2.7 ] && PYTHONDIR='python2.7'
-if [ "$PYTHONDIR" ];then
- mkdir -p devx/usr/lib/${PYTHONDIR}
- cp -a -f --remove-destination rootfs-complete/usr/lib/${PYTHONDIR}/* devx/usr/lib/${PYTHONDIR}/
- rm -rf rootfs-complete/usr/lib/${PYTHONDIR}
+#121022 but only if python is supposed to be in devx...
+if [ "$(echo "$PKGS_SPECS_TABLE" | grep '^yes|python|' | grep 'exe>dev')" != "" ];then
+ PYTHONDIR=''
+ [ -d rootfs-complete/usr/lib/python2.5 ] && PYTHONDIR='python2.5'
+ [ -d rootfs-complete/usr/lib/python2.6 ] && PYTHONDIR='python2.6'
+ [ -d rootfs-complete/usr/lib/python2.7 ] && PYTHONDIR='python2.7'
+ if [ "$PYTHONDIR" ];then
+  mkdir -p devx/usr/lib/${PYTHONDIR}
+  cp -a -f --remove-destination rootfs-complete/usr/lib/${PYTHONDIR}/* devx/usr/lib/${PYTHONDIR}/
+  rm -rf rootfs-complete/usr/lib/${PYTHONDIR}
+ fi
 fi
 
 #110412 move all .bac, .pot and .pupdev files to 'devx'...
 find rootfs-complete/usr -type f -name '*.pot' -o -name '*.pupdev' -o -name '*.bac' |
 while read ONEPD
@@ -2552,10 +2556,17 @@
    [ ! -e ${ONEDICTDIR}/${HUNBASE} ] && ln -s ../../../share/hunspell/${HUNBASE} ${ONEDICTDIR}/${HUNBASE}
   done
  done
 fi
 
+#121022 may need this (see below similar code if python in devx)...
+if [ "$(echo "$PKGS_SPECS_TABLE" | grep '^yes|python|' | grep 'exe>dev')" = "" ];then
+ [ -e rootfs-complete/usr/bin/python2.5 ] && ln -s python2.5 rootfs-complete/usr/bin/python 2>/dev/null
+ [ -e rootfs-complete/usr/bin/python2.6 ] && ln -s python2.6 rootfs-complete/usr/bin/python 2>/dev/null
+ [ -e rootfs-complete/usr/bin/python2.7 ] && ln -s python2.7 rootfs-complete/usr/bin/python 2>/dev/null
+fi
+
 
 ###########
 #build the rootfs-complete sfs...
 echo
 echo "Now building the main f.s., ${PUPPYSFS}..."
@@ -2697,10 +2708,11 @@
 cut2PATTERN="s%CUT2INSERT%${CUT2INSERT}%"
 cut3PATTERN="s%CUT3INSERT%${CUT3INSERT}%"
 sed -e "$verPATTERN" -e "$prefixPATTERN" -e "$cut2PATTERN" -e "$cut3PATTERN" ../boot/README.HTM > build/README.HTM
 
 sync
+
 
 if [ "$SDFLAG" = "" ];then #120506
  $MKISOFS -D -R -o ${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}${SCSIFLAG}.iso -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ./build/
  sync
  md5sum ${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}${SCSIFLAG}.iso > ${DISTRO_FILE_PREFIX}-${DISTRO_VERSION}${SCSIFLAG}.iso.md5.txt
@@ -3042,12 +3054,15 @@
 sync
 umount layer_top
 rmdir layer_top
 
 ###HACK###
+if [ "$(echo "$PKGS_SPECS_TABLE" | grep '^yes|python|' | grep 'exe>dev')" != "" ];then #121022
  [ -e sandbox3/devx/usr/bin/python2.5 ] && ln -s python2.5 sandbox3/devx/usr/bin/python 2>/dev/null
  [ -e sandbox3/devx/usr/bin/python2.6 ] && ln -s python2.6 sandbox3/devx/usr/bin/python 2>/dev/null
+ [ -e sandbox3/devx/usr/bin/python2.7 ] && ln -s python2.7 sandbox3/devx/usr/bin/python 2>/dev/null
+fi
  rm -f sandbox3/devx/usr/lib/mozilla/plugins/* #100407 maybe .a, .la files in here.
 ###END HACK###
 
 #v424 no, i have needed docs in usr/share/doc...
 #w003 there's docs here, move them out...

Deleted woof-code/packages-templates/python-libxml2/FIXUPHACK

Deleted woof-code/packages-templates/python-libxml2/usr/lib/pyshared/PLUSEXTRADIRS

Deleted woof-code/packages-templates/python-libxml2/usr/lib/python-support/python-libxml2/python2.5/libxml2mod.so

Deleted woof-code/packages-templates/python-libxml2/usr/lib/python-support/python-libxml2/python2.6/libxml2mod.so

Deleted woof-code/packages-templates/python-libxml2/usr/lib/python2.5/PLUSEXTRAFILES

Deleted woof-code/packages-templates/python-libxml2/usr/lib/python2.5/lib-dynload/PLUSEXTRAFILES

Deleted woof-code/packages-templates/python-libxml2/usr/lib/python2.6/PLUSEXTRAFILES

Deleted woof-code/packages-templates/python-libxml2/usr/lib/python2.6/lib-dynload/PLUSEXTRAFILES

Deleted woof-code/packages-templates/python-libxml2/usr/share/pyshared/PLUSEXTRAFILES

Deleted woof-code/packages-templates/python-libxml2/usr/share/python-support/python-libxml2/drv_libxml2.py

Deleted woof-code/packages-templates/python-libxml2/usr/share/python-support/python-libxml2/libxml2.py

Changes to woof-distro/arm/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -596,12 +596,12 @@
 yes|pure-ftpd||exe,dev,doc,nls| #needed by pcurlftp_file_sharing.
 no|pwallpaper||exe
 no|pwget||exe
 yes|pwsget||exe
 no|pwireless||exe
-yes|python|python,python2.7-minimal,python2.7|exe,dev,doc,nls| #121022 moved from devx to main f.s.
-yes|python-libxml2|python-libxml2|exe,dev,doc,nls| #121022 moved from devx to main f.s.
+yes|python|python,python2.7-minimal,python2.7|exe,doc,nls| #121022 moved from devx to main f.s. /usr/include/python2.7 must also go into main f.s. so take out ,dev
+yes|python-libxml2|python-libxml2|exe,doc,nls| #121022 moved from devx to main f.s.
 yes|pzchmview||exe,dev,doc,nls
 yes|rarian|rarian-compat,librarian0,librarian-dev,scrollkeeper|exe>dev,dev,doc>dev,nls| #replacement for scrollkeeper.
 yes|readline|libreadline6,libreadline6-dev,readline-common|exe,dev,doc,nls
 no|replaceit||exe
 yes|retrovol||exe

Changes to woof-distro/x86/ubuntu/precise/DISTRO_PKGS_SPECS-ubuntu-precise

@@ -635,12 +635,12 @@
 yes|pure_ftpd||exe
 yes|pwallpaper||exe
 no|pwget||exe
 yes|pwsget||exe
 no|pwireless||exe
-yes|python|python,python2.7-minimal,python2.7|exe,dev,doc,nls| #121022 moved from devx to main f.s.
-yes|python-libxml2|python-libxml2|exe,dev,doc,nls| #121022 moved from devx to main f.s.
+yes|python|python,python2.7-minimal,python2.7|exe,doc,nls| #121022 moved from devx to main f.s. /usr/include/python2.7 must also go into main f.s. so take out ,dev
+yes|python-libxml2|python-libxml2|exe,doc,nls| #121022 moved from devx to main f.s.
 yes|radeon_firmware||exe,dev,doc,nls
 yes|readline|libreadline6,libreadline6-dev,readline-common|exe,dev,doc,nls
 no|replaceit||exe
 yes|retrovol||exe
 no|ripoff|ripoff,libripoff0,ripoff-mp3-plugin|exe,dev>null,doc,nls