[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-60-g7171c2d

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 7171c2d6eb41dd722e03b79aaaa1e7b5c3765ab2
Author: Ben Armstrong <synrg at debian.org>
Date:   Mon Dec 28 10:25:36 2009 -0400

    Extra repos in chroot, not binary; pinning for testing > sid

diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
new file mode 100644
index 0000000..e83169e
--- /dev/null
+++ b/config/chroot_apt/preferences
@@ -0,0 +1,8 @@
+Package: *
+Pin: release a=testing
+Pin-Priority: 900
+
+Package: *
+Pin: release a=unstable
+Pin-Priority: 800
+
diff --git a/config/chroot_sources/sid-snapshots.binary b/config/chroot_sources/sid-snapshots.binary
deleted file mode 100644
index 483267b..0000000
--- a/config/chroot_sources/sid-snapshots.binary
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://daniel.debian-maintainers.org/ sid/snapshots main contrib non-free
-deb-src http://daniel.debian-maintainers.org/ sid/snapshots main contrib non-free
diff --git a/config/chroot_sources/sid-snapshots.binary.gpg b/config/chroot_sources/sid-snapshots.binary.gpg
deleted file mode 100644
index 3456d93..0000000
--- a/config/chroot_sources/sid-snapshots.binary.gpg
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQINBEqdKDABEADBLagcqCJZea/V62l/ow6qo0gjmMOSiF8oi5HJmFfHoX1hogTP
-JCaemzc8/CVBQ9ryLRyIfxVT367tBHweWFIEJZUnNINFYLsQms8WOex5fKZkRrox
-ROsKDh+zeaUWeKEEG9Z9SAvpvPS50L3KnwKiZZE1tFY4LitVDapw+C7ElmLrvdhq
-O9Gg6TohO7Q6hNA266InZggnNFI2Fs6GmfdcxlSc3rcBJj60/5imtXu1b/zO2EgX
-1Mhc4DRFRC2N/ywEB4XzF7Dc/EdFbhyQt+et3u6Hr0OqNBZfN61vCYj4G/+3hj6m
-/FUkz2SUrXpSIf7uBxZwGRWq6En9GKDSqJjVFuNfRmAhSO6ywiZ+3bbOu93rGDl0
-RGxmst19GrBFv1fgAWv//UTf1f3461poFQBsbEQ2FhJt+06x5x6sm6uKUeznC5Gr
-DihYcXgAPWVHmxuDtGJUgwSQCBCmEPZVI/25pvR1uxxOXldXv5glaSeslZjCGdzv
-72g2sV5ACjWsAaLAJCZcp9BtgImTTYqV3CEPsWIY/hqzHLFcpfpok4CkPNHzQVrg
-VaGSH2KqvUXl5joyuKmF77hqtWoDxSU8urVbcij/TYejoo99BgpEuq1yPwaU7Sdy
-ZvBO+TIxO28/JldgTJ0SKdYUyyaV8fBiwMzFsbjAYa06X0barbsUpg01zQARAQAB
-tGdkZWJpYW4tbWFpbnRhaW5lcnMub3JnIEFyY2hpdmUgQXV0b21hdGljIFNpZ25p
-bmcgS2V5ICgyMDA5MDkwMSkgPHN5c2FkbWluQGxpc3RzLmRlYmlhbi1tYWludGFp
-bmVycy5vcmc+iQI9BBMBCAAnBQJKnSgwAhsDBQkAybWABQsJCAcDBRUKCQgLBRYC
-AwEAAh4BAheAAAoJEEUyUiR/CNd+gigP/iAWMn2xLgFQqoaDPzq1vdewll6WDcfi
-XQ7AW5wwrhwr5YMOdX+MQfrIIqwYhnEHHpkky7a1jzkYWTm2h0217Ev7AZ5fBl47
-vtWOcFU57BKgl0lUBRcYNmSqWNCsuw5iPuBgY/bD22aRO+JHVj5lcaK2JKUiHtBd
-oML9uqNbahQTlIW1c7r66pOENwDjWuqdfYkh4bRU4/gAEanKpViqT30NwUkVQcBD
-wVH73vV9BoFUEtPxPrZw431wAxKgO4fJpz0iWXx0yFkpnLqUAhtwv/Befd4yE8Fy
-q4Iv7ci9+oVROQ6R5Yd2kaadtwC498TPncUzr07gPXR/q1j2/K7kJuTlUyVv/z5U
-p63/uOtbRrX/9vC8VCIaXfi2JXpMhzs9zN6mjjPCLhmoC50h234SGrWHJ0zJPYW5
-TDDeOBff3nv4mXdZ5/OyYTdIZkI7YOfcGzA1Z80kha2FBhAYWmyxUld0PDqeaTRd
-A2+xjf1e20rs6ZN9+Hwb7kiJeJhhClsXybMfSyRToSS2lbLzzPt0fX5QSMwCH1LU
-eASRVH7yIruYbUWRyIlT8vsXwSQeYjEo35K8+qPII3uH+zkpUY0L0XQZcwd/qap0
-t7gKexWh3jaMJUhbqGxgOxtBQ879xKxRuL9fVmF3vovn58mlIRabFYyvQRRNVD8X
-ZkV6m4jPd7dw
-=qjHD
------END PGP PUBLIC KEY BLOCK-----
diff --git a/config/chroot_sources/sid-snapshots.chroot b/config/chroot_sources/sid-snapshots.chroot
deleted file mode 120000
index 5ee909c..0000000
--- a/config/chroot_sources/sid-snapshots.chroot
+++ /dev/null
@@ -1 +0,0 @@
-sid-snapshots.binary
\ No newline at end of file
diff --git a/config/chroot_sources/sid-snapshots.chroot b/config/chroot_sources/sid-snapshots.chroot
new file mode 100644
index 0000000..483267b
--- /dev/null
+++ b/config/chroot_sources/sid-snapshots.chroot
@@ -0,0 +1,2 @@
+deb http://daniel.debian-maintainers.org/ sid/snapshots main contrib non-free
+deb-src http://daniel.debian-maintainers.org/ sid/snapshots main contrib non-free
diff --git a/config/chroot_sources/sid-snapshots.chroot.gpg b/config/chroot_sources/sid-snapshots.chroot.gpg
deleted file mode 120000
index 7fa17c2..0000000
--- a/config/chroot_sources/sid-snapshots.chroot.gpg
+++ /dev/null
@@ -1 +0,0 @@
-sid-snapshots.binary.gpg
\ No newline at end of file
diff --git a/config/chroot_sources/sid-snapshots.chroot.gpg b/config/chroot_sources/sid-snapshots.chroot.gpg
new file mode 100644
index 0000000..3456d93
--- /dev/null
+++ b/config/chroot_sources/sid-snapshots.chroot.gpg
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+mQINBEqdKDABEADBLagcqCJZea/V62l/ow6qo0gjmMOSiF8oi5HJmFfHoX1hogTP
+JCaemzc8/CVBQ9ryLRyIfxVT367tBHweWFIEJZUnNINFYLsQms8WOex5fKZkRrox
+ROsKDh+zeaUWeKEEG9Z9SAvpvPS50L3KnwKiZZE1tFY4LitVDapw+C7ElmLrvdhq
+O9Gg6TohO7Q6hNA266InZggnNFI2Fs6GmfdcxlSc3rcBJj60/5imtXu1b/zO2EgX
+1Mhc4DRFRC2N/ywEB4XzF7Dc/EdFbhyQt+et3u6Hr0OqNBZfN61vCYj4G/+3hj6m
+/FUkz2SUrXpSIf7uBxZwGRWq6En9GKDSqJjVFuNfRmAhSO6ywiZ+3bbOu93rGDl0
+RGxmst19GrBFv1fgAWv//UTf1f3461poFQBsbEQ2FhJt+06x5x6sm6uKUeznC5Gr
+DihYcXgAPWVHmxuDtGJUgwSQCBCmEPZVI/25pvR1uxxOXldXv5glaSeslZjCGdzv
+72g2sV5ACjWsAaLAJCZcp9BtgImTTYqV3CEPsWIY/hqzHLFcpfpok4CkPNHzQVrg
+VaGSH2KqvUXl5joyuKmF77hqtWoDxSU8urVbcij/TYejoo99BgpEuq1yPwaU7Sdy
+ZvBO+TIxO28/JldgTJ0SKdYUyyaV8fBiwMzFsbjAYa06X0barbsUpg01zQARAQAB
+tGdkZWJpYW4tbWFpbnRhaW5lcnMub3JnIEFyY2hpdmUgQXV0b21hdGljIFNpZ25p
+bmcgS2V5ICgyMDA5MDkwMSkgPHN5c2FkbWluQGxpc3RzLmRlYmlhbi1tYWludGFp
+bmVycy5vcmc+iQI9BBMBCAAnBQJKnSgwAhsDBQkAybWABQsJCAcDBRUKCQgLBRYC
+AwEAAh4BAheAAAoJEEUyUiR/CNd+gigP/iAWMn2xLgFQqoaDPzq1vdewll6WDcfi
+XQ7AW5wwrhwr5YMOdX+MQfrIIqwYhnEHHpkky7a1jzkYWTm2h0217Ev7AZ5fBl47
+vtWOcFU57BKgl0lUBRcYNmSqWNCsuw5iPuBgY/bD22aRO+JHVj5lcaK2JKUiHtBd
+oML9uqNbahQTlIW1c7r66pOENwDjWuqdfYkh4bRU4/gAEanKpViqT30NwUkVQcBD
+wVH73vV9BoFUEtPxPrZw431wAxKgO4fJpz0iWXx0yFkpnLqUAhtwv/Befd4yE8Fy
+q4Iv7ci9+oVROQ6R5Yd2kaadtwC498TPncUzr07gPXR/q1j2/K7kJuTlUyVv/z5U
+p63/uOtbRrX/9vC8VCIaXfi2JXpMhzs9zN6mjjPCLhmoC50h234SGrWHJ0zJPYW5
+TDDeOBff3nv4mXdZ5/OyYTdIZkI7YOfcGzA1Z80kha2FBhAYWmyxUld0PDqeaTRd
+A2+xjf1e20rs6ZN9+Hwb7kiJeJhhClsXybMfSyRToSS2lbLzzPt0fX5QSMwCH1LU
+eASRVH7yIruYbUWRyIlT8vsXwSQeYjEo35K8+qPII3uH+zkpUY0L0XQZcwd/qap0
+t7gKexWh3jaMJUhbqGxgOxtBQ879xKxRuL9fVmF3vovn58mlIRabFYyvQRRNVD8X
+ZkV6m4jPd7dw
+=qjHD
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/scripts/clean b/scripts/clean
index 90634ac..bfed24c 100755
--- a/scripts/clean
+++ b/scripts/clean
@@ -4,6 +4,7 @@ rm -f build.log
 
 # Remove generated files
 rm -f config/binary config/bootstrap config/chroot config/common config/source
+rm -f config/chroot_sources/sid.chroot
 
 # Remove empty directories in config tree
 if ls config/*/ > /dev/null 2>&1
diff --git a/scripts/config b/scripts/config
index b12b0b6..23f2008 100755
--- a/scripts/config
+++ b/scripts/config
@@ -19,3 +19,5 @@ lh config noautoconfig \
 	--binary-indices none \
 	--packages-lists "standard" \
 	${@}
+echo -e "deb $MIRROR_DEBIAN sid main\ndeb-src $MIRROR_DEBIAN sid main" >config/chroot_sources/sid.chroot
+

-- 
A live-helper based Debian live & installer image for the Eee PC.