Commit e7239c2c authored by Elijah Grubb's avatar Elijah Grubb

Adding framework for rolling custome tcsh fix

parent d14a0885
...@@ -7,6 +7,12 @@ apk update ...@@ -7,6 +7,12 @@ apk update
# missing iputils-ping package from ubuntu process # missing iputils-ping package from ubuntu process
apk add openssh-server rsyslog logrotate iproute2 iputils net-tools sudo bash apk add openssh-server rsyslog logrotate iproute2 iputils net-tools sudo bash
# install our custom fix of tcsh
sh tcsh.sh
# no csh so symlink it to tcsh
ln -s /bin/tcsh /bin/csh
## Permissions on these should be the same as the host, so preserve them. ## Permissions on these should be the same as the host, so preserve them.
#cp -p /tmp/src/ssh-host-keys/ssh_host* /etc/ssh/ #cp -p /tmp/src/ssh-host-keys/ssh_host* /etc/ssh/
......
...@@ -20,7 +20,9 @@ apk add git ca-certificates bash perl \ ...@@ -20,7 +20,9 @@ apk add git ca-certificates bash perl \
gcc make libc-dev byacc libtool openssl-dev 'g++' \ gcc make libc-dev byacc libtool openssl-dev 'g++' \
sudo python python-dev libpcap-dev boost-dev wget patch flex sudo python python-dev libpcap-dev boost-dev wget patch flex
ln -s /bin/bash /bin/tcsh # install our custom fix for tcsh
sh tcsh.sh
ln -s /bin/tcsh /bin/csh ln -s /bin/tcsh /bin/csh
if [ -z "$EMULABTMPSRC" ]; then if [ -z "$EMULABTMPSRC" ]; then
......
...@@ -12,8 +12,10 @@ apk add ca-certificates sudo python wget patch nano file \ ...@@ -12,8 +12,10 @@ apk add ca-certificates sudo python wget patch nano file \
perl perl-libwww psmisc bash zsh mksh shadow \ perl perl-libwww psmisc bash zsh mksh shadow \
'g++' gcc openssl-dev boost 'g++' gcc openssl-dev boost
# the apk tcsh doesnt include a csh symlink so we'll add one # install our custom fix for tcsh
ln -s /bin/bash /bin/tcsh sh tcsh.sh
# no csh so symlink it to tcsh
ln -s /bin/tcsh /bin/csh ln -s /bin/tcsh /bin/csh
# #
......
...@@ -6,3 +6,8 @@ apk update ...@@ -6,3 +6,8 @@ apk update
# bridge-utils contains brctl command # bridge-utils contains brctl command
apk add iproute2 bridge-utils vlan less apk add iproute2 bridge-utils vlan less
# install our custom fix of tcsh
sh tcsh.sh
...@@ -13,8 +13,6 @@ set -x ...@@ -13,8 +13,6 @@ set -x
#export LANG=en_US.UTF-8 #export LANG=en_US.UTF-8
#export LC_CTYPE=en_US.UTF-8 #export LC_CTYPE=en_US.UTF-8
echo "runit should be run here..."
apk update apk update
apk add --allow-untrusted /tmp/runit*.apk apk add --allow-untrusted /tmp/runit*.apk
......
#!/bin/sh
#
# Install a working version of tcsh. Currently the apk version does
# not work, so we have to roll our own.
#
set -x
if [ -n "$DESTDIR" ]; then
export DESTDIR="$DESTDIR/tcsh"
mkdir -p $DESTDIR
fi
DIRNAME=`pwd`
$DIRNAME/alpine/prepare.sh
apk update
apk add alpine-sdk wget
cd /tmp
if [ -z "$TCSHSRC" ]; then
apk add git ca-certificates
git clone https://gitlab.flux.utah.edu/grubb/tcsh tcsh
else
mkdir -p tcsh
cp -pR $TCSHSRC/* tcsh
fi
cd tcsh/alpine/
mkdir -p /var/cache/distfiles
adduser -D packager
addgroup packager abuild
chgrp abuild /var/cache/distfiles
chgrp -R abuild ..
chmod -R g+w ..
chmod g+w /var/cache/distfiles
echo "packager ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
sudo -u packager sh $DIRNAME/alpine3/tcsh-packager.sh
cd /tmp/tcsh/x86_64
cp -p *.apk $DESTDIR/
exit 0
#!/bin/sh
#
# Actually does the package building since root can't build the packages
#
set -x
# sudo chown packager:packager ~/.abuild/
abuild-keygen -a -i -n
cd /tmp/tcsh/alpine
abuild -r -P /tmp
#!/bin/sh
#
# Install a working version of tcsh. Currently the apk version does
# not work, so we have to roll our own.
#
set -x
#export LANGUAGE=en_US:en
#export LC_ALL=en_US.UTF-8
#export LANG=en_US.UTF-8
#export LC_CTYPE=en_US.UTF-8
if [ -e "/bin/tcsh" ];
# tcsh is already installed
exit 0
fi
sh $DIRNAME/alpine3/tcsh-artifacts.sh
apk update
apk add --allow-untrusted /tmp/tcsh*.apk
$DIRNAME/alpine/cleanup.sh
exit 0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment