From cb9510dd5388d6ba1ce2f42e239d8e83d805fc5f Mon Sep 17 00:00:00 2001 From: hackbard Date: Fri, 26 Aug 2005 22:26:10 +0000 Subject: [PATCH] 2005-08-27 --- doc/CHANGELOG | 4 + doc/FAI | 2 +- misc/hdw-tools/hdw-get.db | 89 ++++++++++++++++++- .../00-copy-system-files/00-copy-system-files | 4 +- packages/hackbard/xdirectfb/xdirectfb | 1 + packages/x11/gtk+/gtk+ | 4 +- scripts/Make-KPkg | 17 +++- targets/all-dev/include | 1 + targets/all-stable/include | 3 + targets/desktop/include | 2 + targets/fefe/include | 2 + targets/mobile/include | 2 + 12 files changed, 118 insertions(+), 13 deletions(-) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index a755580..b82559b 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,5 +1,9 @@ *) 2005-08-27 +- updated/fixed hdw-get stuff +- xdirectfb fixes +- improved scripts/Make-KPkg +- removed ardour from stable targets - fixes to create_buildorder subroutine - higher max priority diff --git a/doc/FAI b/doc/FAI index 7ad39ab..ef61759 100644 --- a/doc/FAI +++ b/doc/FAI @@ -164,7 +164,7 @@ for computers old enough to not support pxe but having installed a piece of hardware called floppy disk, you may create a bootdisk containing the install kernel (the pxe stuff is replaced by the bootdisk). -- compile a customized kernel <= 1.1 mb. do not unset needed features! +- compile a customized kernel <= 1.3 mb. do not unset needed features! (use ./misc/arch/${hdw_arch}/linux.config as .config + modify) diff --git a/misc/hdw-tools/hdw-get.db b/misc/hdw-tools/hdw-get.db index 8e19a4e..659638b 100644 --- a/misc/hdw-tools/hdw-get.db +++ b/misc/hdw-tools/hdw-get.db @@ -1,6 +1,6 @@ # hdw packages + run time dependencies # -# created Fri Aug 12 00:42:55 CEST 2005 +# created Sat Aug 27 02:19:37 CEST 2005 00-dirtree - 00-copy-system-files - @@ -8,7 +8,12 @@ 00-init-conf - 00-small-base-conf - aalib - xorg glibc ncurses aalib +acroread - xaw3d pango tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc xorg +alsa - xorg glib1 gtk+1 ncurses glibc alsa +apache - thunderbird firefox gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd linux glibc expat bdb gdbm apache +atk - glibc glib audiofile - glibc audiofile +aumix - expat libpng libpixman xorg glib cairo zlib freetype pango glibc atk gtk+ ncurses autoconf - automake - avifile - xvid libogg libvorbis tetex lesstif openmotif tcltk fftw mhonarc kbd bdb linux libjpeg expat fontconfig freetype zlib libpng gcc xorg glibc sdl qt avifile @@ -17,21 +22,24 @@ bash - bc - glibc bdb - bin86 - -bind - fftw mhonarc kbd bdb linux glibc openssl bind +bind - tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc openssl bind binutils - binutils - bison - blackbox - glibc xorg gcc bridge-utils - glibc bzip2 - +cairo - expat glibc zlib freetype libpng xorg cdrtools - glibc checkpwd - glibc shadow coreutils - cron - glibc +cups - libjpeg libtiff libpng zlib glibc cups curl - zlib glibc curl cvs - cvsd - glibc dfbpoint - glib glibc zlib directfb +dfbsee - glibc zlib directfb dhcp - glibc dialog - glibc ncurses diffutils - @@ -39,39 +47,67 @@ directfb - libjpeg freetype xorg gcc sdl directfb glibc zlib libpng e2fsprogs - ed - elftoaout - glibc +emacs - ncurses libungif zlib libpng libjpeg libtiff xorg xaw3d glibc +ethereal - zlib glib glibc freetype libpng cairo libpixman expat xorg pango atk gtk+ pcre ethereal etherwake - glibc +ettercap - libtool zlib glib atk glibc libpixman freetype libpng cairo expat xorg pango gtk+ ncurses pcre openssl expat - glibc expat +faad2 - glibc gcc faad2 fbset - glibc +ffmpeg - freetype gcc xorg sdl lame xvid faad2 zlib glibc ffmpeg fftw - glibc fftw +fig2ps - file - findutils - +firefox - alsa python perl libjpeg libpng libpixman expat cairo atk freetype zlib gcc transcode licq xfig imagemagick libxml glib xdirectfb windowmaker gdb xorg libtiff openh323 sendmail pine mutt openssl pwlib zip udev ncurses man-pages linux-libc-headers glibc firefox gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux flex - +flite - glibc fontconfig - expat zlib freetype glibc fontconfig freetype - glibc zlib fvwm - zlib libpng glibc xorg +gaim - tcltk gaim glib glibc zlib freetype libpng cairo libpixman expat xorg pango atk gtk+ gawk - gcc - gdb - glibc ncurses gdbm - glibc gettext - ghostscript - glibc zlib libjpeg libpng xorg +gimp - alsa libart gimp expat libpng libpixman xorg glib cairo zlib freetype pango glibc atk gtk+ +gimp-print - libpng libjpeg libtiff cups glibc zlib glib - tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc glib glib1 - tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc glibc - +gnuplot - glibc libpdf libpng zlib +gpsd - ncurses zlib freetype expat gcc gpsd xorg lesstif glibc +gpsdrive - pcre glib zlib freetype libpng xorg cairo libpixman expat pango atk gtk+ glibc gcc +grace - freetype expat glibc zlib libpng libjpeg libpdf xorg lesstif grep - groff - +gtk+ - libtiff libjpeg zlib freetype libpng cairo libpixman expat pango xorg atk glibc glib gtk+ +gtk+1 - xorg glibc glib1 +gtk-gnutella - zlib libxml glib1 glibc xorg gtk+1 +gv - xorg xaw3d glibc gzip - hdparm - glibc +hostap - hotplug - +imagemagick - tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux libpng libxml gcc zlib freetype libtool bzip2 xorg libjpeg glibc libtiff imagemagick +imlib - libpng zlib libtiff libjpeg libungif xorg glibc glib1 gtk+1 imlib ipcheck - iproute2 - bdb glibc +ipsec-tools - glibc openssl iptables - glibc +irssi - ncurses openssl glib glibc +isdn4k-utils - xorg isdn4k-utils tcltk ncurses glibc +jack - glibc jack kbd - ladspa - gcc glibc lam - gcc glibc lam +lame - glibc ncurses less - lesstif - zlib freetype expat glibc xorg lesstif liba52 - glibc +libart - glibc libdivxdecore - glibc libdvbpsi - glibc libdvdcss - glibc @@ -85,35 +121,48 @@ libgpg-error - glibc libgpg-error libidl - glibc glib libieee1284 - glibc libieee1284 libjpeg - glibc libjpeg +liblrdf - zlib libxml glibc curl raptor +libmad - glibc libmpeg2 - glibc libmpeg3 - glibc +libmustux - expat freetype xorg zlib gcc glibc qt alsa libnet - libogg - glibc +libosip - libosip glibc libpcap - libpdf - glibc fftw mhonarc kbd bdb linux +libpixman - glibc libpng - glibc zlib libsamplerate - glibc libsamplerate libsndfile - glibc libsndfile libtiff - gcc glibc zlib libjpeg libtiff libtool - libungif - glibc libungif +libunicode - glibc libvorbis - libvorbis libogg glibc libxml - zlib glibc libxml +licq - expat fontconfig freetype zlib qt xorg gcc glibc openssl lilo - +linphone - libosip speex alsa libsamplerate jack glib glibc linphone linux - linux-libc-headers - -lirc - lirc glibc +lirc - xorg lirc glibc lphdisk - glibc +lprng - glibc openssl ltrace - glibc libelf +lynx - apache thunderbird firefox gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc openssl ncurses m4 - +magicfilter - zlib glibc file make - man - man-pages - +mesa3d - gcc glibc xorg mhonarc - mhonarc kbd bdb linux minicom - glibc ncurses minimalist - mixerapp - glibc gcc xorg module-init-tools - +mplayer - mplayer pango xaw3d lesstif openmotif tcltk fftw kbd licq xfig gtk+ irssi imagemagick libxml glib xdirectfb tetex windowmaker qt gdb libtiff openh323 sendmail pine mutt openssl pwlib zip mhonarc udev bdb man-pages linux-libc-headers linux gcc ncurses expat lirc directfb sdl aalib xorg glib1 gtk+1 fontconfig libungif freetype alsa libjpeg zlib libpng glibc xvid lame libmad mppp - glibc mutt - python fftw pwlib mhonarc curl cdrtools util-linux perl gawk bdb coreutils gcc binutils man-pages linux-libc-headers linux glibc openssl ncurses nasm - @@ -127,32 +176,45 @@ netkit-tftp - glibc nfs-utils - openssl openldap nfsidmap libevent tcp_wrappers glibc nfsidmap - openssl glibc openldap ngrep - glibc +nmap - gcc openssl pcre xorg glibc glib1 gtk+1 ntp - libelf glibc +nut - glibc nvi - openh323 - gcc pwlib fftw mhonarc kbd bdb linux glibc openldap - openldap fftw mhonarc kbd linux bdb glibc openssl openmotif - tcltk fftw mhonarc kbd bdb linux glibc xorg openmotif openssh - tcp_wrappers zlib openssl glibc openssl - glibc openssl +orbit - tcp_wrappers glibc glib1 orbit +pango - libpng cairo glib glibc libpixman zlib freetype expat xorg pango parted - e2fsprogs glibc parted patch - pciutils - glibc +pcmcia-cs - xorg glib1 gtk+1 glibc pcre - glibc pcre perl - pine - ncurses openssl glibc pkgconfig - glibc portmap - glibc tcp_wrappers +povray - glibc gcc xorg zlib libpng libjpeg libtiff ppp - glibc procmail - glibc procps - +protux - expat freetype zlib alsa gcc glibc xorg qt libmustux psmisc - pwlib - gcc glibc mhonarc kbd bdb linux python - bzip2 zlib ncurses gdbm python openssl pwlib curl cdrtools util-linux perl gawk coreutils binutils man-pages linux-libc-headers fftw mhonarc kbd bdb linux gcc glibc -qt - expat fontconfig freetype xorg zlib libpng qt glibc gcc +qiv - xorg glibc glib1 gtk+1 imlib +qt - libjpeg libpng expat freetype xorg zlib qt glibc gcc +raptor - zlib glibc libxml curl raptor rcs - glibc +root-tail - glibc xorg rp-pppoe - glibc rsync - glibc +samba - cups openssl openldap glibc +scons - screen - shadow glibc libelf ncurses +scummvm - xorg gcc glibc sdl zlib alsa libmad libogg libvorbis sdl - xorg glibc gcc sdl-mixer - xorg gcc glibc sdl libogg libvorbis sed - @@ -160,13 +222,16 @@ sendmail - glibc bdb sersniff - glibc setserial - glibc shadow - +slmodem - glibc alsa sp12 - glibc speex - glibc libogg speex strace - glibc sudo - glibc synaptics - xorg glibc sysklogd - +syslinux - xaw3d pango tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc sysvinit - +t1lib - gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux xorg glibc t1lib tar - tcltk - fftw mhonarc kbd bdb linux xorg glibc tcltk tcp_wrappers - glibc tcp_wrappers @@ -175,16 +240,22 @@ termcap - tetex - freetype expat lesstif xorg gcc zlib glibc ncurses texinfo - tftp-hpa - tcp_wrappers glibc +thunderbird - alsa python perl libjpeg libpng libpixman expat cairo atk freetype zlib gcc transcode licq xfig imagemagick libxml glib xdirectfb windowmaker gdb xorg libtiff openh323 sendmail pine mutt openssl pwlib zip udev ncurses man-pages linux-libc-headers glibc thunderbird firefox gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux tpconfig - glibc +transcode - gtk+1 glib1 sdl expat avifile gcc freetype libtool bzip2 xorg libjpeg libtiff imagemagick libxml libdvdcss libdvdread xvid faad2 lame ffmpeg zlib glibc libogg libvorbis +transfig - glibc zlib libpng udev - +unrealircd - glibc unzip - glibc util-linux - vim - glibc ncurses xorg +vlc - libxml freetype libpng speex libogg libvorbis alsa gcc sdl libmad xorg libdvdcss libdvdread xvid faad2 lame zlib ffmpeg libdvbpsi glibc vobcopy - libdvdcss glibc libdvdread vpnc - glibc libgpg-error libgcrypt wget - which - windowmaker - expat libungif libjpeg zlib libpng libtiff glibc freetype xorg windowmaker +wine - apache thunderbird firefox gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux gcc xorg openssl openldap alsa ncurses glibc wine wireless_tools - glibc wireless_tools wmapm - glibc xorg wmifs - glibc xorg @@ -193,10 +264,20 @@ wmmon - glibc xorg wmnd - glibc xorg wmpower - xorg glibc wmwave - glibc xorg +wterm - glibc xorg +wvdial - openssl zlib glibc gcc wvstreams +wvstreams - libvorbis libogg zlib openssl glibc wvstreams +xaw3d - glibc xorg +xawtv - freetype expat lesstif alsa lirc xorg aalib zlib libpng zvbi libjpeg ncurses glibc xdirectfb - xdirectfb libtiff openh323 mutt python pwlib perl tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux libpng gcc directfb ncurses expat zlib freetype xorg glibc +xfig - gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc zlib libpng xorg libjpeg xhkeys - glibc xorg xlockmore - expat lesstif zlib gcc glibc freetype xorg +xml-parser - apache thunderbird firefox gtk+1 gtk+ pango irssi xaw3d tetex qt lesstif openmotif tcltk fftw mhonarc kbd bdb linux glibc expat +xmms - libogg libvorbis zlib alsa glibc glib1 gtk+1 xmms xorg xorg - fftw kbd libpng gcc expat fontconfig zlib freetype sendmail pine openssl zip mhonarc udev ncurses man-pages linux-libc-headers linux xorg libtiff openh323 mutt python pwlib perl bdb glibc +xpdf - expat zlib glibc gcc xorg lesstif freetype t1lib xvid - glibc fftw mhonarc kbd bdb linux zip - glibc zlib - +zvbi - zlib libpng glibc zvbi diff --git a/packages/base/00-copy-system-files/00-copy-system-files b/packages/base/00-copy-system-files/00-copy-system-files index dd12aba..d3794ad 100644 --- a/packages/base/00-copy-system-files/00-copy-system-files +++ b/packages/base/00-copy-system-files/00-copy-system-files @@ -58,9 +58,9 @@ custmain() { # hdw - linux hdw-get.conf file # keep track of version, downloadlocation and chosen installation media # -net_addr="http://hackdaworld.dyndns.org/download" +net_addr="http://hdwlinux.org/download" hdw_version="$hdw_version" -hdw_arch="$hdw_arch" ;hdw_arch_opt="${hdw_arch_ot}" +hdw_arch="$hdw_arch" ;hdw_arch_opt="${hdw_arch_opt}" # bin_dir="${hdw_home_dir}/binaries/${hdw_arch}-${hdw_arch_opt}" EOF } diff --git a/packages/hackbard/xdirectfb/xdirectfb b/packages/hackbard/xdirectfb/xdirectfb index c34104d..270a5a0 100644 --- a/packages/hackbard/xdirectfb/xdirectfb +++ b/packages/hackbard/xdirectfb/xdirectfb @@ -60,6 +60,7 @@ build_main() { } post_install() { + docdir="$root/opt/xdirectfb/doc" mkdir -p $docdir cp -v README $docdir cp -v $confdir/xdfbserverrc.example $docdir diff --git a/packages/x11/gtk+/gtk+ b/packages/x11/gtk+/gtk+ index d786cc7..3bdab4d 100644 --- a/packages/x11/gtk+/gtk+ +++ b/packages/x11/gtk+/gtk+ @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.8.0 +# [V] 2.8.2 # [S] 3-7 -# [D] gtk+-2.8.0.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/gtk+/2.8/ +# [D] gtk+-2.8.2.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/gtk+/2.8/ export PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig" diff --git a/scripts/Make-KPkg b/scripts/Make-KPkg index b12afe6..031b7da 100755 --- a/scripts/Make-KPkg +++ b/scripts/Make-KPkg @@ -7,18 +7,21 @@ config="" name="" +builddir="" homedir=$PWD while [ "$1" ] ; do case "$1" in -config) config=$2 ; shift 2 ;; -name) name=$2 ; shift 2 ;; + -dir) builddir=$2 ; shift 2 ;; *) echo echo "usage:" echo echo "-config " echo "-name " + echo "-dir " echo exit 1 ;; esac @@ -34,12 +37,18 @@ fi [ -z "$config" ] && config="./misc/arch/${hdw_arch}/linux.config" [ -z "$name" ] && name="custom-$hdw_arch" +[ -z "$builddir" ] && builddir="/tmp" if [ ! -f $config ] ; then echo "$config doesn't exist, aborting ..." exit 1 fi +if [ ! -d $builddir ] ; then + echo "$builddir doesn't exist, aborting ..." + exit 1 +fi + kerpkg="`grep '^#\ \[D\]' ./packages/base/linux/linux | awk '{ print $3 }'`" kerver="`grep '^#\ \[V\]' ./packages/base/linux/linux | awk '{ print $3 }'`" @@ -65,10 +74,10 @@ fi # build kernel & modules kerarch=${hdw_arch//ia32/i386} -cp $config /tmp/linux.config -rm -rf /tmp/linux-$kerver -tar xfj ./download/base/linux/$kerpkg -C /tmp -cd /tmp/linux-$kerver +cp $config $builddir/linux.config +rm -rf $builddir/linux-$kerver +tar xfj ./download/base/linux/$kerpkg -C $builddir +cd $builddir/linux-$kerver mv ../linux.config .config cd include && ln -sf asm-${kerarch} asm && cd .. yes "" | make oldconfig diff --git a/targets/all-dev/include b/targets/all-dev/include index 208b1d2..178e043 100644 --- a/targets/all-dev/include +++ b/targets/all-dev/include @@ -19,5 +19,6 @@ # [R] x11/mozilla # [C] science + # [C] soundtools # [C] optional diff --git a/targets/all-stable/include b/targets/all-stable/include index 7d7c23f..97c0a69 100644 --- a/targets/all-stable/include +++ b/targets/all-stable/include @@ -24,5 +24,8 @@ # [R] x11/mozilla # [C] science + # [C] soundtools +# [R] soundtools/ardour + # [C] optional diff --git a/targets/desktop/include b/targets/desktop/include index 722d5e3..5d3a5c5 100644 --- a/targets/desktop/include +++ b/targets/desktop/include @@ -21,7 +21,9 @@ # [R] net/netkit-tftp # [C] multimedia + # [C] soundtools +# [R] soundtools/ardour # [C] devel diff --git a/targets/fefe/include b/targets/fefe/include index 279e6c9..1a50bcb 100644 --- a/targets/fefe/include +++ b/targets/fefe/include @@ -31,6 +31,8 @@ # [R] x11/mozilla # [C] science + # [C] soundtools +# [R] soundtools/ardour # [R] ia32/syslinux diff --git a/targets/mobile/include b/targets/mobile/include index b9eb4d4..6aa542e 100644 --- a/targets/mobile/include +++ b/targets/mobile/include @@ -20,7 +20,9 @@ # [R] net/netkit-tftp # [C] multimedia + # [C] soundtools +# [R] soundtools/ardour # [C] hackbard # [R] hackbard/minimalist -- 2.20.1