summaryrefslogtreecommitdiffstats
path: root/build_tools
diff options
context:
space:
mode:
Diffstat (limited to 'build_tools')
-rwxr-xr-xbuild_tools/bin/kmsync.sh58
-rwxr-xr-xbuild_tools/bin/mp31
l---------build_tools/bin/mpl1
-rw-r--r--build_tools/clarch/larch/buildlive5
-rw-r--r--build_tools/clarch/larch/profiles/MV-local/addedpacks19
-rw-r--r--build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg2
-rw-r--r--build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch18
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks3
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg9
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local10
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks3
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg9
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local10
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/addedpacks3
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg9
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local10
16 files changed, 166 insertions, 34 deletions
diff --git a/build_tools/bin/kmsync.sh b/build_tools/bin/kmsync.sh
index 4308786..c15bef4 100755
--- a/build_tools/bin/kmsync.sh
+++ b/build_tools/bin/kmsync.sh
@@ -27,6 +27,7 @@ function sync_dirs {
#first bring down new changes from knoppmyth.net
unison km-down -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE $LOCAL
+
if [ ! $? = 0 ]
then
echo "#######################################################"
@@ -43,11 +44,50 @@ function sync_dirs {
echo "-------------------------------------------------------"
echo "----------- Finished with $3 -----------"
echo "-------------------------------------------------------"
+}
+function source_sync () {
+ src_repo=$1
+ case $1 in
+ testing )
+ echo "updating source packages"
+ REMOTE_DIR=/mount/repository/repo/src_packages/core-testing
+ LOCAL=/data/pkg_repo/src_packages/core-testing
+ unison km-down -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE_DIR $LOCAL
+
+ REMOTE_DIR=/mount/repository/repo/src_packages/extra-testing
+ LOCAL=/data/pkg_repo/src_packages/extra-testing
+ unison km-down -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE_DIR $LOCAL
+ ;;
+
+ release )
+ echo "updating source packages"
+ REMOTE_DIR=/mount/repository/repo/src_packages/core
+ LOCAL=/data/pkg_repo/src_packages/core
+ unison km-down -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE_DIR $LOCAL
+
+ REMOTE_DIR=/mount/repository/repo/src_packages/extra
+ LOCAL=/data/pkg_repo/src_packages/extra
+ unison km-down -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE_DIR $LOCAL
+ ;;
+ chroot-devel )
+ echo "updating source packages"
+ REMOTE_DIR=/mount/repository/repo/src_packages/chroot-devel
+ LOCAL=/data/pkg_repo/src_packages/chroot-devel
+ unison km-down -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE_DIR $LOCAL
+ ;;
+
+
+
+ *)
+ echo "need to know the source repository [testing|release|chroot-devel]"
+ exit 1
+ ;;
+esac
+}
-}
#---------------------------------------------------------------
if [ ! -d $UNISON ]
then
@@ -66,26 +106,40 @@ fi
+
+
clear
case $1 in
testing)
#sync_dirs $REMOTE $LOCAL
sync_dirs $REMOTE_DIR/$CARCH/core-testing $DOCROOT/core-testing core-testing
sync_dirs $REMOTE_DIR/$CARCH/extra-testing $DOCROOT/extra-testing extra-testing
+ source_sync testing
;;
release)
sync_dirs $REMOTE_DIR/$CARCH/core $DOCROOT/core core
sync_dirs $REMOTE_DIR/$CARCH/extra $DOCROOT/extra extra
+ source_sync release
;;
chroot-devel)
echo "will update chroot-devel"
sync_dirs $REMOTE_DIR/$CARCH/chroot-devel $DOCROOT/chroot-devel chroot-devel
+ source_sync chroot-devel
+ ;;
+
+ source)
+ if [ x = x$2 ]
+ then
+ echo "need to know the source repository [testing|release|chroot-devel]"
+ exit 1
+ fi
+ source_sync $2
;;
*)
echo "invalid options"
- echo "kmsync.sh (testing|release|chroot-devel) "
+ echo "kmsync.sh (testing|release|chroot-devel|source[testing|release|chroot-devel]) "
echo
echo "EX: kmsync.sh testing <= will sync the testing repo with km.net update the local database and resync with km.net"
#echo "kmsync.sh testing oneway <= will syncthe testing repo with km.net update the local database"
diff --git a/build_tools/bin/mp b/build_tools/bin/mp
index 76c08ea..102454e 100755
--- a/build_tools/bin/mp
+++ b/build_tools/bin/mp
@@ -6,9 +6,10 @@
. /etc/makepkg.conf
. PKGBUILD
PKGHOME=/data/pkg_repo/packages
+SRCPKGHOME=/data/pkg_repo/src_packages
mydir=`pwd`
TOTALPKG="$pkgname"-"$pkgver"-"$pkgrel"-"$CARCH".pkg.tar.gz
-
+SRCPKG="$pkgname"-"$pkgver"-"$pkgrel".src.tar.gz
if [ x`basename $0` = xmpr ]
then
@@ -20,6 +21,7 @@ fi
+
function find_repo {
echo $mydir|grep -q "extra"
if [ $? = 0 ]
@@ -40,7 +42,15 @@ function find_repo {
REPO=mv-core
fi
+ if [ x`basename $0` = xmpl ]
+ then
+ REPO="local"
+ fi
DOCROOT=/data/pkg_repo/$CARCH/$REPO
+ if [ ! -e $DOCROOT ]
+ then
+ mkdir -p $DOCROOT
+ fi
}
@@ -67,13 +77,30 @@ function update-repo {
}
+function update-src-pkg {
+ DELPKG="$pkgname"-"$pkgver"-*.src.tar.gz
+ echo "Removing old src pkg"
+ if [ ! -d $PKGHOME/$REPO/$SRCPKG ]
+ then
+ echo "Creating src_pkg directory"
+ mkdir -p $SRCPKGHOME/$REPO
+ fi
+ rm -vf $SRCPKGHOME/$REPO/$DELPKG
+ echo "copying src_pkg to $SRCPKGHOME/$REPO"
+ cp -f $PKGHOME/$SRCPKG $SRCPKGHOME/$REPO
+}
-
+#MAIN PROGRAM
find_repo
makepkg --holdver --asroot $@ || exit 1
echo "---------updating database ----------"
update-repo #&& pacman -Sy
+echo "----------creating source package---------"
+makepkg -f --holdver --asroot --source && update-src-pkg
+
+
+
diff --git a/build_tools/bin/mpl b/build_tools/bin/mpl
new file mode 120000
index 0000000..691afc3
--- /dev/null
+++ b/build_tools/bin/mpl
@@ -0,0 +1 @@
+mp \ No newline at end of file
diff --git a/build_tools/clarch/larch/buildlive b/build_tools/clarch/larch/buildlive
index 4fe1a90..8b734d2 100644
--- a/build_tools/clarch/larch/buildlive
+++ b/build_tools/clarch/larch/buildlive
@@ -87,8 +87,9 @@ mklive ()
echo "ERROR: No aufs or unionfs module found"
fail=1
fi
-
- mustpacs="linhes-live lzop tar squashfs-tools"
+ #a live package of some sort needs to be installed, but not specificly linhes-live
+ #mustpacs="linhes-live lzop tar squashfs-tools"
+ mustpacs="lzop tar squashfs-tools"
if [ -z "${GRUB}" ]; then
mustpacs="${mustpacs} syslinux"
fi
diff --git a/build_tools/clarch/larch/profiles/MV-local/addedpacks b/build_tools/clarch/larch/profiles/MV-local/addedpacks
index f518409..b1b6a2a 100644
--- a/build_tools/clarch/larch/profiles/MV-local/addedpacks
+++ b/build_tools/clarch/larch/profiles/MV-local/addedpacks
@@ -1,5 +1,6 @@
# These are needed to build a live CD
-linhes-live
+#linhes-live
+mythvantage-live
squashfs-tools
lzop
@@ -121,14 +122,14 @@ syslog-ng
ttf-bitstream-vera
xine-lib
-#syth-lacquer-wide
-#Midnight-wide
-#Midnight-blue
-#basic-blue
-#basic-green
-#basic-amber
-#basic-purple
-#basic-red
+syth-lacquer-wide
+Midnight-wide
+Midnight-blue
+basic-blue
+basic-green
+basic-amber
+basic-purple
+basic-red
MythVantage-system
diff --git a/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg
index 6686db4..a4c7998 100644
--- a/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/MV-local/cd-root/isolinux/isolinux.cfg
@@ -24,6 +24,7 @@ KERNEL vmlinuz
APPEND vga=normal initrd=larch.img noauto ip=dhcp netdev=eth0
LABEL MythVantage-remote
+KERNEL vmlinuz
APPEND vga=normal initrd=larch.img noauto ip=dhcp remote=MX-500-jams remoteport=ttyS0
LABEL MythVantage-static-ip
@@ -33,6 +34,5 @@ APPEND vga=normal initrd=larch.img noauto vnc ip=192.168.1.222 netmask=255.255.
LABEL Boot_from_hardrive
localboot 0xffff
-
MENU ROWS 6
diff --git a/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch b/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch
index 69a1ce0..4bdc25f 100644
--- a/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch
+++ b/build_tools/clarch/larch/profiles/MV-local/post_process/rc.sysinit.patch
@@ -1,14 +1,14 @@
---- rc.sysinit.orig 2008-07-06 19:39:36.000000000 -0500
-+++ rc.sysinit 2008-07-06 19:40:28.000000000 -0500
-@@ -9,10 +9,7 @@
- source_functions
+--- rc.sysinit.orig 2008-11-22 20:47:41.000000000 -0600
++++ rc.sysinit 2008-11-22 20:48:07.000000000 -0600
+@@ -7,9 +7,8 @@
+ . /etc/rc.d/functions
echo " "
--printhl "Arch Linux $C_OTHER(${C_H2}Core Dump$C_OTHER)\n"
--printhl "${C_H2}http://www.archlinux.org"
--printhl "Copyright 2002-2007 Judd Vinet"
--printhl "Copyright 2007-2008 Aaron Griffin"
-+printhl "MythVantage \n"
+-printhl "LinHES"
+-printhl "The Linux Home Entertainment System"
+-printhl "${C_H2}http://www.knoppmyth.net"
++printhl "MythVantage"
++printhl "${C_H2}http://www.mythvantage.com"
printhl "Distributed under the GNU General Public License (GPL)"
printsep
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks
index 72b0c2d..35a096d 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks
@@ -179,3 +179,6 @@ media_dirs
tweaker
ethtool
nfs-utils
+netkit-telnet
+ntp
+syslog-ng
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
index a1a306d..4b41196 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/isolinux.cfg
@@ -27,10 +27,17 @@ MENU LABEL with Intel i810 driver (DRI disabled)
kernel vmlinuz
append initrd=larch.img i810
+
+label linux-vesa
+MENU LABEL Force use of vesa driver
+kernel vmlinuz
+append initrd=larch.img forceXvesa
+
+
label linux-nox
MENU LABEL Boot to console (without X windowing)
kernel vmlinuz
-append initrd=larch.img noX
+append initrd=larch.img NoX
label linux-c2r
MENU LABEL LinHES: copy-to-ram (also activates swap)
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local
index cdd7966..fe7cfa6 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local
+++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/rootoverlay/etc/rc.local
@@ -16,8 +16,14 @@ pacman -S --noconfirm mythdb-initial 2>/dev/null
#search for remote
init_remote
-/root/startx &
-
+echo $CMDLINE | grep -qi NoX
+if [ $? = 0 ]
+then
+ echo "No auto X option found"
+ # /usr/bin/chvt 2
+else
+ /root/startx &
+fi
# Set up automatically logged in user (larch live system only)
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 72b0c2d..35a096d 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks
@@ -179,3 +179,6 @@ media_dirs
tweaker
ethtool
nfs-utils
+netkit-telnet
+ntp
+syslog-ng
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg
index a1a306d..4b41196 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/isolinux.cfg
@@ -27,10 +27,17 @@ MENU LABEL with Intel i810 driver (DRI disabled)
kernel vmlinuz
append initrd=larch.img i810
+
+label linux-vesa
+MENU LABEL Force use of vesa driver
+kernel vmlinuz
+append initrd=larch.img forceXvesa
+
+
label linux-nox
MENU LABEL Boot to console (without X windowing)
kernel vmlinuz
-append initrd=larch.img noX
+append initrd=larch.img NoX
label linux-c2r
MENU LABEL LinHES: copy-to-ram (also activates swap)
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local
index cdd7966..fe7cfa6 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local
+++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/rootoverlay/etc/rc.local
@@ -16,8 +16,14 @@ pacman -S --noconfirm mythdb-initial 2>/dev/null
#search for remote
init_remote
-/root/startx &
-
+echo $CMDLINE | grep -qi NoX
+if [ $? = 0 ]
+then
+ echo "No auto X option found"
+ # /usr/bin/chvt 2
+else
+ /root/startx &
+fi
# Set up automatically logged in user (larch live system only)
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
index 72b0c2d..35a096d 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
@@ -179,3 +179,6 @@ media_dirs
tweaker
ethtool
nfs-utils
+netkit-telnet
+ntp
+syslog-ng
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg
index 648fe25..44124cf 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cd-root/isolinux/isolinux.cfg
@@ -27,10 +27,17 @@ MENU LABEL with Intel i810 driver (DRI disabled)
kernel vmlinuz
append initrd=larch.img i810
+
+label linux-vesa
+MENU LABEL Force use of vesa driver
+kernel vmlinuz
+append initrd=larch.img forceXvesa
+
+
label linux-nox
MENU LABEL Boot to console (without X windowing)
kernel vmlinuz
-append initrd=larch.img noX
+append initrd=larch.img NoX
label linux-c2r
MENU LABEL LinHES: copy-to-ram (also activates swap)
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local
index cdd7966..fe7cfa6 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/rootoverlay/etc/rc.local
@@ -16,8 +16,14 @@ pacman -S --noconfirm mythdb-initial 2>/dev/null
#search for remote
init_remote
-/root/startx &
-
+echo $CMDLINE | grep -qi NoX
+if [ $? = 0 ]
+then
+ echo "No auto X option found"
+ # /usr/bin/chvt 2
+else
+ /root/startx &
+fi
# Set up automatically logged in user (larch live system only)
generated by cgit v0.12 at 2024-12-26 01:40:55 (GMT)