Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-dev

5 files changed, 20 insertions, 4 deletions

diff --git a/README b/README
index a459213..1e3d57e 100644
--- a/README
+++ b/README
@@ -40,7 +40,7 @@ environment.  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 and argument telling it which architecture to work with.  Currently
+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
@@ -187,8 +187,18 @@ cd core-testing
 cd tar
 vi PKGBUILD  <= edit by hand and increment pkgrel by 1
 mp -s <= builds the package and all dependencies
-# at this point you should test the package, either by building
-# a new iso or installing the package)
+
+# 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
+# (git commit -a -m "commit message") and then push the change(s) to the
+# public repo (git push).
+#
+# In order to make your new package(s) available to others, you will need to
+# upload changed packages using kmsync.sh:
+
 kmsync.sh testing  <= this will pull down all new packages from knoppmyth.net
                       and upload the new tar package. This will also sync up 
                             the src packages.
diff --git a/build_tools/bin/mp b/build_tools/bin/mp
index 5194d75..82f665d 100755
--- a/build_tools/bin/mp
+++ b/build_tools/bin/mp
@@ -124,7 +124,7 @@ function dup_check {
 	do
 		if [ ! $i$PFIX = $REPO ]
 		then
-			out=`pacman -Sl $i$PFIX|cut -d" " -f2 |grep  $pkgname$`
+			out=`pacman -Sl $i$PFIX|cut -d" " -f2 |grep  ^pkgname$`
 			if [ $? = 0 ]
 			then
 				echo "#######################################"
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks
index 520e423..3e9cb3e 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks
@@ -209,3 +209,5 @@ joyutils
 #---Firewire
 libraw1394
 libavc1394
+# wrapper for mplayer
+mplayer-wrapper
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks
index 520e423..3e9cb3e 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks
@@ -209,3 +209,5 @@ joyutils
 #---Firewire
 libraw1394
 libavc1394
+# wrapper for mplayer
+mplayer-wrapper
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
index 520e423..3e9cb3e 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
@@ -209,3 +209,5 @@ joyutils
 #---Firewire
 libraw1394
 libavc1394
+# wrapper for mplayer
+mplayer-wrapper