archiso-19 + configs for linhes iso.

This provides archiso-19 but doesn't install it inside the dev env.

6 files changed, 305 insertions, 24 deletions

diff --git a/build_tools/archiso/mythvantage/build.sh.backup b/build_tools/archiso/mythvantage/build.sh.backup
index 243762e..e2659f7 100755
--- a/build_tools/archiso/mythvantage/build.sh.backup
+++ b/build_tools/archiso/mythvantage/build.sh.backup
@@ -5,19 +5,30 @@ iso_label="linhes_$(date +%Y%m)"
 iso_version=$(date +%Y.%m.%d)
 install_dir=arch
 arch=$(uname -m)
-work_dir=work
-out_dir=out
+work_dir=/tmp/work
+out_dir=/tmp
 verbose=""
 cmd_args=""
 
 script_path=$(readlink -f ${0%/*})
 
+pacman_cache_files="data-storage-disk0-pacman-pkg"
+cache_dirs="/data/storage/disk0/pacman/pkg"
+pacman_cache=${cache_dirs}
+
 setup_workdir() {
-    cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+    #JM
+    #this is complicated way todo a mv ${script_path}/pacman.conf $work_dir/pacman.conf
+    #but we can't do a move  because it's called at least 3 times.
+    #cache_dirs=($(pacman --config ${script_path}/pacman.conf -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+    #cache_dirs=($(pacman -C ${pacman_conf} -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
     mkdir -p "${work_dir}"
+
     pacman_conf="${work_dir}/pacman.conf"
+
     sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" \
         "${script_path}/pacman.conf" > "${pacman_conf}"
+
 }
 
 # Base installation (root-image)
@@ -164,25 +175,29 @@ make_cache_repo() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]
     then
         local _url _urls _pkg_name _dst _pkgs _cache_dir
-        mkdir -p ${work_dir}/root-image/var/cache/pacman/pkg
+        mkdir -p ${work_dir}/root-image/${pacman_cache}
         old_cache=${work_dir}/old_cache
         mkdir -p "$old_cache"
         pacman --config "${pacman_conf}" -Sy -r ${work_dir}/root-image
         echo "------------------------------------------"
         for i in  $(cat $script_path/packages.${arch}.cache)
         do
-            echo "Adding $i to pacman cache"
-            _urls=$(pacman --config "${pacman_conf}" -Sp -r ${work_dir}/root-image ${i})
-            cd $old_cache
-            for url in ${_urls}
-            do
-                echo "downloading $url"
-                wget -N ${url}
-            done
-            cd -
+            if [[ $i != "#"* ]]
+            then
+                echo "Adding $i to pacman cache"
+                _urls=$(pacman --config "${pacman_conf}" -Sp -r ${work_dir}/root-image ${i})
+                cd $old_cache
+                for url in ${_urls}
+                do
+                    echo "downloading $url"
+                    #wget -N ${url}
+                    curl -O ${url}
+                done
+                cd -
+            fi
 
         done
-        cp -rp $old_cache/* ${work_dir}/root-image/var/cache/pacman/pkg
+        cp -rp $old_cache/* ${work_dir}/root-image/${pacman_cache}
     fi
     echo "------------------------------------------"
 
@@ -192,7 +207,7 @@ make_cache_repo() {
 
 make_var_cache_pacman(){
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
-    mv ${work_dir}/root-image/var/cache/pacman ${work_dir}/var-cache-pacman
+    mv ${work_dir}/root-image/${pacman_cache} ${work_dir}/${pacman_cache_files}
     : > ${work_dir}/build.${FUNCNAME}
     fi
 
@@ -209,21 +224,25 @@ make_var_lib_pacman(){
 # Customize installation (root-image)
 make_customize_root_image() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
+        chown -R root:root ${script_path}/root-image
         cp -af ${script_path}/root-image ${work_dir}
         chmod 750 ${work_dir}/root-image/etc/sudoers.d
-        chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel
+	#JM
+        #chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel
         mkdir -p ${work_dir}/root-image/etc/pacman.d
-        wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
-        sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist
+        #JM
+        #mkdir -p ${work_dir}/storage/data/home
+        #wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
+        #sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist
         #sed -i 's/#\(en_US\.UTF-8\)/\1/' ${work_dir}/root-image/etc/locale.gen
         mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \
             -r 'locale-gen' \
             run
         #JM
-        mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \
-#            -r 'useradd -m -p "" -G "audio,disk,optical,wheel,storage,video,users" mythtv' \
-            run
-        : > ${work_dir}/build.${FUNCNAME}
+        #mkarchiso ${verbose} -w "${work_dir}" -C "${pacman_conf}" -D "${install_dir}" \
+        #    -r 'useradd -b "/storage/data/home" -m -p "" -G "audio,disk,optical,wheel,storage,video,users" mythtv' \
+        #    run
+        #: > ${work_dir}/build.${FUNCNAME}
     fi
 }
 
diff --git a/build_tools/archiso/mythvantage/packages.x86_64 b/build_tools/archiso/mythvantage/packages.x86_64
new file mode 100644
index 0000000..e5d5600
--- /dev/null
+++ b/build_tools/archiso/mythvantage/packages.x86_64
@@ -0,0 +1,153 @@
+#sysvinit
+initscripts
+#b43-fwcutter
+acpid
+btrfs-progs
+crda
+#darkhttpd
+ddrescue
+#dhclient
+dhcpcd
+dialog
+dmraid
+#dnsmasq
+dnsutils
+dcron
+dosfstools
+dvb-firmware
+efibootmgr
+#elinks
+#gnu-netcat
+gptfdisk
+#fluxbox
+plymouth
+plymouth-theme-linhes-logo
+#haveged
+libhdhomerun
+hdparm
+ipw2100-fw
+ipw2200-fw
+iputils
+#irssi
+#lftp
+#lilo
+#linux-atm
+lirc
+mtools
+#netcfg
+net-tools
+nfs-utils
+nilfs-utils
+#nmap
+#ntfs-3g
+#ntfsprogs
+ntp
+#openconnect
+openssh
+#openvpn
+parted
+#pptpclient
+#rp-pppoe
+rsync
+#smartmontools
+#speedtouch
+#tcpdump
+#vpnc
+v86d
+wireless_tools
+wpa_actiond
+zd1211-firmware
+python2
+LinHES-config
+bc
+libstatgrab
+mysql-python
+expect
+curl
+dnsutils
+parted
+sg3_utils
+nmbscan
+squashfs-tools
+rsync
+python-parted
+python2-pexpect
+python-netifaces
+python-iplib
+xorg-apps
+xorg-fonts
+windowmaker
+xf86-video-vesa
+xorg-xinit
+xorg-server
+xorg-bdftopcf
+xorg-docs
+xorg-font-util
+xorg-fonts-100dpi
+#xorg-fonts-75dpi
+xorg-fonts-encodings
+xorg-iceauth
+xorg-luit
+xorg-mkfontdir
+xorg-mkfontscale
+#xorg-res-utils
+xorg-server
+xorg-sessreg
+xorg-setxkbmap
+xorg-x11perf
+xorg-xauth
+xorg-xbacklight
+xorg-xcmsdb
+xorg-xcursorgen
+xorg-xdpyinfo
+xorg-xdriinfo
+xorg-xev
+#xorg-xgamma
+xorg-xhost
+xorg-xinput
+xorg-xkbcomp
+xorg-xkbevd
+xorg-xkbutils
+xorg-xkill
+xorg-xlsatoms
+xorg-xlsclients
+xorg-xmodmap
+xorg-xpr
+xorg-xprop
+xorg-xrandr
+xorg-xrdb
+xorg-xrefresh
+xorg-xset
+xorg-xsetroot
+xorg-xvinfo
+xorg-xwd
+xorg-xwininfo
+xorg-xwud
+xterm
+xkeyboard-config
+grub-common
+grub-bios
+LinHES-config
+LinHES-system
+mythtv
+mysql
+etcnet
+#alt_wm
+e16_theme_settings
+wmaker_settings
+mlocate
+
+mythinstall
+mytharchive
+mythbrowser
+mythgallery
+mythgame
+mythmusic
+mythnews
+mythweather
+linhes-theme
+
+ivtv-utils
+alsa-utils
+
+ceton_infinitv
diff --git a/build_tools/archiso/mythvantage/packages.x86_64.cache b/build_tools/archiso/mythvantage/packages.x86_64.cache
new file mode 100644
index 0000000..a989fdb
--- /dev/null
+++ b/build_tools/archiso/mythvantage/packages.x86_64.cache
@@ -0,0 +1,28 @@
+runit-scripts
+mythdb-initial
+mythnetvision
+tigervnc
+x11vnc
+nvidia
+nvidia-utils
+vdpauinfo
+lighttpd
+mythweb
+nfs-utils
+samba
+mplayer
+lcdproc
+mythappletrailers
+xscreensaver
+supplemental-web
+supplemental-web-slave
+#romdb
+#miro
+oss
+xf86-input-vmmouse  
+xf86-video-vmware 
+xf86-video-vesa
+xf86-video-intel
+libgl
+svga-dri
+nss-mdns
diff --git a/build_tools/archiso/mythvantage/pacman.conf b/build_tools/archiso/mythvantage/pacman.conf
new file mode 100644
index 0000000..7a9cfff
--- /dev/null
+++ b/build_tools/archiso/mythvantage/pacman.conf
@@ -0,0 +1,77 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# 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/storage/disk0/pacman/pkg
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -C - -f %u > %o
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#UseDelta
+#TotalDownload
+# We cannot check disk space from within a chroot environment
+#CheckSpace
+VerbosePkgLists
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel = Optional TrustedOnly
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - 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-testing]
+SigLevel = Optional TrustedOnly
+Server = http://localmirror.lan/repo/$arch/$repo/
+
+[extra-testing]
+SigLevel = Optional TrustedOnly
+Server = http://localmirror.lan/repo/$arch/$repo/
diff --git a/build_tools/archiso/mythvantage/pristine.list b/build_tools/archiso/mythvantage/pristine.list
new file mode 100644
index 0000000..5223823
--- /dev/null
+++ b/build_tools/archiso/mythvantage/pristine.list
@@ -0,0 +1,4 @@
+./etc/hosts
+./etc/rc.local
+./boot
+./var/lib/pacman/
diff --git a/build_tools/archiso/mythvantage/profile_files/packages.x86_64 b/build_tools/archiso/mythvantage/profile_files/packages.x86_64
index daba72a..e5d5600 100644
--- a/build_tools/archiso/mythvantage/profile_files/packages.x86_64
+++ b/build_tools/archiso/mythvantage/profile_files/packages.x86_64
@@ -1,4 +1,4 @@
-sysvinit
+#sysvinit
 initscripts
 #b43-fwcutter
 acpid
@@ -71,7 +71,7 @@ nmbscan
 squashfs-tools
 rsync
 python-parted
-python-pexpect
+python2-pexpect
 python-netifaces
 python-iplib
 xorg-apps