Browse Source

Sync local and remote b/c I did a dumb and forgot to pull

website
axk4545 7 years ago
parent
commit
0159ddced4
9 changed files with 40 additions and 17 deletions
  1. +22
    -0
      ci-build.sh
  2. +2
    -1
      make-iso.sh
  3. +0
    -0
      scripts/FusionEnableLauncher.py
  4. +0
    -0
      scripts/cs/jflap.sh
  5. +0
    -0
      scripts/enablerpmfusion.sh
  6. +0
    -0
      scripts/postinstall
  7. +0
    -0
      scripts/removal
  8. +0
    -0
      scripts/se/alloy.sh
  9. +16
    -16
      tigeros.ks

+ 22
- 0
ci-build.sh View File

@ -0,0 +1,22 @@
#!/bin/bash
set -eu
#####################################################################
# TigerOS Build Script for running on the build box with Jenkins CI #
# @author: Aidan Kahrs #
# #
# Usage: sudo bash build.sh #
# #
#####################################################################
wget -O tigeros.ks https://raw.githubusercontent.com/RITlug/TigerOS/master/tigeros.ks
mock -r fedora-25-x86_64 --init
mock -r fedora-25-x86_64 --copyin tigeros.ks ./tigeros.ks
mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart svn
mock -r fedora-25-x86_64 --chroot "svn export https://github.com/RITlug/TigerOS/trunk/scripts/"
mock -r fedora-25-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project TigerOS-Live --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 25 --title TigerOS-live --macboot"
mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso /srv/isos/TigerOS.iso
rm -rf /var/lmc/
cd /srv/isos/
sha512sum *.iso >CHECKSUM512

+ 2
- 1
make-iso.sh View File

@ -14,7 +14,8 @@ reset=`tput sgr0`
echo "${green}Welcome to the TigerOS build script${reset}" echo "${green}Welcome to the TigerOS build script${reset}"
mock -r fedora-25-x86_64 --init mock -r fedora-25-x86_64 --init
mock -r fedora-25-x86_64 --copyin tigeros.ks ./tigeros.ks mock -r fedora-25-x86_64 --copyin tigeros.ks ./tigeros.ks
mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart
mock -r fedora-25-x86_64 --install lorax-lmc-novirt git vim-minimal pykickstart svn
mock -r fedora-25-x86_64 --chroot "svn export https://github.com/RITlug/TigerOS/trunk/scripts/"
echo "${green}Beginning build process${reset}" echo "${green}Beginning build process${reset}"
mock -r fedora-25-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project TigerOS-Live --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 25 --title TigerOS-live --macboot" mock -r fedora-25-x86_64 --chroot "livemedia-creator --ks tigeros.ks --no-virt --resultdir /var/lmc --project TigerOS-Live --make-iso --volid TigerOS --iso-only --iso-name TigerOS.iso --releasever 25 --title TigerOS-live --macboot"
mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso TigerOS.iso mock -r fedora-25-x86_64 --copyout /var/lmc/TigerOS.iso TigerOS.iso

+ 0
- 0
scripts/FusionEnableLauncher.py View File


+ 0
- 0
scripts/cs/jflap.sh View File


+ 0
- 0
scripts/enablerpmfusion.sh View File


+ 0
- 0
scripts/postinstall View File


+ 0
- 0
scripts/removal View File


+ 0
- 0
scripts/se/alloy.sh View File


+ 16
- 16
tigeros.ks View File

@ -295,7 +295,7 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \
# Drop the rescue kernel and initramfs, we don't need them on the live media itself. # Drop the rescue kernel and initramfs, we don't need them on the live media itself.
# See bug 1317709 # See bug 1317709
rm -f /boot/*-rescue*
rm -f /boot/\*-rescue*
# Disable network service here, as doing it in the services line # Disable network service here, as doing it in the services line
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794
@ -308,7 +308,7 @@ touch /etc/machine-id
%end %end
%post --nochroot %post --nochroot
cp $INSTALL_ROOT/usr/share/licenses/*-release/* $LIVE_ROOT/
cp $INSTALL_ROOT/usr/share/licenses/\*-release/\* $LIVE_ROOT/
# only works on x86, x86_64 # only works on x86, x86_64
if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then if [ "$(uname -i)" = "i386" -o "$(uname -i)" = "x86_64" ]; then
@ -319,6 +319,7 @@ fi
%end %end
%post %post
# THIS IS ALL RUN IN THE LIVE ROOT
# cinnamon configuration # cinnamon configuration
# create /etc/sysconfig/desktop (needed for installation) # create /etc/sysconfig/desktop (needed for installation)
@ -351,28 +352,28 @@ chown -R liveuser:liveuser /home/liveuser
restorecon -R /home/liveuser restorecon -R /home/liveuser
EOF EOF
%end
%post
# go to the backgrounds folder for custom images # go to the backgrounds folder for custom images
cd /usr/share/backgrounds/images cd /usr/share/backgrounds/images
# fetch custom RIT backgrounds # fetch custom RIT backgrounds
#FIXME
# Fetch rpm fusion scripts # Fetch rpm fusion scripts
mkdir -p /usr/share/autostart
cp -R scripts/ /home/liveuser/
chown -R liveuser:liveuser /home/liveuser
restorecon -R /home/liveuser
mkdir -p $INSTALL_ROOT/usr/share/autostart
mkdir -p $INSTALLROOT/usr/local/tigeros
cp -r /scripts/ $INSTALL_ROOT/usr/local/tigeros/
cp /home/liveuser/enablerpmfusion.sh /usr/share/autostart/enablerpmfusion.sh
cp /home/liveuser/FusionEnableLauncher.py /usr/share/autostart/FusionEnableLauncher.py
cp /home/liveuser/postinstall /usr/share/autostart/postinstall
ln -s $INSTALL_ROOT/home/liveuser/enablerpmfusion.sh $INSTALL_ROOT/usr/share/autostart/enablerpmfusion.sh
ln -s $INSTALL_ROOT/usr/local/tigeros/FusionEnableLauncher.py $INSTALL_ROOT/usr/share/autostart/FusionEnableLauncher.py
ln -s $INSTALL_ROOT/usr/local/tigeros/postinstall $INSTALL_ROOT/usr/share/autostart/postinstall
chmod a+rwx enablerpmfusion.sh
chmod -R 755 $INSTALL_ROOT/usr/local/tigeros/
# Download and install google chrome # Download and install google chrome
dnf install https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
dnf --installroot=$INSTALL_ROOT install https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
restorecon -R $INSTALL_ROOT/home/liveuser
%end %end
%packages %packages
@ -411,7 +412,6 @@ lynx
memtest86+ memtest86+
parole parole
pidgin pidgin
#playonlinux
rhythmbox rhythmbox
syslinux syslinux
transmission transmission
@ -424,7 +424,7 @@ zsh
-fedora-bookmarks -fedora-bookmarks
-fedora-icon-theme -fedora-icon-theme
-fedora-logos -fedora-logos
#-fedora-release
-fedora-release
-fedora-release-notes -fedora-release-notes
-hplip -hplip
-isdn4k-utils -isdn4k-utils

Loading…
Cancel
Save