From 549d297208d513385b2af94992661d3adbca8766 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Sun, 14 Oct 2012 21:01:21 +0200
Subject: packagelist compat fix
---
auto/config | 7 +++----
auto/functions/compat | 2 ++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/auto/config b/auto/config
index fd8ff85..74de21f 100755
--- a/auto/config
+++ b/auto/config
@@ -65,11 +65,10 @@ squeeze)
esac
;;
wheezy)
- LB_PACKAGES_LISTS+=" dragonfire"
LB_REPOSITORIES+=" dragonfire"
case $LB_ARCHITECTURE in
- amd64) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";;
- i386) LB_LINUX_PACKAGES="linux-image-3.2.0-30 linux-headers-3.2.0-30"; LB_LINUX_FLAVOURS="generic";;
+ amd64) LB_LINUX_PACKAGES="linux-image-extra-3.5.0-17 linux-headers-3.5.0-17"; LB_LINUX_FLAVOURS="generic";;
+ i386) LB_LINUX_PACKAGES="linux-image-extra-3.5.0-17 linux-headers-3.5.0-17"; LB_LINUX_FLAVOURS="generic";;
esac
;;
esac
@@ -81,7 +80,7 @@ grep -wq trinity <<<"$LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" trinity"
grep -wq -e virtualbox -e vbox <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" vbox"
grep -wq -e opera <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" opera"
grep -wq chrome <<<"$LB_PACKAGES $LB_PACKAGES_LISTS" && LB_REPOSITORIES+=" chrome"
-lb config noauto --linux-packages "$LB_LINUX_PACKAGES" --linux-flavours "$LB_LINUX_FLAVOURS" --repositories "$LB_REPOSITORIES" -p "$LB_PACKAGES_LISTS"
+lb config noauto --linux-packages "$LB_LINUX_PACKAGES" --linux-flavours "$LB_LINUX_FLAVOURS" --repositories "$LB_REPOSITORIES"
# Fetch kanotix-scripts if necessary
mkdir -p config/chroot_local-includes/usr/local/bin
diff --git a/auto/functions/compat b/auto/functions/compat
index 25a4a71..c3c1c3b 100644
--- a/auto/functions/compat
+++ b/auto/functions/compat
@@ -67,6 +67,8 @@ Compat_dir ()
Compat_packagelists()
{
+ LB_PACKAGE_LISTS="$1"
+ LB_PACKAGES_LISTS="$1"
mkdir -p config/package-lists
(
echo '# AUTOGENERATED from "lb config -p" option - DO NOT CHANGE'
--
cgit v1.0