diff options
18 files changed, 85 insertions, 133 deletions
@@ -32,16 +32,21 @@ or beta testing. The same applies to extra and extra-testing. linhes-dev contains the tools and scripts for a working development environment, but it is not a working development by itself. The script setup-env.sh will do all the work in creating a working development -environment. The script will download and install the required packages +environment. Get the script at: + http://linhes.org/repo/setup_env.sh +The script will download and install the required packages (from the current stable release) into a directory called build_root and create a script that can be used to enter the chroot. Because LinHES will support multiple architectures, setup-env.sh -requires an argument telling it which architecture to work with. Currently -i686 is the only working option, so that is the one I recommend you use. -For example running "setup-env.sh i686" will create a working i686 LinHES -development environment named build_root.i686. Setup-env.sh also creates an -empty directory structure called pkg_repo, this is used by kmsync.sh -(which will be discussed later). +requires arguments telling it which architecture to work with as well +as which repository (stable or testing) you'd like to develop on. +Currently i686 is the only working architecture option, so that is the +one I recommend you use. + For example running "setup-env.sh i686 testing" will create a +working i686 LinHES development environment named build_root.i686 using +the testing repos. setup-env.sh also creates an empty directory +structure called pkg_repo, this is used by kmsync.sh (which will be +discussed later). To enter the build root run (as root) the newly created script called enter_build_root.i686. The script will take care of the following things: diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks index e5311fd..21c6359 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks @@ -232,3 +232,5 @@ larch-live mkinitcpio-busybox windowmaker-crm-git xcursor-themes +ceton +ceton-scripts diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks index 6791d8f..21c6359 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks @@ -209,7 +209,7 @@ ntfs-3g joyutils ffmpeg-svn #myth2ipod -myt2xvid3 +#myt2xvid3 #--unsupported and doesn't work #mediaserv #---Firewire @@ -226,8 +226,11 @@ mplayer-wrapper #atl1e linux-firmware +hd3000firmware larch-live mkinitcpio-busybox windowmaker-crm-git xcursor-themes +ceton +ceton-scripts diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks index 6bf3c73..6ea3023 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/cachepacks @@ -2,6 +2,8 @@ mythdb-initial nvidia nvidia-utils vdpauinfo +nvidia-173xx +nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils #vdpinfo-96xx @@ -55,5 +57,5 @@ startup-notification xulrunner #mythmovies #myth2ipod -myt2xvid3 +#myt2xvid3 #mediaserv diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options index d71f787..de6faee 100644 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/pacman.conf.options @@ -19,7 +19,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled -Architecture = auto +Architecture = i686 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh index e635c0e..4b91959 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh @@ -1,6 +1,7 @@ #!/bin/bash echo "larch5" > /etc/hostname useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users +/usr/sbin/groupadd -g 20 utmp cp -rvpf /.post_process/home/mythtv /home/ cp -rvpf /.post_process/home/mythtv/.fluxbox /root cp -vpf /.post_process/nouveau.conf /etc/modprobe.d/nouveau.conf diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf index 7ab2209..391c913 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf @@ -66,47 +66,6 @@ HOSTNAME=`cat /etc/hostname` #The following is only used on the install. After the first boot everything is set from /etc/net. - -# -# Use 'ifconfig -a' or 'ls /sys/class/net/' to see all available -# interfaces. -# -# Interfaces to start at boot-up (in this order) -# Declare each interface then list in INTERFACES -# - prefix an entry in INTERFACES with a ! to disable it -# - no hyphens in your interface names - Bash doesn't like it -# -# Note: to use DHCP, set your interface to be "dhcp" (eth0="dhcp") -# -lo="lo 127.0.0.1" -#eth0="dhcp" -INTERFACES=(lo ) -# -# Routes to start at boot-up (in this order) -# Declare each route then list in ROUTES -# - prefix an entry in ROUTES with a ! to disable it -# -gateway="default gw 192.168.0.1" -ROUTES=(!gateway) -# -# Enable these network profiles at boot-up. These are only useful -# if you happen to need multiple network configurations (ie, laptop users) -# - set to 'menu' to present a menu during boot-up (dialog package required) -# - prefix an entry with a ! to disable it -# -# Network profiles are found in /etc/network-profiles -# -#NET_PROFILES=(main) - -# -# ----------------------------------------------------------------------- -# DAEMONS -# ----------------------------------------------------------------------- -# -# Daemons to start at boot-up (in this order) -# - prefix a daemon with a ! to disable it -# - prefix a daemon with a @ to start it up in the background -# #DAEMONS=(syslog-ng network netfs crond) -DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia network !mysqld !dbus !avahi-daemon) +DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld !dbus !avahi-daemon) # End of file diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks index 1fa97d7..0f79938 100644 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks @@ -16,7 +16,7 @@ sysinit_premount_larch() { # Add disk partitions to /etc/fstab x10d_fstab } -add_hook sysinit_premount sysinit_premount_larch +#add_hook sysinit_premount sysinit_premount_larch sysinit_end_larch() { diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks index e5311fd..21c6359 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks @@ -232,3 +232,5 @@ larch-live mkinitcpio-busybox windowmaker-crm-git xcursor-themes +ceton +ceton-scripts diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks index 6791d8f..21c6359 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks @@ -209,7 +209,7 @@ ntfs-3g joyutils ffmpeg-svn #myth2ipod -myt2xvid3 +#myt2xvid3 #--unsupported and doesn't work #mediaserv #---Firewire @@ -226,8 +226,11 @@ mplayer-wrapper #atl1e linux-firmware +hd3000firmware larch-live mkinitcpio-busybox windowmaker-crm-git xcursor-themes +ceton +ceton-scripts diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks index 6bf3c73..6ea3023 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks +++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/cachepacks @@ -2,6 +2,8 @@ mythdb-initial nvidia nvidia-utils vdpauinfo +nvidia-173xx +nvidia-173xx-utils nvidia-96xx nvidia-96xx-utils #vdpinfo-96xx @@ -55,5 +57,5 @@ startup-notification xulrunner #mythmovies #myth2ipod -myt2xvid3 +#myt2xvid3 #mediaserv diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options index d71f787..de6faee 100644 --- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options +++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/pacman.conf.options @@ -19,7 +19,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled -Architecture = auto +Architecture = i686 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh index e635c0e..4b91959 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh @@ -1,6 +1,7 @@ #!/bin/bash echo "larch5" > /etc/hostname useradd -m -s /bin/bash mythtv -G audio,video,optical,storage,users +/usr/sbin/groupadd -g 20 utmp cp -rvpf /.post_process/home/mythtv /home/ cp -rvpf /.post_process/home/mythtv/.fluxbox /root cp -vpf /.post_process/nouveau.conf /etc/modprobe.d/nouveau.conf diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf index 7ab2209..391c913 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf +++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf @@ -66,47 +66,6 @@ HOSTNAME=`cat /etc/hostname` #The following is only used on the install. After the first boot everything is set from /etc/net. - -# -# Use 'ifconfig -a' or 'ls /sys/class/net/' to see all available -# interfaces. -# -# Interfaces to start at boot-up (in this order) -# Declare each interface then list in INTERFACES -# - prefix an entry in INTERFACES with a ! to disable it -# - no hyphens in your interface names - Bash doesn't like it -# -# Note: to use DHCP, set your interface to be "dhcp" (eth0="dhcp") -# -lo="lo 127.0.0.1" -#eth0="dhcp" -INTERFACES=(lo ) -# -# Routes to start at boot-up (in this order) -# Declare each route then list in ROUTES -# - prefix an entry in ROUTES with a ! to disable it -# -gateway="default gw 192.168.0.1" -ROUTES=(!gateway) -# -# Enable these network profiles at boot-up. These are only useful -# if you happen to need multiple network configurations (ie, laptop users) -# - set to 'menu' to present a menu during boot-up (dialog package required) -# - prefix an entry with a ! to disable it -# -# Network profiles are found in /etc/network-profiles -# -#NET_PROFILES=(main) - -# -# ----------------------------------------------------------------------- -# DAEMONS -# ----------------------------------------------------------------------- -# -# Daemons to start at boot-up (in this order) -# - prefix a daemon with a ! to disable it -# - prefix a daemon with a @ to start it up in the background -# #DAEMONS=(syslog-ng network netfs crond) -DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia network !mysqld !dbus !avahi-daemon) +DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld !dbus !avahi-daemon) # End of file diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks index 1fa97d7..0f79938 100644 --- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks +++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/rc.d/functions.d/larch-hooks @@ -16,7 +16,7 @@ sysinit_premount_larch() { # Add disk partitions to /etc/fstab x10d_fstab } -add_hook sysinit_premount sysinit_premount_larch +#add_hook sysinit_premount sysinit_premount_larch sysinit_end_larch() { diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks index e5311fd..21c6359 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks +++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks @@ -232,3 +232,5 @@ larch-live mkinitcpio-busybox windowmaker-crm-git xcursor-themes +ceton +ceton-scripts diff --git a/templates/makepkg.conf b/templates/makepkg.conf index 7c97813..5526f48 100644 --- a/templates/makepkg.conf +++ b/templates/makepkg.conf @@ -96,6 +96,7 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) PKGDEST=/data/pkg_repo/packages SRCDEST=/data/pkg_repo/sources +SRCPKGDEST=/data/pkg_repo/src_packages PACKAGER="LinHESDev@knoppmyth.net" ######################################################################### diff --git a/templates/pacman.conf.chroot b/templates/pacman.conf.chroot index 66ef97d..58857f9 100644 --- a/templates/pacman.conf.chroot +++ b/templates/pacman.conf.chroot @@ -15,25 +15,59 @@ # GENERAL OPTIONS # [options] -LogFile = /var/log/pacman.log -NoUpgrade = etc/passwd etc/group etc/shadow etc/sudoers -NoUpgrade = etc/fstab etc/raidtab etc/ld.so.conf -NoUpgrade = etc/rc.conf etc/rc.local -NoUpgrade = etc/modprobe.conf etc/modules.conf -NoUpgrade = etc/lilo.conf boot/grub/menu.lst +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +CacheDir = /data/var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = i686 + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = NoUpgrade = data/srv/hobbit/etc/bb-hosts NoUpgrade = etc/func/minion.conf +#NoExtract = -HoldPkg = pacman glibc -CacheDir = /tmp/dev-pkgcache -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace # # REPOSITORIES # - can be defined here or included from another file -# - pacman will search repositories in the order defined here. +# - pacman will search repositories in the order defined here # - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. # + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + #[core] #Server = http://knoppmyth.net/repo/REPLACEME/$repo @@ -48,27 +82,3 @@ Server = http://knoppmyth.net/repo/REPLACEME/$repo [extra-testing] Server = http://knoppmyth.net/repo/REPLACEME/$repo - - - - - - -########################ARCH DEFAULTS############# -#[ARCH-core] -# Add your preferred servers here, they will be used first -#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 - -#[ARCH-extra] -# Add your preferred servers here, they will be used first -#Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686 - -#[community] -# Add your preferred servers here, they will be used first -#Include = /etc/pacman.d/mirrorlist - -# Unstable is disabled by default. To enable, uncomment the following -# two lines. You can add preferred servers immediately after the header, -# and they will be used before the default mirrors. -#[unstable] -#Include = /etc/pacman.d/mirrorlist |