diff --git a/RootStock-NG.sh b/RootStock-NG.sh
index 00dc2685a170c8708586ef4b908f138965513686..abc682be50405b6b6238d703baa4af8f0e885ac7 100755
--- a/RootStock-NG.sh
+++ b/RootStock-NG.sh
@@ -87,10 +87,11 @@ run_project () {
export_filename="${export_filename}"
distro="${distro}"
-
release="${release}"
dpkg_arch="${dpkg_arch}"
+ deb_components="${deb_components}"
+
apt_proxy="${apt_proxy}"
base_pkg_list="${base_pkg_list}"
diff --git a/base_image.sh b/base_image.sh
index d5a5707c48c8de5041464903b9abd52b6d5552b0..93dcab1361b7f7cb0898ec0e16babc3ac83e89a9 100755
--- a/base_image.sh
+++ b/base_image.sh
@@ -75,6 +75,8 @@ function minimal_armel {
release="${release}"
dpkg_arch="${dpkg_arch}"
+ deb_components="${deb_components}"
+
apt_proxy="${apt_proxy}"
base_pkg_list="${base_pkg_list}"
@@ -135,8 +137,6 @@ function quantal_release {
EXTRA=",${UBUNTU_ONLY},wvdial"
- COMPONENTS="${UBU_COMPONENTS}"
-
minimal_armel
compression
}
@@ -149,8 +149,6 @@ function raring_release {
EXTRA=",${UBUNTU_ONLY},wvdial"
- COMPONENTS="${UBU_COMPONENTS}"
-
minimal_armel
compression
}
@@ -163,8 +161,6 @@ function squeeze_release {
EXTRA=",isc-dhcp-client,uboot-mkimage,${DEBIAN_ONLY}"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
@@ -177,8 +173,6 @@ function wheezy_release {
EXTRA=",u-boot-tools,${DEBIAN_ONLY},lowpan-tools,wvdial"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
@@ -191,8 +185,6 @@ function sid_release {
EXTRA=",u-boot-tools,${DEBIAN_ONLY},lowpan-tools,wvdial"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
diff --git a/build_image.sh b/build_image.sh
index 9b740b7460eb70272fcc987ed32c3248fa18520e..b389b31bc332fac5517811f27e9376cd06e2c6cb 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -78,6 +78,8 @@ function minimal_armel {
release="${release}"
dpkg_arch="${dpkg_arch}"
+ deb_components="${deb_components}"
+
apt_proxy="${apt_proxy}"
base_pkg_list="${base_pkg_list}"
@@ -144,6 +146,8 @@ is_ubuntu () {
user_name="ubuntu"
password="temppwd"
full_name="Demo User"
+
+ deb_components="main universe multiverse"
}
is_debian () {
@@ -151,6 +155,8 @@ is_debian () {
user_name="debian"
password="temppwd"
full_name="Demo User"
+
+ deb_components="main contrib non-free"
}
#12.10
@@ -161,8 +167,6 @@ function quantal_release {
select_rcn-ee-net_kernel
EXTRA=",${UBUNTU_ONLY}"
- COMPONENTS="${UBU_COMPONENTS}"
-
minimal_armel
compression
}
@@ -175,8 +179,6 @@ function raring_release {
select_rcn-ee-net_kernel
EXTRA=",${UBUNTU_ONLY}"
- COMPONENTS="${UBU_COMPONENTS}"
-
minimal_armel
compression
}
@@ -189,8 +191,6 @@ function squeeze_release {
EXTRA=",isc-dhcp-client,${DEBIAN_ONLY}"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
@@ -203,8 +203,6 @@ function wheezy_release {
EXTRA=",${DEBIAN_ONLY},lowpan-tools"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
@@ -217,8 +215,6 @@ function sid_release {
EXTRA=",${DEBIAN_ONLY},lowpan-tools"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
diff --git a/imx_build_image.sh b/imx_build_image.sh
index 15b835ef866f5402b325c806ea09696868cc1925..620d481a42a21121d3bc1102a1c83bd97050358e 100755
--- a/imx_build_image.sh
+++ b/imx_build_image.sh
@@ -74,6 +74,8 @@ function minimal_armel {
release="${release}"
dpkg_arch="${dpkg_arch}"
+ deb_components="${deb_components}"
+
apt_proxy="${apt_proxy}"
base_pkg_list="${base_pkg_list}"
@@ -130,6 +132,8 @@ is_ubuntu () {
user_name="ubuntu"
password="temppwd"
full_name="Demo User"
+
+ deb_components="main universe multiverse"
}
is_debian () {
@@ -137,6 +141,8 @@ is_debian () {
user_name="debian"
password="temppwd"
full_name="Demo User"
+
+ deb_components="main contrib non-free"
}
function wheezy_release {
@@ -147,8 +153,6 @@ function wheezy_release {
EXTRA=",${DEBIAN_ONLY},lowpan-tools"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
diff --git a/lxde_image.sh b/lxde_image.sh
index 56080dc12654b66ce4e22abe7dfb9636f80334fb..81482a77c2d42aaa5d1b2f451a18917feceea8b7 100755
--- a/lxde_image.sh
+++ b/lxde_image.sh
@@ -74,6 +74,8 @@ function minimal_armel {
release="${release}"
dpkg_arch="${dpkg_arch}"
+ deb_components="${deb_components}"
+
apt_proxy="${apt_proxy}"
base_pkg_list="${base_pkg_list}"
@@ -152,8 +154,6 @@ function quantal_release {
select_rcn-ee-net_kernel
EXTRA=",${UBUNTU_ONLY}"
- COMPONENTS="${UBU_COMPONENTS}"
-
minimal_armel
compression
}
@@ -166,8 +166,6 @@ function raring_release {
select_rcn-ee-net_kernel
EXTRA=",${UBUNTU_ONLY}"
- COMPONENTS="${UBU_COMPONENTS}"
-
minimal_armel
compression
}
@@ -180,8 +178,6 @@ function squeeze_release {
EXTRA=",isc-dhcp-client,${DEBIAN_ONLY}"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
@@ -194,8 +190,6 @@ function wheezy_release {
EXTRA=",${DEBIAN_ONLY},lowpan-tools"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
@@ -208,8 +202,6 @@ function sid_release {
EXTRA=",${DEBIAN_ONLY},lowpan-tools"
USER_LOGIN="debian"
- COMPONENTS="${DEB_COMPONENTS}"
-
minimal_armel
compression
}
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 535af0a46c95f3d4dbc32b4059dc41afd2184dc0..c44d348180de89d464e794acbf4b67756d1628ff 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -67,6 +67,17 @@ check_defines () {
esac
fi
+ if [ ! "${deb_components}" ] ; then
+ case "${distro}" in
+ debian)
+ deb_components="main contrib non-free"
+ ;;
+ ubuntu)
+ deb_components="main universe multiverse"
+ ;;
+ esac
+ fi
+
if [ ! "${user_name}" ] ; then
user_name="${distro}"
echo "user_name: undefined using: [${user_name}]"
@@ -129,17 +140,6 @@ echo "Log: Running: debootstrap second-stage in [${tempdir}]"
sudo chroot ${tempdir} debootstrap/debootstrap --second-stage
report_size
-case "${distro}" in
-debian)
- deb_components="main contrib non-free"
- deb_mirror="ftp.us.debian.org/debian/"
- ;;
-ubuntu)
- deb_components="main universe multiverse"
- deb_mirror="ports.ubuntu.com/ubuntu-ports/"
- ;;
-esac
-
case "${release}" in
squeeze|quantal)
echo "deb http://${deb_mirror} ${release} ${deb_components}"| sudo tee ${tempdir}/etc/apt/sources.list >/dev/null