From 21bfd58ce8fa173cf3e92c730513124decdf0c86 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 8 Aug 2011 21:16:09 -0500 Subject: README: change names of repo; add --- README | 74 +++++++++++++++++++++++++++++++----------------------------------- 1 file changed, 35 insertions(+), 39 deletions(-) mode change 100644 => 100755 README diff --git a/README b/README old mode 100644 new mode 100755 index 92948eb..2f550fb --- a/README +++ b/README @@ -1,18 +1,16 @@ The LinHES development is divided into two different git repositories. -The first repository is LinHES-PKGBUILD, and it contains all the PKGBUILD -files that make up LinHES. The second repository is called LinHES-dev and is +The first repository is linhes-pkgbuild, and it contains all the PKGBUILD +files that make up LinHES. The second repository is called linhes-dev and is intended to create a chroot for all development to occur within. By using a chroot development work can be done on non-LinHES machines. The reason for the split is so that the PKGBUILD's may be downloaded and modified by non-developers without requiring them to download the entire development environment. ------- LinHES-PKGBUILD ----------- +------ linhes-pkgbuild ----------- -The layout of the LinHES-PKGBUILD repository is as follows. +The layout of the linhes-pkgbuild repository is as follows. -- abs - |-- chroot-devel - |-- chroot-devel-testing |-- core |-- core-testing |-- extra @@ -25,17 +23,13 @@ Extra contains all the packages used by LinHES, but not necessarily needed to create a fully functioning system. For example this would include mplayer, xine and mozilla. -Chroot-devel are packages used by developers that are not in LinHES. -**note chroot-devel is now defunc - - The difference between core and core-testing is that core is intended to be used for public iso releases, where as core-testing is intended for developers -or beta testing. The same applies to extra and chroot-devel. +or beta testing. The same applies to extra and extra-testing. ------------ LinHES-dev ------------------- +----------- linhes-dev ------------------- - LinHES-dev contains the tools and scripts for a working development + 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 @@ -52,33 +46,37 @@ empty directory structure called pkg_repo, this is used by kmsync.sh 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: a) mounting proc,sys,dev/pts - b) bind mounting LinHES-dev/build_tools to build_root/build_tools - c) bind mounting LinHES-PKGBUILD to build_root/data/LinHES-PKGBUILD + b) bind mounting linhes-dev/build_tools to build_root/build_tools + c) bind mounting linhes-pkgbuild to build_root/data/linhes-pkgbuild d) bind mounting pkg_repo to build_root/data/pkg_repo. e) unmount the above directories when leaving the chroot The following is a list of tools available to you inside the chroot. -a) mp +a) mp.py + Python script to replace mp. Must be called from the same directory + that contains the PKGBUILD. + +b) mp Small script to compile a package, copy it to the local testing repo and update the local database using the repo-add function. Must be called from the same directory that contains the PKGBUILD. This script takes all the same arguments that makepkg takes. -b) mpr | mpl +c) mpr | mpl mpr) Symlink to mp that does the same thing as mp except it copies the package to the release repo mpl) Symlink to mp that does the same thing as mp except it copies the package to a local repo -c) update_db_repo +d) update_db_repo Used to completely regenerate the the local package database. Takes two arguments the directory with packages, and the name of the repository. Example: update_db_repo /data/pkg_repo/i686/core-testing core-testing -d) kmsync.sh (testing|release|chroot-devel|source[testing|release|chroot-devel] +e) kmsync.sh (testing|release|chroot-devel|source[testing|release|chroot-devel] This script is used to synchronize the contents of the compiled packages on knoppmyth.net and the ones on your local machine. The script takes 1 or 2 arguments telling it which repository with which @@ -93,10 +91,8 @@ d) kmsync.sh (testing|release|chroot-devel|source[testing|release|chroot-devel] Finally this script uses a shared user account on knoppmyth.net that is a locked account. SSH keys must be setup for this script to work. - - - -e) build_tools/go.sh + +f) build_tools/go.sh Menu driven fronted to create an ISO with selected profile The following profiles are available to create an iso. a ) i686-RELEASE-REMOTE @@ -121,13 +117,13 @@ If you are using an R6 install as your dev box, you will need to install git. Make sure you have the following entries in /etc/pacman.conf: [core-testing] -Server = http://knoppmyth.net/repo/i686/core-testing +Server = http://linhes.org/repo/i686/core-testing [extra-testing] -Server = http://knoppmyth.net/repo/i686/extra-testing +Server = http://linhes.org/repo/i686/extra-testing [chroot-devel] -Server = http://knoppmyth.net/repo/i686/chroot-devel +Server = http://linhes.org/repo/i686/chroot-devel Then run: pacman -Syu @@ -142,18 +138,18 @@ The recommended location for the checkout is /myth/dev. cd /myth/dev - Restricted dev accounts should use - git clone $USER@knoppmyth.net:LinHES-PKGBUILD - git clone $USER@knoppmyth.net:LinHES-dev + git clone $USER@knoppmyth.net:linhes-pkgbuild + git clone $USER@knoppmyth.net:linhes-dev - Unresticted dev account should use - git clone ssh://$USER@knoppmyth.net/mount/repository/LinHES-dev - git clone ssh://$USER@knoppmyth.net/mount/repository/LinHES-PKGBUILD + git clone ssh://$USER@knoppmyth.net/mount/repository/linhes-dev + git clone ssh://$USER@knoppmyth.net/mount/repository/linhes-pkgbuild -- Edit LinHES-dev/templates/pacman.conf.chroot. Comment out the core and +- Edit linhes-dev/templates/pacman.conf.chroot. Comment out the core and extra lines and uncomment the core-testing and extra-testing. - Run these commands: - cd LinHES-dev/ + cd linhes-dev/ sudo ./setup_env.sh i686 cd .. @@ -184,24 +180,24 @@ Before building ANY packages you __MUST__ run "kmsync.sh testing" at least once while the local package directories are still empty. Doing this step now will avoid sync headaches down the road. -cdl <= alias that takes you the the top level PKGBUILD directory +cdl <= alias that takes you the the top level PKGBUILD directory cd core-testing cd tar -vi PKGBUILD <= edit by hand and increment pkgrel by 1 -mp -s <= builds the package and all dependencies +vi PKGBUILD <= edit and increment pkgrel by 1; remove md5sums +mp.py <= builds the package and all dependencies # At this point you should test the package, either by building # a new iso or installing the package). # In order to make your source change(s) available to others, you will have -# to commit your change(s) to your local copy of the LinHES-PKGBUILD repo. +# to commit your change(s) to your local copy of the linhes-pkgbuild repo. # If this is your first time using the git command, set up your user name # and email address (You only need to do this once, not every time): git config --global user.name "Your Name" git config --global user.email "you@yourdomain.com" -# Next, commit your changes to your local LinHES-PKGBUILD repo: +# Next, commit your changes to your local linhes-pkgbuild repo: git commit -a -m "commit message" @@ -219,8 +215,8 @@ kmsync.sh testing <= this will pull down all new packages from knoppmyth.net ----------------------- Misc. Directory structure after a functioning chroot is created for i686 -|-- LinHES-PKGBUILD -|-- LinHES-dev +|-- linhes-pkgbuild +|-- linhes-dev |-- build_root.i686 |-- enter_dev_chroot.i686.sh `-- pkg_repo -- cgit v0.12