slitaz-modular rev 73
Fixed up local.sh script when rebuilding installed.md5 file.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Thu Apr 14 13:05:24 2011 +0000 (2011-04-14) |
| parents | fe7948a8e277 |
| children | 6bf6e8a4a700 |
| files | .hgignore core-basic/config core-basic/list/a.000.base.list core-basic/list/a.001.justx.list core-basic/list/a.002.core-basic.list core/config core/list/a.005.server.list core/overlay/etc/rcS.conf initramfs/etc/init.d/local.sh initramfs/usr/bin/taz2xz |
line diff
1.1 --- a/.hgignore Thu Apr 14 12:45:08 2011 +0000 1.2 +++ b/.hgignore Thu Apr 14 13:05:24 2011 +0000 1.3 @@ -2,4 +2,5 @@ 1.4 working/** 1.5 *.iso 1.6 *.md5 1.7 -full-desktop/** 1.8 \ No newline at end of file 1.9 +full-desktop/** 1.10 +mirror-core/** 1.11 \ No newline at end of file
2.1 --- a/core-basic/config Thu Apr 14 12:45:08 2011 +0000 2.2 +++ b/core-basic/config Thu Apr 14 13:05:24 2011 +0000 2.3 @@ -1,7 +1,7 @@ 2.4 2.5 # names of modular package lists 2.6 # equals names of .list files in the order to build 2.7 -FLAVORS_LIST="a.000.base a.001.justx a.002.core-basic" 2.8 +FLAVORS_LIST="a.000.base a.001.justx a.002.core-basic a.003.server" 2.9 2.10 # download local copies of hg repos for iso 2.11 # equals yes or no
3.1 --- a/core-basic/list/a.000.base.list Thu Apr 14 12:45:08 2011 +0000 3.2 +++ b/core-basic/list/a.000.base.list Thu Apr 14 13:05:24 2011 +0000 3.3 @@ -22,6 +22,7 @@ 3.4 sysfsutils 3.5 syslinux 3.6 syslinux-extra 3.7 +tazchroot 3.8 tazlito 3.9 tazpkg 3.10 tazusb
4.1 --- a/core-basic/list/a.001.justx.list Thu Apr 14 12:45:08 2011 +0000 4.2 +++ b/core-basic/list/a.001.justx.list Thu Apr 14 13:05:24 2011 +0000 4.3 @@ -55,6 +55,7 @@ 4.4 sysfsutils 4.5 syslinux 4.6 syslinux-extra 4.7 +tazchroot 4.8 tazlito 4.9 tazpkg 4.10 tazusb
5.1 --- a/core-basic/list/a.002.core-basic.list Thu Apr 14 12:45:08 2011 +0000 5.2 +++ b/core-basic/list/a.002.core-basic.list Thu Apr 14 13:05:24 2011 +0000 5.3 @@ -128,6 +128,7 @@ 5.4 sysfsutils 5.5 syslinux 5.6 syslinux-extra 5.7 +tazchroot 5.8 tazlito 5.9 tazpkg 5.10 tazusb
6.1 --- a/core/config Thu Apr 14 12:45:08 2011 +0000 6.2 +++ b/core/config Thu Apr 14 13:05:24 2011 +0000 6.3 @@ -2,15 +2,19 @@ 6.4 # names of modular package lists 6.5 # equals names of .list files in the order to build 6.6 #MODULES="a.000.base a.001.justx a.002.core-basic a.003.core a.004.firefox a.005.core-xfce" 6.7 -MODULES="a.000.base a.001.justx a.002.core-basic a.003.core a.004.firefox a.005.server a.006.mesa a.007.xorg-xf86-video a.008.libs a.009.apps a.010.frozen-bubble a.011.warzone2100 a.012.celestia" 6.8 +BASE_MODULES="a.000.base a.001.justx a.002.core-basic a.003.core a.004.firefox \ 6.9 +a.005.server" 6.10 +MODULES="a.006.mesa a.007.xorg-xf86-video a.008.cmdline a.009.libs a.010.apps \ 6.11 +a.011.frozen-bubble a.012.celestia a.013.warzone2100 a.014.blender \ 6.12 +a.015.lmms a.016.gimp a.017.virtualbox-ose" 6.13 6.14 # download local copies of hg repos for iso 6.15 # equals yes or no 6.16 -COPY_HG="no" 6.17 +COPY_HG="yes" 6.18 6.19 # update existing local copies of hg repos for iso in working folder 6.20 # equals yes or no 6.21 -UPDATE_HG="no" 6.22 +UPDATE_HG="yes" 6.23 6.24 #HG_URL="https://bitbucket.org/gokhlayeh" 6.25 6.26 @@ -22,3 +26,5 @@ 6.27 # equals yes or no 6.28 CLEAN_INITRAMFS="no" 6.29 6.30 +BACKUP_PACKAGES="yes" 6.31 +BACKUP_SOURCES="yes" 6.32 \ No newline at end of file
7.1 --- a/core/list/a.005.server.list Thu Apr 14 12:45:08 2011 +0000 7.2 +++ b/core/list/a.005.server.list Thu Apr 14 13:05:24 2011 +0000 7.3 @@ -36,4 +36,5 @@ 7.4 dnsmasq 7.5 dhcp 7.6 dhcp-relay 7.7 -dhcp-client 7.8 \ No newline at end of file 7.9 +dhcp-client 7.10 +pwgen 7.11 \ No newline at end of file
8.1 --- a/core/overlay/etc/rcS.conf Thu Apr 14 12:45:08 2011 +0000 8.2 +++ b/core/overlay/etc/rcS.conf Thu Apr 14 13:05:24 2011 +0000 8.3 @@ -39,7 +39,7 @@ 8.4 # Daemons to start at boot time. SliTaz only provides a few daemons: firewall, 8.5 # Web server (httpd), SSH server (dropbear) and rsyncd, so boot order is 8.6 # not really important, but dbus/hald should be started before slim. 8.7 -RUN_DAEMONS="dbus hald firewall httpd slim" 8.8 +RUN_DAEMONS="dbus hald firewall crond slim" 8.9 8.10 # Pre login bold message. 8.11 MESSAGE="Welcome to your box."
9.1 --- a/initramfs/etc/init.d/local.sh Thu Apr 14 12:45:08 2011 +0000 9.2 +++ b/initramfs/etc/init.d/local.sh Thu Apr 14 13:05:24 2011 +0000 9.3 @@ -43,9 +43,10 @@ 9.4 if [ -f $PKG_ORDER ]; then 9.5 for i in $(cat $PKG_ORDER); do 9.6 if [ -f $INSTALLED/$i/pkgmd5 ]; then 9.7 + unset PACKAGE VERSION EXTRAVERSION 9.8 [ -f $INSTALLED/$i/receipt ] && source $INSTALLED/$i/receipt 9.9 if [ $(cat $LOCALSTATE/installed.md5 | grep -i " ${PACKAGE}-${VERSION}${EXTRAVERSION}.tazpkg") ]; then 9.10 - sed -i "/ $PACKAGE-$VERSION${EXTRAVERSION}.tazpkg/d" $LOCALSTATE/installed/installed.md5 9.11 + sed -i "/ $PACKAGE-$VERSION${EXTRAVERSION}.tazpkg/d" $LOCALSTATE/installed.md5 9.12 cat $INSTALLED/$i/pkgmd5 >> $LOCALSTATE/installed.md5 9.13 else 9.14 cat $INSTALLED/$i/pkgmd5 >> $LOCALSTATE/installed.md5
10.1 --- a/initramfs/usr/bin/taz2xz Thu Apr 14 12:45:08 2011 +0000 10.2 +++ b/initramfs/usr/bin/taz2xz Thu Apr 14 13:05:24 2011 +0000 10.3 @@ -6,6 +6,7 @@ 10.4 . /etc/slitaz/slitaz.conf 10.5 10.6 INSTALL_FILES="receipt files.list md5sum volatile.cpio.gz" 10.7 +INCOMING_REPOSITORY="$SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming" 10.8 10.9 if [ "$1" = "" ]; then 10.10 echo 10.11 @@ -20,6 +21,12 @@ 10.12 CUR_DIR="$PWD" 10.13 fi 10.14 10.15 + 10.16 +look_for_dep() 10.17 +{ 10.18 + grep -m1 ^$1$'\t' $INCOMING_REPOSITORY/wok-depends.txt | cut -f 2 | sed 's|^[ \t]*||g' | sed 's| |\n|g' 10.19 +} 10.20 + 10.21 tmp_dir=/tmp/taz2xz-$$ 10.22 mkdir -p $tmp_dir 10.23 cd $tmp_dir 10.24 @@ -27,6 +34,7 @@ 10.25 tazpkg get $1 || exit 1 10.26 PACKAGE_FILE="$(find -name "$1-*.tazpkg")" 10.27 { cpio --quiet -i receipt > /dev/null 2>&1; } < $PACKAGE_FILE 10.28 +unset PKGNAME PACKAGE VERSION EXTRAVERSION 10.29 source receipt || exit 1 10.30 PKGNAME="${PACKAGE}-${VERSION}${EXTRAVERSION}" 10.31 tazpkg extract $PKGNAME.tazpkg