Permalink
Browse files

Fixed project to work with recent archiso versions

Recompressing packages as .tar.xz
  • Loading branch information...
1 parent 4eafa41 commit ffa5f686c7b7d5c12f58c428802939e88fc437f1 @svenstaro committed Apr 19, 2010
Showing with 47 additions and 47 deletions.
  1. +0 −1 README
  2. BIN boot-files/invaders
  3. +0 −5 boot-files/isolinux/splash.rle
  4. BIN boot-files/isolinux/splashsmall.rle
  5. +44 −37 buildscript.sh
  6. BIN customization-kit/localrepo/astromenace-1.2.0-3-i686.pkg.tar.gz
  7. BIN customization-kit/localrepo/fmodex-4.24.04-1-i686.pkg.tar.gz
  8. BIN customization-kit/localrepo/fmodex-4.24.04-1-i686.pkg.tar.xz
  9. BIN customization-kit/localrepo/libcurl3-7.15.5-1-i686.pkg.tar.gz
  10. BIN customization-kit/localrepo/libcurl3-7.15.5-1-i686.pkg.tar.xz
  11. BIN customization-kit/localrepo/localrepo.db.tar.gz
  12. BIN customization-kit/localrepo/localrepo.db.tar.gz.old
  13. BIN customization-kit/localrepo/neverputt-1-1-i686.pkg.tar.gz
  14. BIN customization-kit/localrepo/neverputt-1-1-i686.pkg.tar.xz
  15. BIN customization-kit/localrepo/{quadra-1.2.0-1-i686.pkg.tar.gz → quadra-1.2.0-1-i686.pkg.tar.xz}
  16. BIN ...n-kit/localrepo/{worldofgoo-demo-1.41-1-i686.pkg.tar.gz → worldofgoo-demo-1.41-1-i686.pkg.tar.xz}
  17. BIN localrepo/astromenace-1.2.0-3-i686.pkg.tar.gz
  18. BIN localrepo/fmodex-4.24.04-1-i686.pkg.tar.gz
  19. BIN localrepo/fmodex-4.24.04-1-i686.pkg.tar.xz
  20. BIN localrepo/libcurl3-7.15.5-1-i686.pkg.tar.gz
  21. BIN localrepo/libcurl3-7.15.5-1-i686.pkg.tar.xz
  22. BIN localrepo/localrepo.db.tar.gz
  23. BIN localrepo/localrepo.db.tar.gz.old
  24. BIN localrepo/neverputt-1-1-i686.pkg.tar.gz
  25. BIN localrepo/neverputt-1-1-i686.pkg.tar.xz
  26. BIN localrepo/{quadra-1.2.0-1-i686.pkg.tar.gz → quadra-1.2.0-1-i686.pkg.tar.xz}
  27. BIN localrepo/{worldofgoo-demo-1.41-1-i686.pkg.tar.gz → worldofgoo-demo-1.41-1-i686.pkg.tar.xz}
  28. +1 −1 mkinitcpio.conf
  29. +1 −1 overlay/etc/fstab
  30. +1 −2 packages.list
  31. BIN {boot-files → }/splash.xcf
