X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2b34935d2a755953f759811bf4437ba266f65efc..250089c5e97cc8490a42e9885e429ff217dbd533:/target/imagebuilder/files/Makefile

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index aa5b97150..f73642b6a 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -1,6 +1,6 @@
 # Makefile for OpenWrt
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -79,24 +79,14 @@ info: FORCE
 $(TOPDIR)/tmp/ipkg.conf: FORCE
 	@mkdir -p $(TOPDIR)/tmp
 	@echo 'dest root /' > $@
-	@echo 'src packages file:$(TOPDIR)/packages' >> $@
+	@echo 'src packages file:$(PACKAGE_DIR)' >> $@
 
 BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(PACKAGES) $($(PROFILE)_PACKAGES) kernel)
-ifeq ($(KERNEL),2.4)
-BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD)-$(KERNEL),$(BUILD_PACKAGES))
-else
-BUILD_PACKAGES:=$(patsubst base-files,base-files-$(BOARD),$(BUILD_PACKAGES))
-endif
 # "-pkgname" in the package list means remove "pkgname" from the package list
 BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES))
 
 image:
-	if [ -z "$($(PROFILE)_NAME)" ]; then \
-		echo Profile $(PROFILE) not found.; \
-		echo 'Use "make info" to get a list of available target profiles'; \
-		false; \
-	fi
-	echo 'Building images for $(BOARD) - $($(PROFILE)_NAME)'
+	echo 'Building images for $(BOARD)$(if $($(PROFILE)_NAME), - $($(PROFILE)_NAME))'
 	echo 'Packages: $(BUILD_PACKAGES)'
 	echo
 	rm -rf $(TARGET_DIR)
@@ -112,7 +102,9 @@ endif
 package_index: $(TOPDIR)/tmp/ipkg.conf FORCE
 	@echo
 	@echo Building package index...
-	(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) >/dev/null 2>/dev/null
+	(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \
+		gzip -9c Packages > Packages.gz \
+	) >/dev/null 2>/dev/null
 	$(IPKG) update
 
 package_install: FORCE
@@ -129,10 +121,10 @@ package_postinst: FORCE
 	@echo
 	@echo Activating init scripts
 	@( \
-		cd $(BUILD_DIR)/root; \
+		cd $(TARGET_DIR); \
 		for script in ./etc/init.d/*; do \
 			grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
-			IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
+			IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \
 		done || true; \
 	)