From caf0f3cd0ede8ccfca7a959401426b4679925bae Mon Sep 17 00:00:00 2001
From: Kalle Vahlman <kalle.vahlman@movial.com>
Date: Thu, 8 Dec 2011 11:54:16 +0200
Subject: Drop old bluez packages, make hwpack depend on manifest

---
 Makefile | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 6145993..07b73d4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ MANIFEST := igloo.manifest
 VERSION := $(shell date +%Y%m%d)-custom
 ROOTFS := linaro-o-ubuntu-desktop-tar-20111026-0.tar.gz
 LIT_VERSION := 2011.10
-LOCAL_DEBS := $(wildcard repo/bluez*.deb)
+LOCAL_DEBS :=
 
 # Default target is a full build
 release: hwpack image
@@ -28,21 +28,9 @@ LDEBS=$(patsubst %.deb,--local-deb %.deb, $(LOCAL_DEBS))
 
 hwpack: $(HWPACK)
 
-$(HWPACK): $(LHC)
+$(HWPACK): $(LHC) $(MANIFEST)
 	$(LHC) --debug $(MANIFEST) $(VERSION) $(LDEBS)
 
-	# HACK: We need to replace some bluez packages so we get the version we want right now.
-	# --local-deb doing just that is a lie for some packages
-	$(LHR) -i -t $(HWPACK) \
-		-p repo/bluez_4.91-1ubuntu1snowball1_armel.deb \
-		-r bluez
-	$(LHR) -i -t $(HWPACK) \
-		-p repo/bluez-gstreamer_4.91-1ubuntu1snowball1_armel.deb \
-		-r bluez-gstreamer
-	$(LHR) -i -t $(HWPACK) \
-		-p repo/bluez-cups_4.91-1ubuntu1snowball1_armel.deb \
-		-r bluez-cups
-
 # Image
 
 $(ROOTFS):
-- 
cgit v1.2.3