From 0315072ae3bd307eee71718e1a59f923edcbdaca Mon Sep 17 00:00:00 2001 From: gobo72 Date: Tue, 8 Mar 2011 01:56:05 +0000 Subject: [PATCH] =?utf8?q?Fini=20la=20mise=20=C3=A0=20jour=20pour=20r?= =?utf8?q?=C3=A9pertoire=20pkg.=20Stage4=20compile=20OK=20et=20driver=20xo?= =?utf8?q?rg=20nouveau=20OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- NOTES | 12 -- config/packages-list | 50 +++--- config/sysinfos.amd64 | 4 +- config/sysinfos.atom | 2 +- config/sysinfos.server | 19 ++- config/sysinfos.workstn | 22 ++- functions-ipkg | 7 + stage2/INSTALL | 11 ++ stage3/pkg/tcl | 4 + stage4/INSTALL | 10 +- stage4/Makefile | 21 +++ stage4/cis-dbus | 46 ----- stage4/cis-glib | 36 ---- stage4/cis-hal | 98 ----------- stage4/cis-lesstif | 33 ---- stage4/cis-mesalib | 29 ---- stage4/cis-policykit | 34 ---- stage4/cis-polkit | 35 ---- stage4/cis-t1lib | 21 --- stage4/cis-tk | 29 ---- stage4/cis-windowmaker | 34 ---- stage4/cis-xterm | 36 ---- stage4/configure-fonts | 14 +- stage4/configure-xorg | 76 ++------- stage4/hv-install-1 | 124 ++++++++++++++ stage4/ipkg.def | 7 + stage4/packages-update | 69 ++++---- stage4/pkg/MesaLib | 18 ++ stage4/pkg/PolicyKit | 13 ++ stage4/pkg/WindowMaker | 15 ++ stage4/pkg/dbus | 27 +++ stage4/pkg/glib | 19 +++ stage4/pkg/hal | 81 +++++++++ stage4/pkg/lesstif | 33 ++++ stage4/pkg/libdrm-git | 13 ++ stage4/pkg/polkit | 15 ++ stage4/pkg/t1lib | 7 + stage3/pkg/tcl => stage4/pkg/tk | 17 +- stage4/pkg/xf86-video-nouveau-git | 8 + stage4/pkg/xterm | 25 +++ stage4/stage.def | 3 + stage4/stage4-additions | 26 --- stage4/stage4-install | 157 ------------------ stage5/INSTALL | 10 +- stage5/Makefile | 21 +++ stage5/{install-1 => hv-install-1} | 6 +- stage5/ipkg.def | 7 + .../{resources => misc}/emacs/buffer-cycle.el | 0 stage5/{resources => misc}/emacs/emacsrc | 0 stage5/{resources => misc}/mail-files.sh | 0 stage5/{resources => misc}/mount.fusedvdfs | 0 stage5/packages-update | 1 - stage5/pkg/dvdfs | 2 +- stage5/pkg/emacs | 6 +- stage5/pkg/sendmail | 2 +- stage5/stage.def | 3 + stage6/INSTALL | 7 + stage6/Makefile | 21 +++ stage6/{stage6-install => hv-install-1} | 68 ++++---- stage6/ipkg.def | 7 + stage6/packages-update | 0 stage6/{cis-gal => pkg/gal} | 0 stage6/{cis-gdm => pkg/gdm} | 0 .../{cis-gnome-applets => pkg/gnome-applets} | 0 stage6/{cis-gnome-audio => pkg/gnome-audio} | 0 stage6/{cis-gnome-media => pkg/gnome-media} | 0 stage6/{cis-gnumeric => pkg/gnumeric} | 0 .../libmusicbrainz} | 0 stage6/{cis-metacity => pkg/metacity} | 0 stage6/{cis-nautilus => pkg/nautilus} | 0 stage6/stage.def | 3 + stage6/stage6-additions | 24 --- 72 files changed, 699 insertions(+), 849 deletions(-) create mode 100644 stage4/Makefile delete mode 100755 stage4/cis-dbus delete mode 100755 stage4/cis-glib delete mode 100755 stage4/cis-hal delete mode 100755 stage4/cis-lesstif delete mode 100755 stage4/cis-mesalib delete mode 100755 stage4/cis-policykit delete mode 100755 stage4/cis-polkit delete mode 100755 stage4/cis-t1lib delete mode 100755 stage4/cis-tk delete mode 100755 stage4/cis-windowmaker delete mode 100755 stage4/cis-xterm create mode 100755 stage4/hv-install-1 create mode 100644 stage4/ipkg.def create mode 100644 stage4/pkg/MesaLib create mode 100644 stage4/pkg/PolicyKit create mode 100644 stage4/pkg/WindowMaker create mode 100644 stage4/pkg/dbus create mode 100644 stage4/pkg/glib create mode 100644 stage4/pkg/hal create mode 100644 stage4/pkg/lesstif create mode 100644 stage4/pkg/libdrm-git create mode 100644 stage4/pkg/polkit create mode 100644 stage4/pkg/t1lib copy stage3/pkg/tcl => stage4/pkg/tk (57%) create mode 100644 stage4/pkg/xf86-video-nouveau-git create mode 100644 stage4/pkg/xterm create mode 100644 stage4/stage.def delete mode 100755 stage4/stage4-additions delete mode 100755 stage4/stage4-install create mode 100644 stage5/Makefile rename stage5/{install-1 => hv-install-1} (98%) create mode 100644 stage5/ipkg.def rename stage5/{resources => misc}/emacs/buffer-cycle.el (100%) rename stage5/{resources => misc}/emacs/emacsrc (100%) rename stage5/{resources => misc}/mail-files.sh (100%) rename stage5/{resources => misc}/mount.fusedvdfs (100%) create mode 100644 stage5/stage.def create mode 100644 stage6/INSTALL create mode 100644 stage6/Makefile rename stage6/{stage6-install => hv-install-1} (63%) create mode 100644 stage6/ipkg.def mode change 100644 => 100755 stage6/packages-update rename stage6/{cis-gal => pkg/gal} (100%) mode change 100755 => 100644 rename stage6/{cis-gdm => pkg/gdm} (100%) mode change 100755 => 100644 rename stage6/{cis-gnome-applets => pkg/gnome-applets} (100%) mode change 100755 => 100644 rename stage6/{cis-gnome-audio => pkg/gnome-audio} (100%) mode change 100755 => 100644 rename stage6/{cis-gnome-media => pkg/gnome-media} (100%) mode change 100755 => 100644 rename stage6/{cis-gnumeric => pkg/gnumeric} (100%) mode change 100755 => 100644 rename stage6/{cis-libmusicbrainz => pkg/libmusicbrainz} (100%) mode change 100755 => 100644 rename stage6/{cis-metacity => pkg/metacity} (100%) mode change 100755 => 100644 rename stage6/{cis-nautilus => pkg/nautilus} (100%) mode change 100755 => 100644 create mode 100644 stage6/stage.def delete mode 100755 stage6/stage6-additions diff --git a/NOTES b/NOTES index dcdec56..511979e 100644 --- a/NOTES +++ b/NOTES @@ -29,15 +29,3 @@ Reduces-size hvlinux perlbug,grolj4,perldoc,a2p,addtinfo,addr2line,cytune,enc2xs,eqn,eqn2graph, infotocap,neonconfig -Remove /usr/lib//*.{a,la} - - - - - ------------- -Après le stage 1: - 1. Monter /mnt/hvrepos (ajouter à /etc/fstab) - 2. Copier les sources de hvlinux - 3. Avant de lancer le stage2, modifier la variable LFS="" dans -sysinfos - diff --git a/config/packages-list b/config/packages-list index 56ecc20..cbd0625 100644 --- a/config/packages-list +++ b/config/packages-list @@ -46,8 +46,8 @@ CUPS_PDF="cups-pdf-2.5.0" CURL="curl-7.19.7" CVS="cvs-1.11.23" -DBUS="dbus-1.2.16" -DBUS_GLIB="dbus-glib-0.82" +DBUS="dbus-1.2.24" +DBUS_GLIB="dbus-glib-0.88" DDCLIENT="ddclient-3.6.7" DEJAGNU="dejagnu-1.4.4" DESKTOP_FILE_UTILS="desktop-file-utils-0.15" @@ -112,9 +112,10 @@ GHOSTSCRIPT_FONTS_OTHER="ghostscript-fonts-other-6.0" GNASH=" gnash-0.8.5" GIMP="gimp-2.6.8" GUTENPRINT="gutenprint-5.2.5" -GLIB="glib-2.22.4" +GLIB="glib-2.24.2" GLIBMM="glibmm-2.22.1" GLITZ="glitz-0.5.6" +GPERF="gperf-3.0.4" # GNOME2 core packages GNOME2_VER="gnome-2.28.1" @@ -187,7 +188,7 @@ GDM="gdm-2.28.1" GMP="gmp-5.0.1" GNOME_MOUNT="gnome-mount-0.6" GNUTLS="gnutls-2.8.5" -GOBJECT_INSTROSPECTION="gobject-introspection-0.6.5" +GOBJECT_INSTROSPECTION="gobject-introspection-0.6.14" GOFFICE="goffice-0.2.2" GNUMERIC="gnumeric-1.6.3" GNUPG="gnupg-1.4.9" @@ -271,7 +272,7 @@ LIBOPENJPEG="libopenjpeg-1.2" LIBPCAP="libpcap-1.0.0" LIBPNG="libpng-1.2.44" LIBPROXY="libproxy-0.2.3" -LIBPTHREAD_STUBS="libpthread-stubs-0.1" +LIBPTHREAD_STUBS="libpthread-stubs-0.3" LIBRSVG="librsvg-2.26.0" LIBSAMPLERATE="libsamplerate-0.1.7" LIBSIGCPP="libsigc++-2.2.4.2" @@ -391,14 +392,13 @@ SQUIRRELMAIL="squirrelmail-1.5.1" STARTUP_NOTIFICATION="startup-notification-0.9" STRACE="strace-4.5.19" SUBVERSION="subversion-1.6.6" -SWEEP="sweep-svn-r586" SYLPHEED="sylpheed-2.7.1" SUDO="sudo-1.7.2p2" -SWEEP="sweep-svn-r586" SYSKLOGD="sysklogd-1.5" SYSVINIT="sysvinit-2.86" T1LIB="t1lib-5.1.2" +TALLOC="talloc-2.0.1" TANGO_ICON_THEME="tango-icon-theme-0.8.90" TANGO_ICON_THEME_EXTRAS="tango-icon-theme-extras-0.1.0" TAR_PACKAGE="tar-1.23" @@ -434,27 +434,33 @@ WINDOWMAKER_EXTRA="WindowMaker-extra-0.1" WMNOTIFY="wmnotify-0.3.2" WV="wv-1.2.4" -XORG_APP=app-7.5-3 -XORG_DRIVER=driver-7.5-3 -XORG_FONT=font-7.5-3 -XORG_LIB=lib-7.5-3 -XORG_PROTO=proto-7.5-3 -XORG_UTIL=util-7.5-3 +XORG_VER="7.6-1" +XORG_APP=app-${XORG_VER} +XORG_DRIVER=driver-${XORG_VER} +XORG_VIDEO_NOUVEAU="xf86-video-nouveau-git-20110306" +XORG_FONT=font-${XORG_VER} +XORG_LIB=lib-${XORG_VER} +XORG_PROTO=proto-${XORG_VER} +XORG_UTIL=util-${XORG_VER} LIBXAU=libXau-1.0.6 -LIBXDMCP=libXdmcp-1.0.3 -XBITMAPS=xbitmaps-1.1.0 -LIBDRM=libdrm-2.4.21 -MESALIB=MesaLib-7.8.2 -XCURSOR_THEMES=xcursor-themes-1.0.2 -XKEYBOARD_CONFIG=xkeyboard-config-1.8 -LUIT=luit-1.0.5 -XORG_SERVER=xorg-server-1.8.2 +LIBXDMCP=libXdmcp-1.1.0 +XBITMAPS=xbitmaps-1.1.1 +##LIBDRM=libdrm-2.4.23 +LIBDRM="libdrm-git-20110306" +MESALIB=MesaLib-7.9 +XCURSOR_THEMES=xcursor-themes-1.0.3 +XKEYBOARD_CONFIG=xkeyboard-config-2.0 +LUIT=luit-1.1.0 +XORG_SERVER=xorg-server-1.9.3 XDM=xdm-1.1.10 +XCB_PROTO="xcb-proto-1.6" +XCB_UTIL="xcb-util-0.3.6" +LIBXCB="libxcb-1.7" XINETD="xinetd-2.3.14" XMLTO="xmlto-0.0.23" XMLTOMAN="xmltoman-0.4" -XTERM="xterm-253" +XTERM="xterm-267" XVIDCORE="xvidcore-1.2.2" XZ_UTILS="xz-4.999.9beta" diff --git a/config/sysinfos.amd64 b/config/sysinfos.amd64 index 4607dfb..754f304 100644 --- a/config/sysinfos.amd64 +++ b/config/sysinfos.amd64 @@ -35,8 +35,8 @@ SWAP_PARTITION="/dev/sdb2" # x86_64 (AMD Athlon 64) HVL_TARGET="x86_64" -# Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS -MACHINE_ARCHITECTURE="" +# Used for setting machine-specific option in CFLAGS and CPPFLAGS +MARCH_FLAGS="-march=k8" # Keyboard mapping (example: us) KEYBOARD="us" diff --git a/config/sysinfos.atom b/config/sysinfos.atom index f894407..7060b4a 100644 --- a/config/sysinfos.atom +++ b/config/sysinfos.atom @@ -35,7 +35,7 @@ BOOT_PARTITION="/dev/sda1" # x86_64 (AMD Athlon 64) HVL_TARGET="x86" -# Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS +# Used for setting machine-specific option in CFLAGS and CPPFLAGS MARCH_FLAGS="-march=atom -mssse3 -mfpmath=sse -fomit-frame-pointer" # Keyboard mapping (example: us) diff --git a/config/sysinfos.server b/config/sysinfos.server index ec480b4..bc696f6 100644 --- a/config/sysinfos.server +++ b/config/sysinfos.server @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # This file contains the informations specific to the target system # onto which Linux-HV will be installed @@ -6,7 +6,7 @@ # This is the number of make jobs that can be executed # simultaneously. Normally, a value of 2 per processor # gives good results. -MAKEJOBS=4 +MAKEJOBS=1 # Installation type: server, ltsp-server or workstation. INST_TYPE="server" @@ -14,7 +14,9 @@ INST_TYPE="server" # New user to create REGUSER="" -# Destination path where to install new Linux-HV system +# Destination path where to install new Linux-HV system. This is usually where +# you have mounted your new LFS partition, but it can also be any directory. +# This is relevant only for stage 0 and 1. LFS="/mnt/hvlinux" # Destination partition where to install new Linux-HV system @@ -26,8 +28,15 @@ BOOT_PARTITION="/dev/hda1" # Swap partition (if applicable) SWAP_PARTITION="/dev/hda5" -# Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS -MACHINE_ARCHITECTURE="pentium" +# Define this when cross-compiling to the desired target +# architecture. Default is x86 32-bits architecture (i686). +# arm926t - ARM 926T little endian +# x86 (i686) +# x86_64 (AMD Athlon 64) +HVL_TARGET="x86_64" + +# Used for setting machine-specific option in CFLAGS and CPPFLAGS +MARCH_FLAGS="-march=k8" # Keyboard mapping (example: us) KEYBOARD="us" diff --git a/config/sysinfos.workstn b/config/sysinfos.workstn index 8b6f137..f178f65 100644 --- a/config/sysinfos.workstn +++ b/config/sysinfos.workstn @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # This file contains the informations specific to the target system # onto which Linux-HV will be installed @@ -6,7 +6,7 @@ # This is the number of make jobs that can be executed # simultaneously. Normally, a value of 2 per processor # gives good results. -MAKEJOBS=4 +MAKEJOBS=1 # Installation type: server, ltsp-server or workstation. INST_TYPE="workstation" @@ -14,7 +14,9 @@ INST_TYPE="workstation" # New user to create REGUSER="" -# Destination path where to install new Linux-HV system +# Destination path where to install new Linux-HV system. This is usually where +# you have mounted your new LFS partition, but it can also be any directory. +# This is relevant only for stage 0 and 1. LFS="/mnt/hvlinux" # Destination partition where to install new Linux-HV system @@ -26,15 +28,19 @@ BOOT_PARTITION="/dev/hda1" # Swap partition (if applicable) SWAP_PARTITION="/dev/hda5" -# Used for setting '-march=xxx' option in CFLAGS and CPPFLAGS -MACHINE_ARCHITECTURE="pentium" +# Define this when cross-compiling to the desired target +# architecture. Default is x86 32-bits architecture (i686). +# arm926t - ARM 926T little endian +# x86 (i686) +# x86_64 (AMD Athlon 64) +HVL_TARGET="x86_64" + +# Used for setting machine-specific option in CFLAGS and CPPFLAGS +MARCH_FLAGS="-march=k8" # Keyboard mapping (example: us) KEYBOARD="us" -HV_XF86_KEYBOARD_LAYOUT="ca_enhanced" -XF86_CARD_DRIVER="ati" - # Sound card support: yes or no SOUND_CARD="yes" diff --git a/functions-ipkg b/functions-ipkg index 1058358..23a1e1a 100644 --- a/functions-ipkg +++ b/functions-ipkg @@ -11,6 +11,7 @@ function_exists() return $? } +unset -f hvpatch_pre unset -f hvconfig_pre unset -f hvconfig_cache unset -f hvconfig_post @@ -127,6 +128,12 @@ ipkg_script() source ${PACKAGE_DEF} fi + # Execute pre-patch function if applicable + if function_exists hvpatch_pre ; then + echo "Running patch pre-script" + hvpatch_pre + fi + hvpatch # Execute pre-configure function if applicable diff --git a/stage2/INSTALL b/stage2/INSTALL index 5252117..b6215a0 100644 --- a/stage2/INSTALL +++ b/stage2/INSTALL @@ -23,3 +23,14 @@ Installation 7. Login as root, and create the password for the regular user: >$ passwd reguser + + +Re-installation +--------------- + +1. You need the /tools directory in order to build stage2. If it is not + present, it means it was previously and automatically backed up at + the end of stage2 to /usr/src: + $> cp -a /usr/src/tools / + +2. Follow instructions above for stage2 installation diff --git a/stage3/pkg/tcl b/stage3/pkg/tcl index 83243b1..4c7ac0f 100644 --- a/stage3/pkg/tcl +++ b/stage3/pkg/tcl @@ -22,6 +22,10 @@ hvbuild() tclConfig.sh make install +} + +hvbuild_post() +{ make install-private-headers # Special case for TCL diff --git a/stage4/INSTALL b/stage4/INSTALL index 52383c5..0f8aa3b 100644 --- a/stage4/INSTALL +++ b/stage4/INSTALL @@ -1,5 +1,7 @@ +stage4: Installing X-Windows software + +Installation +------------ -Installation instructions -------------------------- - -1. ./stage4-install +1. Type: + $> sudo make diff --git a/stage4/Makefile b/stage4/Makefile new file mode 100644 index 0000000..b5595fc --- /dev/null +++ b/stage4/Makefile @@ -0,0 +1,21 @@ +# Makefile for hvlinux + +# Idées pour future targets: +# clean +# strip +# compress -> compressdoc (à partir du stage2) +# dep +# list -> list installed packages and versions + +.PHONY: get test + +all: + @./hv-install-1 + +# Fetch packages from network +get: + @./packages-update + +# Test integrity of packages +test: + @./packages-update test diff --git a/stage4/cis-dbus b/stage4/cis-dbus deleted file mode 100755 index cd7ff64..0000000 --- a/stage4/cis-dbus +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -hvgroupadd -g 18 messagebus -hv_useradd -c D-BUS-Message-Daemon-User -d /dev/null \ - -u 18 -g messagebus -s /bin/false messagebus - -cd ${LFS_TMP}/${PACKAGE}-build -../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/dbus-1.0 \ - --localstatedir=/var \ - ${CONFIGURE_OPTS} -make -make install -ldconfig - -# Bootscript -install -v -m740 ${SCRDIR}/bootscripts/dbus /etc/rc.d/init.d - -# script-name start stop -bootscript_add_rc3 dbus 92 20 - -# Starting the session daemon here has the added bonus that it will exit -# when you log out of your GNOME session. If you wish to start the daemon -#here, use the following command instead of the one shown above: -######echo "exec dbus-launch --exit-with-session gnome-session" >> ~/.xinitrc - -# Return last error -exit $? diff --git a/stage4/cis-glib b/stage4/cis-glib deleted file mode 100755 index 188b797..0000000 --- a/stage4/cis-glib +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE}-build -../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - ${CONFIGURE_OPTS} -make -make install -ldconfig - -chmod -v 755 /usr/bin/gtester-report - -cat > /etc/profile.d/glib2-locale.sh << "EOF" -# Use the current locale charset for filenames -# in applications using GLib -export G_FILENAME_ENCODING=@locale -EOF - -exit $? diff --git a/stage4/cis-hal b/stage4/cis-hal deleted file mode 100755 index c4b4955..0000000 --- a/stage4/cis-hal +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -hv_groupadd -g 19 haldaemon -hv_useradd -c HAL-Daemon-User -d /dev/null -u 19 \ - -g haldaemon -s /bin/false haldaemon - -cd ${LFS_TMP}/${PACKAGE}-build -../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/hal \ - --localstatedir=/var \ - --with-udev-prefix=/etc \ - ${CONFIGURE_OPTS} -make -make install -ldconfig - -install -v -m755 -d /var/run/hald - -# Bootscript -install -v -m740 ${SCRDIR}/bootscripts/hald /etc/rc.d/init.d - -# script-name start stop -bootscript_add_rc3 hald 93 19 - -# The default setup for HAL is to allow only certain users to invoke methods -# such as Mount(). These are the root user and the user determined to be at the -# active console using pam_console. If you are not set up to use -# Linux-PAM-1.1.1 and pam_console, create a group that is allowed to invoke HAL -# methods with the following commands: -hv_groupadd -g 61 halusers -cat > /etc/dbus-1/system.d/halusers.conf << "EOF" - - - - - - - - - - - - -EOF - -# Now add the users you would like to the halusers group to use HAL: -usermod -a -G halusers ${REGUSER} - -# With the above configuration in place, authorized users now have the ability -# to unmount disk partitions mounted at non-standard locations such as /pub. -# If you'd like to restrict this policy to only drives which are considered -# removable or hotpluggable, add the following configuration file as the root user: -cat > /etc/hal/fdi/policy/no-fixed-drives.fdi << "EOF" - - - - - - - - - true - - - - -EOF - -# If the system-wide D-BUS daemon was running during the -# installation of HAL, ensure you stop and restart the -# D-BUS daemon before attempting to start the hald daemon. -#/etc/rc.d/init.d/dbus restart - -# Starting daemon -#/etc/rc.d/init.d/hal start - -exit $? diff --git a/stage4/cis-lesstif b/stage4/cis-lesstif deleted file mode 100755 index f6ada8a..0000000 --- a/stage4/cis-lesstif +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -./configure \ - --prefix=${XORG_PREFIX} \ - ${CONFIGURE_OPTS} -sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@" clients/Motif-2.1/mwm/Makefile -make rootdir=/usr/share/doc/${PACKAGE} -make rootdir=/usr/share/doc/${PACKAGE} install -ldconfig - -# Applicatons that utilize Xorg libraries often, and incorrectly, expect to find configuration -# files in $XORG_PREFIX/lib/X11. While still the root user, create a compatibility symlink with -# the following command: -ln -v -sf /etc/X11/mwm ${XORG_PREFIX}/lib/X11 - -exit $? diff --git a/stage4/cis-mesalib b/stage4/cis-mesalib deleted file mode 100755 index 150bef7..0000000 --- a/stage4/cis-mesalib +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -# Mesa builds with debugging symbols. Remove the -g switch from both CFLAGS and CXXFLAGS with this command: -sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure -./configure --prefix=${XORG_PREFIX} \ - --sysconfdir=/etc \ - ${XORG_CONFIG} \ - ${CONFIGURE_OPTS} -make -make install - -exit $? diff --git a/stage4/cis-policykit b/stage4/cis-policykit deleted file mode 100755 index 1fa375a..0000000 --- a/stage4/cis-policykit +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -hv_groupadd -g 27 polkituser -hv_useradd -c Policy-Kit-Daemon-User -d /dev/null -u 27 \ - -g polkituser -s /bin/false polkituser - -cd ${LFS_TMP}/${PACKAGE}-build -../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/PolicyKit \ - --localstatedir=/var \ - ${CONFIGURE_OPTS} -make -make install -ldconfig - -exit $? diff --git a/stage4/cis-polkit b/stage4/cis-polkit deleted file mode 100755 index 6c7a45f..0000000 --- a/stage4/cis-polkit +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -# It is a requirement to have a dedicated user and group for polkit to function -# correctly: -hv_groupadd -fg 27 polkituser -hv_useradd -c Policy-Kit-Daemon-User -d /dev/null -u 27 \ - -g polkituser -s /bin/false polkituser - -cd ${LFS_TMP}/${PACKAGE}-build -../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/polkit-1 \ - --localstatedir=/var \ - ${CONFIGURE_OPTS} -make -make install -ldconfig - -exit $? diff --git a/stage4/cis-t1lib b/stage4/cis-t1lib deleted file mode 100755 index c4efab7..0000000 --- a/stage4/cis-t1lib +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -# Applying patches (if any) -apply_patches ${1} - -cd ${LFS_TMP}/${1} -./configure \ - --prefix=/usr -make without_doc -make install -ldconfig - -exit $? diff --git a/stage4/cis-tk b/stage4/cis-tk deleted file mode 100755 index 251d2c5..0000000 --- a/stage4/cis-tk +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -set -o errexit - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -# Applying patches (if any) -apply_patches ${1} - -cd ${LFS_TMP}/${1} -cd unix -./configure \ - --prefix=/usr \ - --enable-threads \ - --mandir=/usr/share/man -make -sed -i \ - -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \ - -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ - -e "/SEARCH/s/=.*/=''/" \ - tkConfig.sh -make install -make install-private-headers -ln -v -sf wish8.5 /usr/bin/wish -ldconfig - -exit $? diff --git a/stage4/cis-windowmaker b/stage4/cis-windowmaker deleted file mode 100755 index 09af4f9..0000000 --- a/stage4/cis-windowmaker +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -aclocal -autoheader -autoconf -libtoolize --force --automake -automake -a --gnu --include-deps -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-gnustepdir=/usr/share/GNUstep \ - ${CONFIGURE_OPTS} -make -make install -ldconfig - -exit $? diff --git a/stage4/cis-xterm b/stage4/cis-xterm deleted file mode 100755 index 7165fe2..0000000 --- a/stage4/cis-xterm +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -sed -i '/v0/,+1s/new:/new:kb=^?:/' termcap -echo -e '\tkbs=\\177,' >>terminfo - -cd ${LFS_TMP}/${PACKAGE}-build -TERMINFO=/usr/lib/terminfo ../${PACKAGE}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-luit \ - --enable-wide-chars \ - --with-app-defaults=${XORG_PREFIX}/share/X11/app-defaults \ - ${CONFIGURE_OPTS} -make -make install -make install-ti -ldconfig - -exit $? diff --git a/stage4/configure-fonts b/stage4/configure-fonts index eab4954..9b0caf4 100755 --- a/stage4/configure-fonts +++ b/stage4/configure-fonts @@ -1,19 +1,15 @@ -#!/bin/sh -set -o errexit +#!/bin/bash -# First argument of this script is the package name. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # When all of the fonts have been installed, the system must be configured so # that Fontconfig can find the TrueType fonts since they are outside of the # default search path of /usr/share/fonts. install -v -d -m755 /usr/share/fonts -ln -svfT ${XORG_PREFIX}/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF -ln -svfT ${XORG_PREFIX}/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF +ln -svfT /usr/lib/X11/fonts/OTF /usr/share/fonts/X11-OTF +ln -svfT /usr/lib/X11/fonts/TTF /usr/share/fonts/X11-TTF X11_FONTS_DIR="/usr/share/fonts/X11" diff --git a/stage4/configure-xorg b/stage4/configure-xorg index 95bc530..d54a806 100755 --- a/stage4/configure-xorg +++ b/stage4/configure-xorg @@ -1,12 +1,8 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. +#!/bin/bash -# Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +source ../config/packages-list # Used by startx cat > /etc/skel/.xinitrc << "EOF" @@ -109,12 +105,13 @@ cat >> /etc/sysconfig/createfiles << "EOF" /tmp/.ICE-unix dir 1777 root root EOF -# Packages in Xorg store their configuration files in $XORG_PREFIX/lib/X11 +# Packages in Xorg store their configuration files in /usr/lib/X11 # by default. This is strictly against FHS guidelines. Correct the # installation /etc/X11 and create symlinks in the original location: mkdir -v -p /etc/X11 -for file in ${XORG_PREFIX}/{lib/X11/{xinit,xdm},share/X11/app-defaults}; do - if [ ! -h ${file} ]; then + +for file in /usr/{lib/X11/{xinit,xdm},share/X11/app-defaults}; do + if [ -f ${file} -a ! -h ${file} ]; then mv -v ${file} /etc/X11/ 2> /dev/null ln -svfT /etc/X11/$(basename $file) $file fi @@ -132,53 +129,11 @@ fi # Until then, you can create a symbolic link to satisfy the /usr/X11R6 # requirement so that you won't be inconvenienced with a package build # failure due to this known issue. -#ln -scfT ${XORG_PREFIX} /usr/X11R6 +#ln -scfT /usr /usr/X11R6 -cat > /etc/X11/xorg.conf << "EOF" +cat > /etc/X11/xorg.conf.template << "EOF" # xorg.conf # -# ********************************************************************** -# Files section. -# ********************************************************************** -Section "Files" - RgbPath "/usr/X11R6/lib/X11/rgb" - ModulePath "/usr/X11R6/lib/modules" # Module search path - FontPath "_HV_FONTS_PATH_/TrueType" - - # Standard XFree86 Fonts - FontPath "/usr/X11R6/lib/X11/fonts/TTF" - FontPath "/usr/X11R6/lib/X11/fonts/Type1" - FontPath "/usr/X11R6/lib/X11/fonts/misc/:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled" - FontPath "/usr/X11R6/lib/X11/fonts/local" - FontPath "/usr/X11R6/lib/X11/fonts/Speedo" - FontPath "/usr/X11R6/lib/X11/fonts/misc/" - FontPath "/usr/X11R6/lib/X11/fonts/100dpi/" - FontPath "/usr/X11R6/lib/X11/fonts/75dpi/" -EndSection - -# ********************************************************************** -# Dynamically loadable modules section. -# ********************************************************************** -Section "Module" - Load "dbe" # Double buffer extension - - # This loads the miscellaneous extensions module, and disables - # initialisation of the XFree86-DGA extension within that module. - SubSection "extmod" - Option "omit xfree86-dga" # don't initialise the DGA extension - EndSubSection - - # This loads the Type1 and FreeType font modules - Load "type1" - Load "speedo" - Load "freetype" - - Load "glx" - Load "dri" -EndSection - # ********************************************************************** # Input devices. # ********************************************************************** @@ -232,7 +187,7 @@ Section "Screen" DefaultColorDepth 24 Subsection "Display" Depth 24 - Modes "1024x768" "800x600" + Modes "1024x768" "800x600" ViewPort 0 0 EndSubsection EndSection @@ -249,11 +204,10 @@ EndSection EOF -# The ! character is the SED delimiter -sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/X11/xorg.conf -sed -i -e "s!_VIDEO_CARD_DRIVER_!${XF86_CARD_DRIVER}!g" /etc/X11/xorg.conf -sed -i -e "s!_XF86_KEYBOARD_LAYOUT_!${HV_XF86_KEYBOARD_LAYOUT}!g" /etc/X11/xorg.conf -sed -i -e "s!_XF86_KEYBOARD_VARIANT_!${HV_XF86_KEYBOARD_VARIANT}!g" /etc/X11/xorg.conf -sed -i -e "s!_XF86_KEYBOARD_OPTIONS_!${HV_XF86_KEYBOARD_OPTIONS}!g" /etc/X11/xorg.conf +sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/X11/xorg.conf.template +sed -i -e "s!_VIDEO_CARD_DRIVER_!${XORG_VIDEO_DRIVER}!g" /etc/X11/xorg.conf.template +sed -i -e "s!_XF86_KEYBOARD_LAYOUT_!${HV_XF86_KEYBOARD_LAYOUT}!g" /etc/X11/xorg.conf.template +sed -i -e "s!_XF86_KEYBOARD_VARIANT_!${HV_XF86_KEYBOARD_VARIANT}!g" /etc/X11/xorg.conf.template +sed -i -e "s!_XF86_KEYBOARD_OPTIONS_!${HV_XF86_KEYBOARD_OPTIONS}!g" /etc/X11/xorg.conf.template exit $? diff --git a/stage4/hv-install-1 b/stage4/hv-install-1 new file mode 100755 index 0000000..798e25d --- /dev/null +++ b/stage4/hv-install-1 @@ -0,0 +1,124 @@ +#!/bin/bash + +# Reading system configuration informations, functions and package versions. +source ../config/sysinfos +source ../functions +hvtrap_setup +source ../config/packages-list +source /etc/profile + +if [ "x${USER}" != "xroot" ]; then + echo "You must be the superuser to install hvlinux." + exit 1 +fi + +init_log_file + +LFS_PKG_DIR_ORIG=${LFS_PKG_DIR} + +export XORG_CONFIG="\ + --mandir=/usr/share/man \ + --localstatedir=/var" + +# Arg #1: module name and version +# Arg #2: subdirectory +# Arg #3: optional configure arguments +ipkg_xorg() +{ + local MODULE=${1} + local SUBDIR=${2} + shift 2 + local CONFIGURE_OPTS=${*} + + LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR} + ipkg ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS} + LFS_PKG_DIR=${LFS_PKG_DIR_ORIG} +} + +# Install all submodules in a module +# +# Arg #1: module name and version +# Arg #2: optional configure arguments +install_xorg_modules() +{ + local MODULE=${1} + shift + local CONFIGURE_OPTS=${*} + + local MODULE_NAME=$(get_pkg_name ${MODULE}) + + local MY_XORG_CONFIG + + for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do + SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')" + + ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS} + done +} + +install_xorg_modules ${XORG_UTIL} +install_xorg_modules ${XORG_PROTO} +ipkg_xorg ${LIBXAU} "lib" +ipkg_xorg ${LIBXDMCP} "lib" +ipkg ${LIBPTHREAD_STUBS} ${XORG_CONFIG} +ipkg ${XCB_PROTO} ${XORG_CONFIG} +ipkg ${GPERF} +ipkg ${XCB_UTIL} ${XORG_CONFIG} +install_xorg_modules ${XORG_LIB} +ipkg -m acnb ${LESSTIF} +ipkg_xorg ${XBITMAPS} "data" +ipkg ${LIBDRM} "--enable-udev" + +ipkg -m acnb ${TALLOC} +ipkg -m acnb ${MESALIB} +install_xorg_modules ${XORG_APP} +ipkg_xorg ${XCURSOR_THEMES} "data" +install_xorg_modules ${XORG_FONT} +rscr once "Configuring fonts" configure-fonts +ipkg ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg +ipkg_xorg ${LUIT} "app" +ipkg ${PIXMAN} +ipkg ${LIBFFI} +ipkg ${DBUS} +ipkg ${GLIB} +ipkg ${GOBJECT_INSTROSPECTION} "--disable-tests" +ipkg -m acnb ${DBUS_GLIB} \ + --disable-tests \ + --libexecdir=/usr/lib/dbus-1.0/dbus-1 +ipkg ${EGGDBUS} +ipkg ${POLKIT} +ipkg -m acnb ${CONSOLEKIT} \ + --libexecdir=/usr/lib/ConsoleKit \ + --localstatedir=/var \ + --enable-pam-module +ipkg ${POLICYKIT} +ipkg ${HAL} +ipkg ${HAL_INFO} + +ipkg_xorg ${XORG_SERVER} "xserver" "\ + --with-module-dir=/usr/lib/X11/modules \ + --with-xkb-output=/var/lib/xkb \ + --enable-install-setuid \ + --disable-config-hal" + +install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=/usr/lib/X11/modules + +if [ "x${XORG_VIDEO_DRIVER}" = "xnouveau" ]; then + ipkg ${XORG_VIDEO_NOUVEAU} ${XORG_CONFIG} --with-xorg-module-dir=/usr/lib/X11/modules +fi + +ipkg_xorg ${XDM} "app" + +rscr once "Configuring X.org" configure-xorg + +ipkg ${XTERM} +ipkg -m acnb ${T1LIB} +ipkg -s tk ${TK} + +# Re-installing python now that tk is present??? +ipkg ${PYTHON} "--enable-shared" + +ipkg -m acnb ${WINDOWMAKER} +ipkg ${WINDOWMAKER_EXTRA} + +exit $? diff --git a/stage4/ipkg.def b/stage4/ipkg.def new file mode 100644 index 0000000..135c8da --- /dev/null +++ b/stage4/ipkg.def @@ -0,0 +1,7 @@ +#!/bin/bash + +# Setting default configure options for all scripts +CONFIGURE_OPTS="\ + --prefix=/usr \ + --sysconfdir=/etc \ + ${CONFIGURE_OPTS}" diff --git a/stage4/packages-update b/stage4/packages-update index dd607d5..dac089b 100755 --- a/stage4/packages-update +++ b/stage4/packages-update @@ -5,14 +5,10 @@ USE_BLFS_PATCHES=1 USE_HV_PATCHES=1 # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions source ../functions-fpkg -source ../packages-list - -# Execute a return statement instead of exit, to be able to continue with -# downloading other packages -export RCMD_NO_EXIT=1 +source ../config/packages-list update_packages_init @@ -32,12 +28,19 @@ for module in ${XORG_MODULES_LIST}; do fpkg -d ${DEST_DIR} -e md5 ${module} ${BLFS_XORG_URL} if [ "${MOD_NAME}" = "driver" ]; then - # Remove unwanted drivers - for ext in wget md5; do - for excldrv in vmware newport xgixp geode; do - sed -i -e "/.*xf86-video-${excldrv}.*/d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext} + if [ -n "${XORG_VIDEO_DRIVER}" ]; then + # Install only specific driver + for ext in wget md5; do + sed -i -e "/xf86-video-${XORG_VIDEO_DRIVER}/!d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext} done - done + else + # Remove unwanted drivers + for ext in wget md5; do + for excldrv in vmware newport xgixp geode; do + sed -i -e "/.*xf86-video-${excldrv}.*/d" ${LFS_PKG_DIR}/${MOD_NAME}/${module}.${ext} + done + done + fi fi if [ "${MOD_NAME}" = "app" ]; then # Remove unneeded apps @@ -48,15 +51,18 @@ for module in ${XORG_MODULES_LIST}; do fi SUBMODS="$(grep -v '^#' ${LFS_PKG_DIR}/${MOD_NAME}/${module}.wget | sed 's!\.tar\.bz2$!!')" - + for submod in ${SUBMODS}; do fpkg_xorg ${submod} ${MOD_NAME} done pushd ${DEST_DIR} >> ${LFS_LOG_FILE} - md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE} - if [ $? -ne 0 ]; then - echo " md5sum error for ${module}" + # The "driver" md5 file maybe empty if the nouveau driver was selected + if cat ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 | grep "[0-9]" 1> /dev/null 2>&1; then + md5sum -c ${LFS_PKG_DIR}/${MOD_NAME}/${module}.md5 >> ${LFS_LOG_FILE} + if [ $? -ne 0 ]; then + echo " md5sum error for ${module}" + fi fi popd >> ${LFS_LOG_FILE} done @@ -66,35 +72,40 @@ fpkg_xorg ${LIBXDMCP} lib fpkg_sf ${LESSTIF} fpkg_xorg ${XBITMAPS} data fpkg ${LIBPTHREAD_STUBS} "http://xcb.freedesktop.org/dist" -fpkg ${LIBDRM} "http://dri.freedesktop.org/libdrm" +fpkg ${XCB_PROTO} "http://xcb.freedesktop.org/dist" +fpkg_gnu ${GPERF} +fpkg ${XCB_UTIL} "http://xcb.freedesktop.org/dist" + +fpkg_hv ${LIBDRM} +fpkg -e "tar.gz" ${TALLOC} "http://samba.org/ftp/talloc" fpkg -s "$(get_pkg_ver ${MESALIB})" ${MESALIB} ftp://ftp.freedesktop.org/pub/mesa fpkg_xorg ${XCURSOR_THEMES} data fpkg ${XKEYBOARD_CONFIG} "http://xlibs.freedesktop.org/xkbdesc" fpkg_xorg ${LUIT} app -fpkg ${PIXMAN} "http://cairographics.org/releases" -fpkg ${LIBFFI} "ftp://sourceware.org/pub/libffi" +fpkg -e "tar.gz" ${PIXMAN} "http://cairographics.org/releases" +fpkg -e "tar.gz" ${LIBFFI} "ftp://sourceware.org/pub/libffi" fpkg ${DBUS} "http://dbus.freedesktop.org/releases/dbus" fpkg_gnome ${GLIB} fpkg_gnome ${GOBJECT_INSTROSPECTION} -fpkg ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib" -fpkg ${EGGDBUS} "http://hal.freedesktop.org/releases" -fpkg ${POLKIT} "http://hal.freedesktop.org/releases" +fpkg -e "tar.gz" ${DBUS_GLIB} "http://dbus.freedesktop.org/releases/dbus-glib" +fpkg -e "tar.gz" ${EGGDBUS} "http://hal.freedesktop.org/releases" +fpkg -e "tar.gz" ${POLKIT} "http://hal.freedesktop.org/releases" fpkg ${CONSOLEKIT} "http://www.freedesktop.org/software/ConsoleKit/dist" -fpkg ${POLICYKIT} "http://hal.freedesktop.org/releases" +fpkg -e "tar.gz" ${POLICYKIT} "http://hal.freedesktop.org/releases" fpkg ${HAL} "http://hal.freedesktop.org/releases" fpkg ${HAL_INFO} "http://hal.freedesktop.org/releases" +fpkg_hv ${XORG_VIDEO_NOUVEAU} fpkg_xorg ${XORG_SERVER} xserver fpkg_xorg ${XDM} app -fpkg -e tgz ${XTERM} "ftp://invisible-island.net/xterm" +fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm" -fpkg ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics" +fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics" -fpkg_sf ${TK} tcl - -fpkg_gnu ${EMACS} -fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release" -fpkg ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release" +fpkg_sf ${TK} tcl +fpkg_gnu ${EMACS} +fpkg ${WINDOWMAKER} "http://windowmaker.info/pub/source/release" +fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release" exit $? diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib new file mode 100644 index 0000000..80b8017 --- /dev/null +++ b/stage4/pkg/MesaLib @@ -0,0 +1,18 @@ +#!/bin/bash + +hvconfig_pre() +{ + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --enable-motif \ + --enable-xcb \ + ${XORG_CONFIG}" + + # Mesa builds with debugging symbols. Remove the -g switch from both CFLAGS + # and CXXFLAGS with this command: + sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${LFS_TMP}/${PACKAGE}/configure + + # Revert effect of automatically applying blfs patch for xdemos (this patch + # causes a compilation bug with a missing GL/gl.h include) + sed 's@^\(SUBDIRS = src\) xdemos@\1@' -i ${LFS_TMP}/${PACKAGE}/Makefile +} diff --git a/stage4/pkg/PolicyKit b/stage4/pkg/PolicyKit new file mode 100644 index 0000000..c474b00 --- /dev/null +++ b/stage4/pkg/PolicyKit @@ -0,0 +1,13 @@ +#!/bin/bash + +hvconfig_pre() +{ + hv_groupadd -g 27 polkituser + hv_useradd -c Policy-Kit-Daemon-User -d /dev/null -u 27 \ + -g polkituser -s /bin/false polkituser + + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --libexecdir=/usr/lib/PolicyKit \ + --localstatedir=/var" +} diff --git a/stage4/pkg/WindowMaker b/stage4/pkg/WindowMaker new file mode 100644 index 0000000..e6d0632 --- /dev/null +++ b/stage4/pkg/WindowMaker @@ -0,0 +1,15 @@ +#!/bin/bash + +hvconfig_pre() +{ + cd ${LFS_TMP}/${PACKAGE} + aclocal + autoheader + autoconf + libtoolize --force --automake + automake -a --gnu --include-deps + + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --with-gnustepdir=/usr/share/GNUstep" +} diff --git a/stage4/pkg/dbus b/stage4/pkg/dbus new file mode 100644 index 0000000..f576ac7 --- /dev/null +++ b/stage4/pkg/dbus @@ -0,0 +1,27 @@ +#!/bin/bash + +hvconfig_pre() +{ + hv_groupadd -g 18 messagebus + hv_useradd -c D-BUS-Message-Daemon-User -d /dev/null \ + -u 18 -g messagebus -s /bin/false messagebus + + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --libexecdir=/usr/lib/dbus-1.0 \ + --localstatedir=/var" +} + +hvbuild_post() +{ + # Bootscript + install -v -m740 ${SCRDIR}/bootscripts/dbus /etc/rc.d/init.d + + # script-name start stop + bootscript_add_rc3 dbus 92 20 + + # Starting the session daemon here has the added bonus that it will exit + # when you log out of your GNOME session. If you wish to start the daemon + #here, use the following command instead of the one shown above: + ##echo "exec dbus-launch --exit-with-session gnome-session" >> ~/.xinitrc +} diff --git a/stage4/pkg/glib b/stage4/pkg/glib new file mode 100644 index 0000000..4d0b925 --- /dev/null +++ b/stage4/pkg/glib @@ -0,0 +1,19 @@ +#!/bin/bash + +hvconfig_pre() +{ + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --with-pcre=system" +} + +hvbuild_post() +{ + chmod -v 755 /usr/bin/gtester-report + + cat > /etc/profile.d/glib2-locale.sh << "EOF" +# Use the current locale charset for filenames +# in applications using GLib +export G_FILENAME_ENCODING=@locale +EOF +} diff --git a/stage4/pkg/hal b/stage4/pkg/hal new file mode 100644 index 0000000..78d38ac --- /dev/null +++ b/stage4/pkg/hal @@ -0,0 +1,81 @@ +#!/bin/bash + +hvconfig_pre() +{ + hv_groupadd -g 19 haldaemon + hv_useradd -c HAL-Daemon-User -d /dev/null -u 19 \ + -g haldaemon -s /bin/false haldaemon + + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --libexecdir=/usr/lib/hal \ + --localstatedir=/var \ + --with-udev-prefix=/etc" +} + +hvbuild_post() +{ + install -v -m755 -d /var/run/hald + + # Bootscript + install -v -m740 ${SCRDIR}/bootscripts/hald /etc/rc.d/init.d + + # script-name start stop + bootscript_add_rc3 hald 93 19 + + # The default setup for HAL is to allow only certain users to invoke + # methods such as Mount(). These are the root user and the user determined + # to be at the active console using pam_console. If you are not set up to + # use Linux-PAM-1.1.1 and pam_console, create a group that is allowed to + # invoke HAL methods with the following commands: + hv_groupadd -g 61 halusers + cat > /etc/dbus-1/system.d/halusers.conf << "EOF" + + + + + + + + + + + + +EOF + + # Now add the users you would like to the halusers group to use HAL: + usermod -a -G halusers ${REGUSER} + + # With the above configuration in place, authorized users now have the + # ability to unmount disk partitions mounted at non-standard locations such + # as /pub. If you'd like to restrict this policy to only drives which are + # considered removable or hotpluggable, add the following configuration + # file as the root user: + cat > /etc/hal/fdi/policy/no-fixed-drives.fdi << "EOF" + + + + + + + + + true + + + + +EOF + + # If the system-wide D-BUS daemon was running during the installation of + # HAL, ensure you stop and restart the D-BUS daemon before attempting to + # start the hald daemon. + #/etc/rc.d/init.d/dbus restart + + # Starting daemon + #/etc/rc.d/init.d/hal start +} diff --git a/stage4/pkg/lesstif b/stage4/pkg/lesstif new file mode 100644 index 0000000..78a0092 --- /dev/null +++ b/stage4/pkg/lesstif @@ -0,0 +1,33 @@ +#!/bin/bash + +hvconfig_pre() +{ + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --prefix=/usr \ + --sysconfdir=/etc/X11 \ + --disable-debug \ + --disable-build-tests \ + --enable-production \ + --with-xdnd \ + --x-includes=/usr/include \ + --x-libraries=/usr/lib" +} + +hvconfig_post() +{ + sed -i "s@libdir)/X11/mwm@sysconfdir)/mwm@" \ + ${LFS_TMP}/${PACKAGE}/clients/Motif-2.1/mwm/Makefile + + export rootdir=/usr/share/doc/${PACKAGE} +} + +hvbuild_post() +{ + unset rootdir + + # Applicatons that utilize Xorg libraries often, and incorrectly, expect to + # find configuration files in /usr/lib/X11. While still the root + # user, create a compatibility symlink with the following command: + ln -v -sf /etc/X11/mwm /usr/lib/X11 +} diff --git a/stage4/pkg/libdrm-git b/stage4/pkg/libdrm-git new file mode 100644 index 0000000..f61874f --- /dev/null +++ b/stage4/pkg/libdrm-git @@ -0,0 +1,13 @@ +#!/bin/bash + +hvconfig_pre() +{ + cd ${LFS_TMP}/${PACKAGE} + ./autogen.sh + + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --enable-nouveau-experimental-api \ + ${XORG_CONFIG}" +} + diff --git a/stage4/pkg/polkit b/stage4/pkg/polkit new file mode 100644 index 0000000..24b1776 --- /dev/null +++ b/stage4/pkg/polkit @@ -0,0 +1,15 @@ +#!/bin/bash + +hvconfig_pre() +{ + # It is a requirement to have a dedicated user and group for polkit to + # function correctly: + hv_groupadd -fg 27 polkituser + hv_useradd -c Policy-Kit-Daemon-User -d /dev/null -u 27 \ + -g polkituser -s /bin/false polkituser + + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --libexecdir=/usr/lib/polkit-1 \ + --localstatedir=/var" +} diff --git a/stage4/pkg/t1lib b/stage4/pkg/t1lib new file mode 100644 index 0000000..72211a8 --- /dev/null +++ b/stage4/pkg/t1lib @@ -0,0 +1,7 @@ +#!/bin/bash + +hvbuild() +{ + make without_doc + make install +} diff --git a/stage3/pkg/tcl b/stage4/pkg/tk similarity index 57% copy from stage3/pkg/tcl copy to stage4/pkg/tk index 83243b1..e91c15c 100644 --- a/stage3/pkg/tcl +++ b/stage4/pkg/tk @@ -16,16 +16,19 @@ hvbuild() # Removes references to the build directory and replaces them with saner # system-wide locations: sed -i \ - -e "s@^\(TCL_SRC_DIR='\).*@\1/usr/include'@" \ - -e "/TCL_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ + -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \ + -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \ -e "/SEARCH/s/=.*/=''/" \ - tclConfig.sh - + tkConfig.sh make install +} + +hvbuild_post() +{ make install-private-headers - # Special case for TCL - PKG_VER_BASE=$(echo ${PACKAGE} | sed "s!^tcl\([0-9]*\.[0-9]*\).*!\1!g") + # Special case for TK + PKG_VER_BASE=$(echo ${PACKAGE} | sed "s!^tk\([0-9]*\.[0-9]*\).*!\1!g") - ln -svfT tclsh${PKG_VER_BASE} /usr/bin/tclsh + ln -v -sf wish${PKG_VER_BASE} /usr/bin/wish } diff --git a/stage4/pkg/xf86-video-nouveau-git b/stage4/pkg/xf86-video-nouveau-git new file mode 100644 index 0000000..ba3dbef --- /dev/null +++ b/stage4/pkg/xf86-video-nouveau-git @@ -0,0 +1,8 @@ +#!/bin/bash + +hvconfig_pre() +{ + cd ${LFS_TMP}/${PACKAGE} + ./autogen.sh +} + diff --git a/stage4/pkg/xterm b/stage4/pkg/xterm new file mode 100644 index 0000000..29cf5cc --- /dev/null +++ b/stage4/pkg/xterm @@ -0,0 +1,25 @@ +#!/bin/bash + +hvconfig_pre() +{ + sed -i '/v0/,+1s/new:/new:kb=^?:/' ${LFS_TMP}/${PACKAGE}/termcap + echo -e '\tkbs=\\177,' >> ${LFS_TMP}/${PACKAGE}/terminfo + + export TERMINFO=/usr/lib/terminfo + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --enable-luit \ + --enable-wide-chars \ + --with-app-defaults=/usr/share/X11/app-defaults \ + ${XORG_CONFIG}" +} + +hvconfig_post() +{ + unset TERMINFO +} + +hvbuild_post() +{ + make install-ti +} diff --git a/stage4/stage.def b/stage4/stage.def new file mode 100644 index 0000000..45b3a56 --- /dev/null +++ b/stage4/stage.def @@ -0,0 +1,3 @@ +#!/bin/bash + +export LFS_STAGE=stage4 diff --git a/stage4/stage4-additions b/stage4/stage4-additions deleted file mode 100755 index 73591b1..0000000 --- a/stage4/stage4-additions +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -LFS_STAGE=stage4 - -export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}" -export LFS_LOG_DIR=/var/log/hvlinux-install/${LFS_STAGE} -export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log -export LFS_TMP=/tmp - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list -source /etc/profile - -if [ "x${USER}" != "xroot" ]; then - echo "You must be the superuser to install hvlinux." - exit 1 -fi - -init_log_file - -# Scripts directory -export SCRDIR=$(pwd) - -exit $? diff --git a/stage4/stage4-install b/stage4/stage4-install deleted file mode 100755 index 73f2c71..0000000 --- a/stage4/stage4-install +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/sh - -LFS_STAGE=stage4 - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list -source /etc/profile - -export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}" -export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE} -export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log -export LFS_TMP=${LFS}/tmp - -if [ "x${USER}" != "xroot" ]; then - echo "You must be the superuser to install hvlinux." - exit 1 -fi - -init_log_file - -# Scripts directory -export SCRDIR=$(pwd) - -export XORG_PREFIX=/usr -export XORG_CONFIG="\ - --mandir=${XORG_PREFIX}/share/man \ - --localstatedir=/var" - -LFS_PKG_DIR_ORIG=${LFS_PKG_DIR} - -# Arg #1: module name and version -# Arg #2: subdirectory -# Arg #3: optional configure arguments -ipkg_xorg() -{ - local MODULE=${1} - local SUBDIR=${2} - shift 2 - local CONFIGURE_OPTS=${*} - - LFS_PKG_DIR=${LFS_PKG_DIR_ORIG}/${SUBDIR} - ipkg_ac ${MODULE} ${XORG_CONFIG} ${CONFIGURE_OPTS} - LFS_PKG_DIR=${LFS_PKG_DIR_ORIG} -} - -# Install all submodules in a module -# -# Arg #1: module name and version -# Arg #2: optional configure arguments -install_xorg_modules() -{ - local MODULE=${1} - shift - local CONFIGURE_OPTS=${*} - - local MODULE_NAME=$(get_pkg_name ${MODULE}) - - local MY_XORG_CONFIG - - for package in $(grep -v '^#' ${LFS_PKG_DIR}/${MODULE_NAME}/${MODULE}.wget); do - SUBMOD="$(echo ${package} | sed 's!\.tar\.bz2$!!')" - - # Special configure options for specific packages - case ${SUBMOD} in - libXfont-[0-9]* ) - MY_XORG_CONFIG="--disable-devel-docs" - ;; - libX11-[0-9]* ) - MY_XORG_CONFIG="--without-xcb" - ;; - libXt-[0-9]* ) - MY_XORG_CONFIG="--with-appdefaultdir=/etc/X11/app-defaults" - ;; - xinit-[0-9]* ) - MY_XORG_CONFIG="--with-xinitdir=/etc/X11/app-defautls" - ;; - esac - - ipkg_xorg ${SUBMOD} ${MODULE_NAME} ${MY_XORG_CONFIG} ${CONFIGURE_OPTS} - done -} - -install_xorg_modules ${XORG_PROTO} -install_xorg_modules ${XORG_UTIL} -ipkg_xorg ${LIBXAU} "lib" -ipkg_xorg ${LIBXDMCP} "lib" -install_xorg_modules ${XORG_LIB} -ipkg_cust ${LESSTIF} cis-lesstif \ - --sysconfdir=/etc/X11 \ - --disable-debug \ - --disable-build-tests \ - --enable-production \ - --with-xdnd \ - --x-includes=$XORG_PREFIX/include \ - --x-libraries=$XORG_PREFIX/lib -ipkg_xorg ${XBITMAPS} "data" -ipkg_ac ${LIBPTHREAD_STUBS} -ipkg_ac ${LIBDRM} --enable-udev -ipkg_cust ${MESALIB} cis-mesalib --enable-motif -install_xorg_modules ${XORG_APP} -ipkg_xorg ${XCURSOR_THEMES} "data" -install_xorg_modules ${XORG_FONT} -rscr once "Configuring fonts" configure-fonts -ipkg_ac ${XKEYBOARD_CONFIG} ${XORG_CONFIG} --with-xkb-rules-symlink=xorg -ipkg_xorg ${LUIT} "app" -ipkg_ac ${PIXMAN} -ipkg_ac ${LIBFFI} -ipkg_cust ${DBUS} cis-dbus -ipkg_cust ${GLIB} cis-glib --with-pcre=system -ipkg_ac ${GOBJECT_INSTROSPECTION} -ipkg_ac ${DBUS_GLIB} \ - --disable-tests \ - --disable-dependency-tracking \ - --libexecdir=/usr/lib/dbus-1.0/dbus-1 -ipkg_ac ${EGGDBUS} -ipkg_cust ${POLKIT} cis-polkit -ipkg_ac_nb ${CONSOLEKIT} \ - --libexecdir=/usr/lib/ConsoleKit \ - --localstatedir=/var \ - --enable-pam-module -ipkg_cust ${POLICYKIT} cis-policykit -ipkg_cust ${HAL} cis-hal -ipkg_ac ${HAL_INFO} - -ipkg_xorg ${XORG_SERVER} "xserver" "\ - --with-module-dir=${XORG_PREFIX}/lib/X11/modules \ - --with-xkb-output=/var/lib/xkb \ - --enable-install-setuid \ - --disable-config-hal" - -# newport, vmware, and xgixp drivers cause Xorg -configure to hang -# To fix this problem, comment out these drivers in both driver-7.5-2.md5 and driver-7.5-2.wget. -install_xorg_modules ${XORG_DRIVER} --with-xorg-module-dir=${XORG_PREFIX}/lib/X11/modules - -ipkg_xorg ${XDM} "app" - -rscr once "Configuring X.org" configure-xorg - -ipkg_cust ${XTERM} cis-xterm ${XORG_CONFIG} - -ipkg_cust ${T1LIB} cis-t1lib - -ipkg_cust ${TK} cis-tk - -# Re-installing python now that tk is present??? -ipkg_ac ${PYTHON} "--enable-shared" - -ipkg_cust ${WINDOWMAKER} cis-windowmaker -ipkg_ac ${WINDOWMAKER_EXTRA} - -#source /etc/profile - -#rscr mult "Performing post-install" cis-post-install - -exit $? diff --git a/stage5/INSTALL b/stage5/INSTALL index 52383c5..9c5ef84 100644 --- a/stage5/INSTALL +++ b/stage5/INSTALL @@ -1,5 +1,7 @@ +stage5: Installing software after X-Windows + +Installation +------------ -Installation instructions -------------------------- - -1. ./stage4-install +1. Type: + $> sudo make diff --git a/stage5/Makefile b/stage5/Makefile new file mode 100644 index 0000000..b5595fc --- /dev/null +++ b/stage5/Makefile @@ -0,0 +1,21 @@ +# Makefile for hvlinux + +# Idées pour future targets: +# clean +# strip +# compress -> compressdoc (à partir du stage2) +# dep +# list -> list installed packages and versions + +.PHONY: get test + +all: + @./hv-install-1 + +# Fetch packages from network +get: + @./packages-update + +# Test integrity of packages +test: + @./packages-update test diff --git a/stage5/install-1 b/stage5/hv-install-1 similarity index 98% rename from stage5/install-1 rename to stage5/hv-install-1 index cd267f7..494716b 100755 --- a/stage5/install-1 +++ b/stage5/hv-install-1 @@ -20,9 +20,6 @@ fi init_log_file -# Scripts directory -export SCRDIR=$(pwd) - if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then # Gtk ipkg_ac ${LIBSIGCPP} @@ -162,11 +159,10 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the ipkg_ac ${ALSA_PLUGINS} # Depends on pulseaudio ipkg_ac ${VORBIS_TOOLS} - + # Audio applications ipkg_ac_nb ${GRIP} "--disable-id3" ipkg_ac_nb ${CDRDAO} - ipkg_ac ${SWEEP} "--enable-pulseaudio" ipkg_ac ${EASYTAG} ipkg_ac_nb ${LILYPOND} diff --git a/stage5/ipkg.def b/stage5/ipkg.def new file mode 100644 index 0000000..135c8da --- /dev/null +++ b/stage5/ipkg.def @@ -0,0 +1,7 @@ +#!/bin/bash + +# Setting default configure options for all scripts +CONFIGURE_OPTS="\ + --prefix=/usr \ + --sysconfdir=/etc \ + ${CONFIGURE_OPTS}" diff --git a/stage5/resources/emacs/buffer-cycle.el b/stage5/misc/emacs/buffer-cycle.el similarity index 100% rename from stage5/resources/emacs/buffer-cycle.el rename to stage5/misc/emacs/buffer-cycle.el diff --git a/stage5/resources/emacs/emacsrc b/stage5/misc/emacs/emacsrc similarity index 100% rename from stage5/resources/emacs/emacsrc rename to stage5/misc/emacs/emacsrc diff --git a/stage5/resources/mail-files.sh b/stage5/misc/mail-files.sh similarity index 100% rename from stage5/resources/mail-files.sh rename to stage5/misc/mail-files.sh diff --git a/stage5/resources/mount.fusedvdfs b/stage5/misc/mount.fusedvdfs similarity index 100% rename from stage5/resources/mount.fusedvdfs rename to stage5/misc/mount.fusedvdfs diff --git a/stage5/packages-update b/stage5/packages-update index 7532cdf..ec570d4 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -138,7 +138,6 @@ fpkg ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis" fpkg_sf ${GRIP} fpkg_sf ${CDRDAO} -fpkg_hv ${SWEEP} fpkg_sf ${EASYTAG} fpkg ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})" diff --git a/stage5/pkg/dvdfs b/stage5/pkg/dvdfs index ef92029..b7829f0 100644 --- a/stage5/pkg/dvdfs +++ b/stage5/pkg/dvdfs @@ -21,6 +21,6 @@ make make install # Mount script -install -v -m755 ${SCRDIR}/resources/mount.fusedvdfs /sbin +install -v -m755 ${SCRDIR}/misc/mount.fusedvdfs /sbin exit $? diff --git a/stage5/pkg/emacs b/stage5/pkg/emacs index 65038df..7d39c59 100644 --- a/stage5/pkg/emacs +++ b/stage5/pkg/emacs @@ -20,13 +20,13 @@ make bootstrap make install ldconfig -install -m644 ${SCRDIR}/resources/emacs/emacsrc /etc/skel/.emacs -install -m644 ${SCRDIR}/resources/emacs/emacsrc /root/.emacs +install -m644 ${SCRDIR}/misc/emacs/emacsrc /etc/skel/.emacs +install -m644 ${SCRDIR}/misc/emacs/emacsrc /root/.emacs LOCAL_SITE_LIST=/usr/local/share/emacs/site-lisp install -v -m644 -d ${LOCAL_SITE_LIST} -install -m644 ${SCRDIR}/resources/emacs/buffer-cycle.el ${LOCAL_SITE_LIST} +install -m644 ${SCRDIR}/misc/emacs/buffer-cycle.el ${LOCAL_SITE_LIST} # Set Emacs as default editor sed -i -e "s!^\(EDITOR=\).*!\1emacs!" /etc/profile diff --git a/stage5/pkg/sendmail b/stage5/pkg/sendmail index c503ba1..3009964 100644 --- a/stage5/pkg/sendmail +++ b/stage5/pkg/sendmail @@ -245,7 +245,7 @@ EOF sed -i -e "s!_DOMAIN_!${DOMAIN}!g" /usr/local/bin/mail-if-fail chmod 755 /usr/local/bin/mail-if-fail - cp ${SCRDIR}/resources/mail-files.sh /usr/local/bin + cp ${SCRDIR}/misc/mail-files.sh /usr/local/bin chmod 755 /usr/local/bin/mail-files.sh # Executing configure script. diff --git a/stage5/stage.def b/stage5/stage.def new file mode 100644 index 0000000..cf17b3f --- /dev/null +++ b/stage5/stage.def @@ -0,0 +1,3 @@ +#!/bin/bash + +export LFS_STAGE=stage3 diff --git a/stage6/INSTALL b/stage6/INSTALL new file mode 100644 index 0000000..24e40da --- /dev/null +++ b/stage6/INSTALL @@ -0,0 +1,7 @@ +stage6: Installing Gnome + +Installation +------------ + +1. Type: + $> sudo make diff --git a/stage6/Makefile b/stage6/Makefile new file mode 100644 index 0000000..b5595fc --- /dev/null +++ b/stage6/Makefile @@ -0,0 +1,21 @@ +# Makefile for hvlinux + +# Idées pour future targets: +# clean +# strip +# compress -> compressdoc (à partir du stage2) +# dep +# list -> list installed packages and versions + +.PHONY: get test + +all: + @./hv-install-1 + +# Fetch packages from network +get: + @./packages-update + +# Test integrity of packages +test: + @./packages-update test diff --git a/stage6/stage6-install b/stage6/hv-install-1 similarity index 63% rename from stage6/stage6-install rename to stage6/hv-install-1 index 532fd67..091286f 100755 --- a/stage6/stage6-install +++ b/stage6/hv-install-1 @@ -1,14 +1,10 @@ -#!/bin/sh - -export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage4" -export LFS_LOG_DIR=/var/log/hvlinux-install/stage4 -export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log -export LFS_TMP=/tmp +#!/bin/bash # Reading system configuration informations, functions and package versions. -source ../sysinfos +source ../config/sysinfos source ../functions -source ../packages-list +hvtrap_setup +source ../config/packages-list source /etc/profile if [ "x${USER}" != "xroot" ]; then @@ -25,39 +21,39 @@ init_log_file # Gnome 2 core packages ##ipkg_gnome ${ORBIT2} ipkg_gnome ${LIBBONOBO} -###ipkg_cust ${GCONF} cis-gconf +###ipkg ${GCONF} cis-gconf ipkg_gnome ${GNOME_MIME_DATA} -####ipkg_cust ${GNOME_VFS} cis-gnome-nb +####ipkg ${GNOME_VFS} cis-gnome-nb ####ipkg_gnome ${GNOME_VFS_MONIKERS} ipkg_gnome ${LIBGNOME} ipkg_gnome ${LIBGNOMECANVAS} ipkg_gnome ${LIBBONOBOUI} -ipkg_ac ${GNOME_ICON_THEME} +ipkg ${GNOME_ICON_THEME} ##ipkg_gnome ${GNOME_KEYRING} ipkg_gnome ${LIBGNOMEUI} -ipkg_ac ${GNOME_THEMES} -ipkg_ac_nb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/opt/${GNOME2_VER}/share/omf" +ipkg ${GNOME_THEMES} +ipkg -m acnb ${SCROLLKEEPER} "--localstatedir=/var --disable-static --with-omfdirs=/usr/share/omf:/opt/${GNOME2_VER}/share/omf" ipkg_gnome ${GNOME_DOC_UTILS} ipkg_gnome ${GNOME_DESKTOP} ipkg_gnome ${GNOME_BACKGROUNDS} ipkg_gnome ${GNOME_MENUS} ipkg_gnome ${GNOME_PANEL} -ipkg_ac ${GSTREAMER} -ipkg_ac ${GST_PLUGINS_BASE} -ipkg_ac ${GST_PLUGINS_GOOD} -ipkg_ac ${GST_PLUGINS_BAD} -ipkg_ac ${GST_PLUGINS_UGLY} -ipkg_ac ${GST_FFMPEG} -ipkg_ac ${VTE} "--libexecdir=/usr/sbin --disable-gtk-doc" +ipkg ${GSTREAMER} +ipkg ${GST_PLUGINS_BASE} +ipkg ${GST_PLUGINS_GOOD} +ipkg ${GST_PLUGINS_BAD} +ipkg ${GST_PLUGINS_UGLY} +ipkg ${GST_FFMPEG} +ipkg ${VTE} "--libexecdir=/usr/sbin --disable-gtk-doc" ipkg_gnome ${GNOME_TERMINAL} ipkg_gnome ${LIBGTOP} ipkg_gnome ${LIBGNOMEKBD} ipkg_gnome ${LIBGAIL_GNOME} -ipkg_cust ${GNOME_APPLETS} cis-gnome-applets +ipkg ${GNOME_APPLETS} ipkg_gnome ${EEL} ipkg_gnome ${NAUTILUS} ipkg_gnome ${YELP} -ipkg_cust ${METACITY} cis-metacity +ipkg ${METACITY} ipkg_gnome ${GNOME_CONTROL_CENTER} ipkg_gnome ${GNOME_SESSION} @@ -71,14 +67,14 @@ action_checkbox "Updating the MIME-type application database" update-desktop-dat ipkg_gnome ${GTKHTML} ipkg_gnome ${EVOLUTION_DATA_SERVER} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr" ipkg_gnome ${GTKSOURCEVIEW} -ipkg_cust ${SYSTEM_TOOLS_BACKENDS} cis-gnome-nobuild -ipkg_cust ${GNOME_AUDIO} cis-gnome-audio +ipkg -m gnomenb ${SYSTEM_TOOLS_BACKENDS} +ipkg ${GNOME_AUDIO} # Gnome 2 additional packages - Utilities ipkg_gnome ${GEDIT} "--disable-spell" ipkg_gnome ${EOG} -ipkg_ac ${LIBSPECTRE} +ipkg ${LIBSPECTRE} ipkg_gnome ${EVINCE} ipkg_gnome ${FILE_ROLLER} ipkg_gnome ${GCONF_EDITOR} @@ -87,7 +83,7 @@ ipkg_gnome ${GNOME_SYSTEM_MONITOR} ipkg_gnome ${NAUTILUS_CD_BURNER} ipkg_gnome ${GNOME_MEDIA} ipkg_gnome ${GNOME_NETSTATUS} -ipkg_cust ${GCALCTOOL} cis-gnome-nobuild +ipkg -m gnomenb ${GCALCTOOL} ipkg_gnome ${GUCHARMAP} ipkg_gnome ${ZENITY} ipkg_gnome ${GNOME_KEYRING_MANAGER} @@ -95,20 +91,20 @@ ipkg_gnome ${GNOME_KEYRING_MANAGER} # Needs hal, which needs D-BUS... ipkg_gnome ${GNOME_VOLUME_MANAGER} -ipkg_cust ${LIBMUSICBRAINZ} cis-libmusicbrainz +ipkg ${LIBMUSICBRAINZ} ipkg_gnome ${GNOME_SOUND_JUICER} ipkg_gnome ${GNOME_TOTEM} -ipkg_cust ${GDM} cis-gdm -ipkg_ac ${LIBNOTIFY} -ipkg_cust ${GNOME_MOUNT} cis-gnome-nobuild +ipkg ${GDM} +ipkg ${LIBNOTIFY} +ipkg -m gnomenb ${GNOME_MOUNT} -ipkg_ac ${RHYTHMBOX} "--disable-python" +ipkg ${RHYTHMBOX} "--disable-python" -ipkg_ac ${LIBGSF} -ipkg_ac_nb ${GOFFICE} -ipkg_cust ${GNUMERIC} cis-gnumeric -ipkg_ac ${WV} -ipkg_ac ${ABIWORD} "--disable-spellcheck" +ipkg ${LIBGSF} +ipkg -m acnb ${GOFFICE} +ipkg ${GNUMERIC} +ipkg ${WV} +ipkg ${ABIWORD} "--disable-spellcheck" ipkg_gnome ${EVOLUTION} "--with-nss-includes=/usr/include/nss --with-nspr-includes=/usr/include/nspr --with-openldap=yes --with-krb5=/usr" ipkg_gnome ${EVOLUTION_EXCHANGE} diff --git a/stage6/ipkg.def b/stage6/ipkg.def new file mode 100644 index 0000000..135c8da --- /dev/null +++ b/stage6/ipkg.def @@ -0,0 +1,7 @@ +#!/bin/bash + +# Setting default configure options for all scripts +CONFIGURE_OPTS="\ + --prefix=/usr \ + --sysconfdir=/etc \ + ${CONFIGURE_OPTS}" diff --git a/stage6/packages-update b/stage6/packages-update old mode 100644 new mode 100755 diff --git a/stage6/cis-gal b/stage6/pkg/gal old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-gal rename to stage6/pkg/gal diff --git a/stage6/cis-gdm b/stage6/pkg/gdm old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-gdm rename to stage6/pkg/gdm diff --git a/stage6/cis-gnome-applets b/stage6/pkg/gnome-applets old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-gnome-applets rename to stage6/pkg/gnome-applets diff --git a/stage6/cis-gnome-audio b/stage6/pkg/gnome-audio old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-gnome-audio rename to stage6/pkg/gnome-audio diff --git a/stage6/cis-gnome-media b/stage6/pkg/gnome-media old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-gnome-media rename to stage6/pkg/gnome-media diff --git a/stage6/cis-gnumeric b/stage6/pkg/gnumeric old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-gnumeric rename to stage6/pkg/gnumeric diff --git a/stage6/cis-libmusicbrainz b/stage6/pkg/libmusicbrainz old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-libmusicbrainz rename to stage6/pkg/libmusicbrainz diff --git a/stage6/cis-metacity b/stage6/pkg/metacity old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-metacity rename to stage6/pkg/metacity diff --git a/stage6/cis-nautilus b/stage6/pkg/nautilus old mode 100755 new mode 100644 similarity index 100% rename from stage6/cis-nautilus rename to stage6/pkg/nautilus diff --git a/stage6/stage.def b/stage6/stage.def new file mode 100644 index 0000000..e8c79da --- /dev/null +++ b/stage6/stage.def @@ -0,0 +1,3 @@ +#!/bin/bash + +export LFS_STAGE=stage6 diff --git a/stage6/stage6-additions b/stage6/stage6-additions deleted file mode 100755 index b8d9ad4..0000000 --- a/stage6/stage6-additions +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -export LFS_PKG_DIR="$(dirname $(pwd))/packages/stage4" -export LFS_LOG_DIR=/var/log/hvlinux-install/stage4 -export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log -export LFS_TMP=/tmp - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list -source /etc/profile - -if [ "x${USER}" != "xroot" ]; then - echo "You must be the superuser to install hvlinux." - exit 1 -fi - -init_log_file - -ipkg_gnome ${LIBGNOMECUPS} -ipkg_gnome ${EVINCE} - -exit $? -- 2.20.1