summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2011-03-19 03:04:32 +0100
committerAndreas Loibl <andreas@andreas-loibl.de>2011-03-19 03:05:18 +0100
commitf76571da2603cfe7f83e15cd99f2304265483444 (patch)
treea56618acc83deb8eaf39b0c83319c33a5e21b8e2
parent9906c36f15973133a1b954256a92ebbd96ab11e7 (diff)
downloadkanotix-f76571da2603cfe7f83e15cd99f2304265483444.zip
kanotix-f76571da2603cfe7f83e15cd99f2304265483444.tar.gz
added trinity repository
-rwxr-xr-xauto/config8
-rw-r--r--config/repositories/trinity5
-rw-r--r--config/repositories/trinity.gpg13
3 files changed, 25 insertions, 1 deletions
diff --git a/auto/config b/auto/config
index fc650a5..89cce81 100755
--- a/auto/config
+++ b/auto/config
@@ -24,7 +24,7 @@ lb config noauto \
--bootappend-live 'utc=no timezone=Europe/Berlin locales=de keyboard-layouts=de keyboard-variant=nodeadkeys splash' \
--distribution squeeze \
--archive-areas "main contrib non-free" \
- --repositories "live.debian.net acritox excalibur hellfire lo wine-ppa burg" \
+ --repositories "live.debian.net acritox excalibur hellfire lo wine-ppa" \
--security true \
--checksums md5 \
--syslinux-timeout 5 \
@@ -44,7 +44,9 @@ lb config noauto \
# --hostname Kanotix \
# --username kanotix \
+. config/binary
. config/bootstrap
+. config/chroot
# architecture depending stuff (e.g. kernel)
case $LB_ARCHITECTURE in
@@ -64,6 +66,10 @@ case $LB_ARCHITECTURE in
;;
esac
+[ "$LB_BOOTLOADER" = "burg" ] && LB_REPOSITORIES+=" burg"
+grep -wq trinity <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" trinity"
+lb config noauto --repositories "$LB_REPOSITORIES"
+
# Fetch kanotix-scripts if necessary
mkdir -p config/chroot_local-includes/usr/local/bin
grep -oe '^[^ #]*' scripts.urls | wget -i- -N -q -P config/chroot_local-includes/usr/local/bin
diff --git a/config/repositories/trinity b/config/repositories/trinity
new file mode 100644
index 0000000..a6e79db
--- /dev/null
+++ b/config/repositories/trinity
@@ -0,0 +1,5 @@
+# Trinity Desktop
+deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/debian squeeze main
+deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/debian squeeze main
+deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-builddeps/debian squeeze main
+deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-builddeps/debian squeeze main
diff --git a/config/repositories/trinity.gpg b/config/repositories/trinity.gpg
new file mode 100644
index 0000000..d703b13
--- /dev/null
+++ b/config/repositories/trinity.gpg
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+mI0ETBb5vwEEANKouZGon6I/wxSh8LO49a/JRCsEI/wiXMBDw/eOa+AF6onugRs3
+9XYo0fPuSu5OzJW+Mjt7FD+IYBwrqWH8kqshXHEpiPfVh1uEa0lSDmDoEx6BEude
+CVvt/tc2x4YDzwxdChQ5X/Bwhq/kfTXCUXuNLmT1rifJiujeuISd+06VABEBAAG0
+JlF1aWNrQnVpbGQgVHJpbml0eSBEZXNrdG9wIEVudmlyb25tZW50iLgEEwECACIF
+AkwW+b8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEPx3E8rhjjQu30E
+AJpz2+fjYXvpQOGIN3w2BoKBF0jVROS+xPs1dZMzHhvdwQR6/2KI8RVZ7M+VnnJi
+Y0VaYf6jYd08S4SsX5LuDuiCxxkMkno7RRdEOdsnxfiqGnv2EjvQEM3trflQzIBi
+9wc+mh9XeI7OZNke/KryAqRTLMdYlTIlv2XNAy/bXFS4
+=qpbT
+-----END PGP PUBLIC KEY BLOCK-----