[SCM] debian-live/config-webc branch, master, updated. 81f42649c92f016d6dba528214b765d359e506a2
Kai Hendry
hendry at iki.fi
Sun Jan 25 18:18:14 UTC 2009
The following commit has been merged in the master branch:
commit 81f42649c92f016d6dba528214b765d359e506a2
Author: Kai Hendry <hendry at iki.fi>
Date: Sun Jan 11 19:15:55 2009 +0100
moved to restricted.debian.net
got rid of chroot_local-packages
libnspr4-0d is now in lenny
diff --git a/mini/config/binary b/mini/config/binary
index f5e6215..6895f00 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -28,11 +28,6 @@ LH_BOOTLOADER="grub"
# (Default: enabled)
#LH_CHECKSUMS="enabled"
-# ${LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: enabled)
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-#LH_CHROOT_BUILD="enabled"
-
# $LH_DEBIAN_INSTALLER: set debian-installer
# (Default: disabled)
LH_DEBIAN_INSTALLER="live"
diff --git a/mini/config/chroot b/mini/config/chroot
deleted file mode 120000
index 4cf3643..e1326b6
--- a/mini/config/chroot
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot
\ No newline at end of file
diff --git a/mini/config/chroot b/mini/config/chroot
new file mode 100644
index 4cf3643..e1326b6
--- /dev/null
+++ b/mini/config/chroot
@@ -0,0 +1,4 @@
+LH_UNION_FILESYSTEM="aufs"
+LH_LINUX_FLAVOURS="486"
+LH_PACKAGES_LISTS="webconverger"
+LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6 squashfs-modules-2.6"
diff --git a/mini/config/chroot_local-packages b/mini/config/chroot_local-packages
deleted file mode 120000
index 48af5e9..0000000
--- a/mini/config/chroot_local-packages
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_local-packages
\ No newline at end of file
diff --git a/mini/config/chroot_local-packageslists/webconverger b/mini/config/chroot_local-packageslists/webconverger
deleted file mode 100644
index 4abc5ec..dc9ae27
--- a/mini/config/chroot_local-packageslists/webconverger
+++ /dev/null
@@ -1,67 +0,0 @@
-# Webconverger's main configuration hendry at webconverger.com
-# Minimal
-eject file sudo
-
-# Standard
-console-common kbd locales
-
-# X11
-xorg xresprobe discover menu
-
-# Sound
-alsa-base alsa-oss alsa-utils
-
-# For upgrade, firewall et al. features
-live-initscripts
-
-webconverger-base
-webconverger-archive-keyring
-
-iceweasel
-
-# Window manager
-dwm
-
-# For the background
-xloadimage
-
-# fonts
-ttf-dejavu
-ttf-gentium
-
-# pdf
-xpdf mozplugger
-
-# bootscreen
-splashy
-
-########## non-free software
-flashplugin-nonfree
-openssl
-ca-certificates
-libcurl3
-
-#myspell-en-us
-myspell-en-gb
-
-# For locking down the browser
-#iceweasel-webcnoaddressbar
-
-#Usually just
-iceweasel-webconverger
-#libwebkit-1.0-1
-
-# httpd - http://localhost services
-nostromo
-
-# wireless
-wpasupplicant
-wireless-tools
-
-firmware-bnx2
-firmware-iwlwifi
-firmware-qlogic
-firmware-ralink
-
-# bloat just for setting the volume. argh!
-alsa-utils
diff --git a/mini/config/chroot_local-packageslists/webconverger b/mini/config/chroot_local-packageslists/webconverger
new file mode 120000
index 4abc5ec..dc9ae27
--- /dev/null
+++ b/mini/config/chroot_local-packageslists/webconverger
@@ -0,0 +1 @@
+../../../webconverger/config/chroot_local-packageslists/webconverger
\ No newline at end of file
diff --git a/webconverger/config/chroot_local-packages/flashplugin-nonfree_2.4_i386.deb b/webconverger/config/chroot_local-packages/flashplugin-nonfree_2.4_i386.deb
deleted file mode 100644
index 6084bef..0000000
Binary files a/webconverger/config/chroot_local-packages/flashplugin-nonfree_2.4_i386.deb and /dev/null differ
diff --git a/webconverger/config/chroot_local-packages/libnspr4-0d_4.7.1-4_i386.deb b/webconverger/config/chroot_local-packages/libnspr4-0d_4.7.1-4_i386.deb
deleted file mode 100644
index ac1f05e..0000000
Binary files a/webconverger/config/chroot_local-packages/libnspr4-0d_4.7.1-4_i386.deb and /dev/null differ
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index 4b8509d..b6cb115 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -18,7 +18,6 @@ webconverger-base
webconverger-archive-keyring
iceweasel
-iceweasel-webconverger
# Window manager
dwm
@@ -36,7 +35,29 @@ xpdf mozplugger
# bootscreen
splashy
-########## non-free software
-flashplugin-nonfree
+flash-player
+openssl
+ca-certificates
+libcurl3
+
+#myspell-en-us
+myspell-en-gb
+# For locking down the browser
+#iceweasel-webcnoaddressbar
+
+#Usually just
+iceweasel-webconverger
+#libwebkit-1.0-1
+
+# httpd - http://localhost services
nostromo
+
+# wireless
+wpasupplicant
+wireless-tools
+
+firmware-bnx2
+firmware-iwlwifi
+firmware-qlogic
+firmware-ralink
diff --git a/webconverger/config/chroot_sources/restricted.binary b/webconverger/config/chroot_sources/restricted.binary
new file mode 120000
index 0000000..c02bb41
--- /dev/null
+++ b/webconverger/config/chroot_sources/restricted.binary
@@ -0,0 +1 @@
+restricted.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/restricted.binary.gpg b/webconverger/config/chroot_sources/restricted.binary.gpg
new file mode 120000
index 0000000..b7a9c13
--- /dev/null
+++ b/webconverger/config/chroot_sources/restricted.binary.gpg
@@ -0,0 +1 @@
+restricted.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/restricted.chroot b/webconverger/config/chroot_sources/restricted.chroot
new file mode 100644
index 0000000..ffa3a1c
--- /dev/null
+++ b/webconverger/config/chroot_sources/restricted.chroot
@@ -0,0 +1,2 @@
+deb http://restricted.debian.net/debian/ ./
+deb-src http://restricted.debian.net/debian/ ./
diff --git a/webconverger/config/chroot_sources/live-snapshots.binary.gpg b/webconverger/config/chroot_sources/restricted.chroot.gpg
similarity index 98%
copy from webconverger/config/chroot_sources/live-snapshots.binary.gpg
copy to webconverger/config/chroot_sources/restricted.chroot.gpg
index d4cc18c..278d2f9 100644
--- a/webconverger/config/chroot_sources/live-snapshots.binary.gpg
+++ b/webconverger/config/chroot_sources/restricted.chroot.gpg
@@ -1,5 +1,5 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
mQGiBEd7qZgRBAC3GlfYpbpKwxb1D7wKRymb8TV9bt97G/hTfCpjlU1k8KAbdZf/
Sq0XtsS3nMePn1ex2IfkfwEKv/FTsO4zb/vmKVwbCjXmpepFGbEJ+8yD+JT6aLH9
diff --git a/webconverger/config/chroot_sources/webc.chroot b/webconverger/config/chroot_sources/webc.chroot
index 2240a1f..d667b3b 100644
--- a/webconverger/config/chroot_sources/webc.chroot
+++ b/webconverger/config/chroot_sources/webc.chroot
@@ -1,4 +1,2 @@
deb http://debian.webconverger.com/ lenny/
deb-src http://debian.webconverger.com/ lenny/
-
-#deb ftp://ftp.debian.org/debian experimental main
--
debian-live/config-webc
More information about the debian-live-changes
mailing list