View
1 README
@@ -11,7 +11,6 @@ You need the following for now:
* archiso-git installed from AUR
* squashfs-tools
* aufs2-util
-* grub
* syslinux
* cdrtools from AUR (cdrkit mostly works too)
* devtools from [extra]
View
Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
View
@@ -30,7 +30,8 @@ NAME="lglive"
# Version will be appended to the ISO.
VER="0.9.6"
# Kernel version. We'll need this.
-KVER="2.6.31-ARCH"
+KVER="$(grep ^ALL_kver /etc/mkinitcpio.d/kernel26.kver | cut -d= -f2 | sed s/\'//g)"
+#KVER="2.6.33"
# Architecture will also be appended to the ISO name.
ARCH="i686"
#ARCH="`uname -m`" # we can't build x86_64 just yet! :(
@@ -94,28 +95,30 @@ overlay ()
mv -f `ls nvidia-*.tar.*|grep utils|grep -v 173xx|grep -v 96xx` nvidia-utils-recent
rm *.tar.* &> /dev/null
- [ ! ${QUIET} == "y" ] && echo "overlay: Making ATI driver package"
- #cp -r /usr/src/linux-${KVER} ${BASEDIR}/${WORKDIR}/root-image/usr/src/
- cd ${BASEDIR}/${WORKDIR}/root-image/tmp/
- wget -q http://aur.archlinux.org/packages/catalyst/catalyst.tar.*
- tar xzf catalyst.tar.* && rm catalyst.tar.*
- cd catalyst && [ ${VERBOSE} == "y" ] && makepkg --asroot --nobuild || makepkg --asroot --nobuild &> /dev/null
- cd ../../../../
- echo 'cd /tmp/
- [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while getting ATI driver packages\e[00m" && exit 1
- cd catalyst && makepkg -dfc --asroot > /dev/null
- [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while making ATI driver packages\e[00m" && exit 1
- pacman -Rsnu --noconfirm base-devel &>/dev/null' >> ${BASEDIR}/${WORKDIR}/root-image/atiscript.sh
- if [ ${VERBOSE} == "y" ]; then
- chroot ${BASEDIR}/${WORKDIR}/root-image bash atiscript.sh || return 1
- else
- chroot ${BASEDIR}/${WORKDIR}/root-image bash atiscript.sh &> /dev/null || return 1
- fi
- mv ${BASEDIR}/${WORKDIR}/root-image/tmp/catalyst/catalyst-*.tar.* . && rm -r ${BASEDIR}/${WORKDIR}/root-image/tmp/catalyst && rm ${BASEDIR}/${WORKDIR}/root-image/atiscript.sh
-
- #rm -r ${BASEDIR}/${WORKDIR}/root-image/usr/src/linux-${KVER}
- [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while making ATI driver packages\e[00m" && exit 1
- mv -f `ls catalyst-*.tar.*|grep -v utils` catalyst-recent && mv catalyst-recent overlay/opt/drivers
+ # NO ATI FOR NOW BECAUSE NO COMPATIBLE DRIVER IS AVAILABLE
+ # to reenable, put "base-devel" into packages.list again!
+# [ ! ${QUIET} == "y" ] && echo "overlay: Making ATI driver package"
+# #cp -r /usr/src/linux-${KVER} ${BASEDIR}/${WORKDIR}/root-image/usr/src/
+# cd ${BASEDIR}/${WORKDIR}/root-image/tmp/
+# wget -q http://aur.archlinux.org/packages/catalyst/catalyst.tar.gz
+# tar xzf catalyst.tar.gz && rm catalyst.tar.gz
+# cd catalyst && [ ${VERBOSE} == "y" ] && makepkg --asroot --nobuild || makepkg --asroot --nobuild &> /dev/null
+# cd ../../../../
+# echo 'cd /tmp/
+# [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while getting ATI driver packages\e[00m" && exit 1
+# cd catalyst && makepkg -dfc --asroot > /dev/null
+# [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while making ATI driver packages\e[00m" && exit 1
+# pacman -Rsnu --noconfirm base-devel &>/dev/null' >> ${BASEDIR}/${WORKDIR}/root-image/atiscript.sh
+# if [ ${VERBOSE} == "y" ]; then
+# chroot ${BASEDIR}/${WORKDIR}/root-image bash atiscript.sh || return 1
+# else
+# chroot ${BASEDIR}/${WORKDIR}/root-image bash atiscript.sh &> /dev/null || return 1
+# fi
+# mv ${BASEDIR}/${WORKDIR}/root-image/tmp/catalyst/catalyst-*.tar.* . && rm -r ${BASEDIR}/${WORKDIR}/root-image/tmp/catalyst && rm ${BASEDIR}/${WORKDIR}/root-image/atiscript.sh
+#
+# #rm -r ${BASEDIR}/${WORKDIR}/root-image/usr/src/linux-${KVER}
+# [ "$?" -ne 0 ] && echo -e "\e[01;31moverlay: Exiting due to error while making ATI driver packages\e[00m" && exit 1
+# mv -f `ls catalyst-*.tar.*|grep -v utils` catalyst-recent && mv catalyst-recent overlay/opt/drivers
[ ! ${QUIET} == "y" ] && echo "overlay: Finished preparing driver packages"
@@ -128,16 +131,16 @@ overlay ()
cp -f "${BASEDIR}"/gamelist_{lite,big} "${BASEDIR}"/"${WORKDIR}"/overlay/
fi
if [ ${VERBOSE} == "y" ]; then
- pacman -Sy --config pacman.conf --dbpath "${BASEDIR}"/"${WORKDIR}"/root-image/var/lib/pacman || return 1
+ pacman -Sy --config ${BASEDIR}/pacman.conf --dbpath "${BASEDIR}"/"${WORKDIR}"/root-image/var/lib/pacman || return 1
else
- pacman -Sy --config pacman.conf --dbpath "${BASEDIR}"/"${WORKDIR}"/root-image/var/lib/pacman &> /dev/null || return 1
+ pacman -Sy --config ${BASEDIR}/pacman.conf --dbpath "${BASEDIR}"/"${WORKDIR}"/root-image/var/lib/pacman &> /dev/null || return 1
fi
while read game; do
[ ! ${QUIET} == "y" ] && echo "overlay: Installing ${game}"
if [ ${VERBOSE} == "y" ]; then
- pacman -S --config pacman.conf --noconfirm --root "${BASEDIR}/${WORKDIR}/overlay/" --dbpath "${BASEDIR}/${WORKDIR}/root-image/var/lib/pacman" ${game} || return 1
+ pacman -S --config ${BASEDIR}/pacman.conf --noconfirm --root "${BASEDIR}/${WORKDIR}/overlay/" --dbpath "${BASEDIR}/${WORKDIR}/root-image/var/lib/pacman" ${game} || return 1
else
- pacman -S --config pacman.conf --noconfirm --root "${BASEDIR}/${WORKDIR}/overlay/" --dbpath "${BASEDIR}/${WORKDIR}/root-image/var/lib/pacman" ${game} &> /dev/null || return 1
+ pacman -S --config ${BASEDIR}/pacman.conf --noconfirm --root "${BASEDIR}/${WORKDIR}/overlay/" --dbpath "${BASEDIR}/${WORKDIR}/root-image/var/lib/pacman" ${game} &> /dev/null || return 1
fi
cp -rp "${BASEDIR}/games/${game}" "${BASEDIR}/${WORKDIR}/overlay/opt/games/" || return 1
done < "${BASEDIR}/${gamelist}"
@@ -162,17 +165,22 @@ base-iso ()
[ "$?" -ne 0 ] && echo -e "\e[01;31mbase-iso: Exiting because no isomounts file was found\e[00m" && exit 1
sed -i "s|@ARCH@|${ARCH}|g" "${WORKDIR}/isomounts"
[ ! ${QUIET} == "y" ] && echo "base-iso: Making initrd image"
- git clone git://projects.archlinux.org/archiso.git archiso-temp &>/dev/null
- cp -r archiso-temp/archiso/{hooks,install} ${BASEDIR}/${WORKDIR}/root-image/lib/initcpio/
+ git clone git://projects.archlinux.org/archiso.git archiso-temp &>/dev/null || return 1
+ cp -r archiso-temp/archiso/{hooks,install} ${BASEDIR}/${WORKDIR}/root-image/lib/initcpio/ || return 1
# TODO: Hacky workaround until klibc-utils fstype supports udf
- sed '/if mount -r -t "${_FSTYPE}" \/dev\/archiso \/bootmnt >\/dev\/null 2>&1; then/c\if mount -r -t udf \/dev\/archiso \/bootmnt >\/dev\/null 2>&1; then' -i ${BASEDIR}/${WORKDIR}/root-image/lib/initcpio/hooks/archiso || return 1
+ #sed '/if mount -r -t "${_FSTYPE}" \/dev\/archiso \/bootmnt >\/dev\/null 2>&1; then/c\if mount -r -t udf \/dev\/archiso \/bootmnt >\/dev\/null 2>&1; then' -i ${BASEDIR}/${WORKDIR}/root-image/lib/initcpio/hooks/archiso || return 1
rm -r archiso-temp
- cp ${BASEDIR}/mkinitcpio.conf ${BASEDIR}/${WORKDIR}/root-image/etc/mkinitcpio.conf
- cp ${BASEDIR}/mkinitcpio-lanboot.conf ${BASEDIR}/${WORKDIR}/root-image/etc/mkinitcpio-lanboot.conf
- chroot ${BASEDIR}/${WORKDIR}/root-image mkinitcpio -c /etc/mkinitcpio.conf -k ${KVER} -g "/lglive.img" &>/dev/null
- mv ${BASEDIR}/${WORKDIR}/root-image/lglive.img "${BASEDIR}/${WORKDIR}/iso/boot/lglive.img" &>/dev/null
- chroot ${BASEDIR}/${WORKDIR}/root-image mkinitcpio -c /etc/mkinitcpio-lanboot.conf -k ${KVER} -g "/lglivelanboot.img" &>/dev/null
- mv ${BASEDIR}/${WORKDIR}/root-image/lglivelanboot.img "${BASEDIR}/${WORKDIR}/iso/boot/lglivelanboot.img" &>/dev/null
+ cp ${BASEDIR}/mkinitcpio.conf ${BASEDIR}/${WORKDIR}/root-image/etc/mkinitcpio.conf || return 1
+ cp ${BASEDIR}/mkinitcpio-lanboot.conf ${BASEDIR}/${WORKDIR}/root-image/etc/mkinitcpio-lanboot.conf || return 1
+ if [ ${VERBOSE} == "y" ]; then
+ chroot ${BASEDIR}/${WORKDIR}/root-image mkinitcpio -c /etc/mkinitcpio.conf -k ${KVER} -g "/lglive.img" || return 1
+ chroot ${BASEDIR}/${WORKDIR}/root-image mkinitcpio -c /etc/mkinitcpio-lanboot.conf -k ${KVER} -g "/lglivelanboot.img" || return 1
+ else
+ chroot ${BASEDIR}/${WORKDIR}/root-image mkinitcpio -c /etc/mkinitcpio.conf -k ${KVER} -g "/lglive.img" &>/dev/null || return 1
+ chroot ${BASEDIR}/${WORKDIR}/root-image mkinitcpio -c /etc/mkinitcpio-lanboot.conf -k ${KVER} -g "/lglivelanboot.img" &>/dev/null || return 1
+ fi
+ mv ${BASEDIR}/${WORKDIR}/root-image/lglive.img "${BASEDIR}/${WORKDIR}/iso/boot/lglive.img" &>/dev/null ||return 1
+ mv ${BASEDIR}/${WORKDIR}/root-image/lglivelanboot.img "${BASEDIR}/${WORKDIR}/iso/boot/lglivelanboot.img" &>/dev/null || return 1
sed -i "s/^CacheDir/\#CacheDir/" "${BASEDIR}/${WORKDIR}/root-image/etc/pacman.conf"
sed -i "/localrepo/,+2d" "${BASEDIR}/${WORKDIR}/root-image/etc/pacman.conf"
[ "$?" -ne 0 ] && echo -e "\e[01;31mbase-iso: Exiting due to error while running mkinitcpio\e[00m" && exit 1
@@ -250,7 +258,6 @@ build ()
else
mkarchiso -f -v -L "${NAME}-${VER//./}" -P "Linux-Gamers <live.linux-gamers.net>" -A "live.linux-gamers" -p "${BOOTLOADER}" "${imagetype}" "${WORKDIR}" "${FULLNAME}-${edition}.${imagetype}" &> /dev/null
fi
- [ ! ${QUIET} == "y" ] && [ ${BOOTLOADER} == "syslinux" ] && echo "build: Making isohybrid" && isohybrid -offset 1 "${FULLNAME}-${edition}.${imagetype}" && echo "build: Made isohybrid" || return 1
[ "$?" -ne 0 ] && echo -e "\e[01;31mbuild: Exiting due to error while running mkarchiso\e[00m" && exit 1
[ ! ${QUIET} == "y" ] && echo "===== Finished building final image for target: ${TARGET} ====="
return 0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -2,5 +2,5 @@
MODULES=""
BINARIES=""
FILES=""
-HOOKS="base archiso-early udev archiso pata scsi sata usb fw pcmcia filesystems usbinput"
+HOOKS="base udev archiso pata scsi sata usb fw pcmcia filesystems usbinput"
COMPRESSION="lzma"
View
@@ -4,6 +4,6 @@ aufs / aufs noauto 0 0
none /dev/pts devpts defaults 0 0
none /dev/shm tmpfs defaults 0 0
-/dev/cdrom /bootcd iso9660 ro,user,noauto 0 0
+#/dev/cdrom /bootcd iso9660 ro,user,noauto 0 0
### Auto generated entries get added here:
View
@@ -1,4 +1,3 @@
-base-devel
aif
alsa-lib
alsa-oss
@@ -7,6 +6,7 @@ arora
aufs2
aufs2-util
b43-fwcutter
+base
bash
bin86
blackbox
@@ -102,7 +102,6 @@ rt2x00-rt61-fw
rt2x00-rt71w-fw
sed
shadow
-squashfs-tools
sudo
sysfsutils
syslinux
File renamed without changes.

0 comments on commit ffa5f68

Please sign in to comment.