From 8c9cc671d8c62dbc83ca0071b7396dbef46acd1f Mon Sep 17 00:00:00 2001 From: mihanson Date: Mon, 29 Aug 2011 15:54:49 -0700 Subject: linhes_dev: README, makepkg.conf and pacman.conf.chroot fixes --- README | 19 +++++++---- templates/makepkg.conf | 1 + templates/pacman.conf.chroot | 81 +++++++++++++++++++++++++------------------- 3 files changed, 60 insertions(+), 41 deletions(-) diff --git a/README b/README index 2f550fb..8905b41 100755 --- a/README +++ b/README @@ -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/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..53cfc2d 100644 --- a/templates/pacman.conf.chroot +++ b/templates/pacman.conf.chroot @@ -15,25 +15,62 @@ # 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 +85,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 -- cgit v0.12 From 204cf5d4d15dd60a24f5f741dd8c76294e08be83 Mon Sep 17 00:00:00 2001 From: Michael Hanson Date: Mon, 29 Aug 2011 15:59:08 -0700 Subject: linhes_dev: fix a couple line wrap mistakes --- templates/pacman.conf.chroot | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/templates/pacman.conf.chroot b/templates/pacman.conf.chroot index 53cfc2d..58857f9 100644 --- a/templates/pacman.conf.chroot +++ b/templates/pacman.conf.chroot @@ -15,24 +15,21 @@ # GENERAL OPTIONS # [options] -# The following paths are commented out with their default values -listed. +# 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 +# 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 +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = #IgnoreGroup = -- cgit v0.12 From 9c3a8e34cf9b58b1e8b03e3c800d909a7b25f32d Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 31 Aug 2011 13:26:38 -0500 Subject: profile-sync: start avahli and dbus for install. Don't know how /when these were disabled but they need to be running, otherwise autodetect for other MBE fails --- .../larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf | 2 +- .../profiles/linhes-local-mirror-testing-i686/post_process/rc.conf | 2 +- .../larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf index 391c913..1d2bb7f 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf +++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf @@ -67,5 +67,5 @@ HOSTNAME=`cat /etc/hostname` #The following is only used on the install. After the first boot everything is set from /etc/net. #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-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf index 391c913..1d2bb7f 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf @@ -67,5 +67,5 @@ HOSTNAME=`cat /etc/hostname` #The following is only used on the install. After the first boot everything is set from /etc/net. #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-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf index 391c913..1d2bb7f 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf +++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf @@ -67,5 +67,5 @@ HOSTNAME=`cat /etc/hostname` #The following is only used on the install. After the first boot everything is set from /etc/net. #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 -- cgit v0.12 From 3b5fc3346d55c199899ed4eea984ca2783631cfe Mon Sep 17 00:00:00 2001 From: James Meyer Date: Fri, 2 Sep 2011 14:08:00 -0500 Subject: profiles: Generate locales as part of the post-process. Remove the locale.gen overlay --- .../linhes-local-disk-testing-i686/post_process/modify_chroot.sh | 5 +++++ .../linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen | 6 ------ .../linhes-local-mirror-testing-i686/post_process/modify_chroot.sh | 5 +++++ .../linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen | 6 ------ .../linhes-remote-testing-i686/post_process/modify_chroot.sh | 5 +++++ .../profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen | 6 ------ 6 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen delete mode 100644 build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen delete mode 100644 build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh index 4b91959..63d52eb 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/modify_chroot.sh @@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst cp -f /etc/skel/.bash* /root/ rm -f /etc/ssh/ssh_host*key* +python2 /.post_process/locale.py +echo "generating locales" +/usr/sbin/locale-gen + + diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen deleted file mode 100644 index 3bceedc..0000000 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/locale.gen +++ /dev/null @@ -1,6 +0,0 @@ -# locales for larch (/etc/locale.gen) - -en_US.UTF-8 UTF-8 -en_GB.UTF-8 UTF-8 -de_DE.UTF-8 UTF-8 - diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh index 4b91959..63d52eb 100755 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/modify_chroot.sh @@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst cp -f /etc/skel/.bash* /root/ rm -f /etc/ssh/ssh_host*key* +python2 /.post_process/locale.py +echo "generating locales" +/usr/sbin/locale-gen + + diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen deleted file mode 100644 index 3bceedc..0000000 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/locale.gen +++ /dev/null @@ -1,6 +0,0 @@ -# locales for larch (/etc/locale.gen) - -en_US.UTF-8 UTF-8 -en_GB.UTF-8 UTF-8 -de_DE.UTF-8 UTF-8 - diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh index 4b91959..63d52eb 100755 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh +++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/modify_chroot.sh @@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst cp -f /etc/skel/.bash* /root/ rm -f /etc/ssh/ssh_host*key* +python2 /.post_process/locale.py +echo "generating locales" +/usr/sbin/locale-gen + + diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen deleted file mode 100644 index 3bceedc..0000000 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/locale.gen +++ /dev/null @@ -1,6 +0,0 @@ -# locales for larch (/etc/locale.gen) - -en_US.UTF-8 UTF-8 -en_GB.UTF-8 UTF-8 -de_DE.UTF-8 UTF-8 - -- cgit v0.12