cookutils diff cook.conf @ rev 464
cook: Update set_paths function.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Thu Jun 07 17:33:30 2012 +0000 (2012-06-07) |
parents | 8e43a0f15aa0 |
children | 438265947b38 |
line diff
1.1 --- a/cook.conf Fri Jun 01 20:36:09 2012 +0100 1.2 +++ b/cook.conf Thu Jun 07 17:33:30 2012 +0000 1.3 @@ -11,6 +11,7 @@ 1.4 CACHE="$SLITAZ/cache" 1.5 LOGS="$SLITAZ/log" 1.6 FEEDS="$SLITAZ/xml" 1.7 +INCOMING="$SLITAZ/incoming" 1.8 DATA="/usr/share/cook" 1.9 1.10 # System packages DB. 1.11 @@ -33,10 +34,6 @@ 1.12 # Translation files to be included in packages. 1.13 LOCALE="" 1.14 1.15 -# List of packages installed in build chroot by cook or the Cooker setup. 1.16 -SETUP_PKGS="slitaz-toolchain pkg-config intltool gettext zlib-dev bzip2 1.17 -aufs-utils aufs m4 syslinux-extra pcre pcre-dev bash xorg-dev" 1.18 - 1.19 # Target host architecture type (Glibc doesn't support i386 anymore). 1.20 ARCH="i486" 1.21 1.22 @@ -91,11 +88,59 @@ 1.23 XORG_MIRROR="ftp://ftp.solnet.ch/mirror/x.org/pub/individual" 1.24 GNOME_MIRROR="http://ftp.gnome.org/pub/GNOME/sources" 1.25 1.26 +TOOLCHAIN="slitaz-toolchain 1.27 +busybox 1.28 +ncurses 1.29 +bash 1.30 +bzip2 1.31 +gawk 1.32 +gettext 1.33 +m4 1.34 +make 1.35 +patch 1.36 +db 1.37 +gdbm 1.38 +zlib-dev 1.39 +perl 1.40 +texinfo 1.41 +autoconf 1.42 +automake 1.43 +lzma 1.44 +tar 1.45 +kmod 1.46 +xorg-dev" 1.47 + 1.48 +TOOLCHAIN_EXTRA="tazpkg 1.49 +cookutils 1.50 +glib 1.51 +pkg-config 1.52 +libtool 1.53 +libpthread-stubs 1.54 +mercurial 1.55 +rsync 1.56 +wget" 1.57 + 1.58 +AUFS_PKGS="aufs-utils 1.59 +aufs" 1.60 + 1.61 +# List of packages installed by cook or the Cooker setup. 1.62 +SETUP_PKGS="$TOOLCHAIN 1.63 +$TOOLCHAIN_EXTRA 1.64 +intltool 1.65 +gettext 1.66 +bzip2" 1.67 + 1.68 # List of filesystems into the aufs chroot (to protect / against modifications) 1.69 # Default tank config: 1.70 AUFS_MOUNTS="/ /proc /sys /dev/shm /dev/pts /var/cache/tazpkg \ 1.71 /home /home/slitaz/src /home/slitaz/packages" 1.72 1.73 +if [ "$AUFS_MODE" ]; then 1.74 + INSTALL_PKGS="$SETUP_PKGS $AUFS_PKGS" 1.75 +else 1.76 + INSTALL_PKGS="$SETUP_PKGS" 1.77 +fi 1.78 + 1.79 # Old way/tazwok compatibility. 1.80 BUILD_HOST="$HOST_SYSTEM" 1.81 SOURCES_REPOSITORY=$SRC