summaryrefslogtreecommitdiff
path: root/alpine.mk
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-03-03 11:05:07 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-03-03 11:05:07 +0000
commitcd5e0181517577a0c15d8f474a464f7464230080 (patch)
treeb901fee2807981b8b95a5c077048689b4f413cfe /alpine.mk
parent098a02161f967dc44e8aff68b0045a3412a9a1bb (diff)
downloadabuild-cd5e0181517577a0c15d8f474a464f7464230080.tar.gz
abuild-cd5e0181517577a0c15d8f474a464f7464230080.tar.bz2
abuild-cd5e0181517577a0c15d8f474a464f7464230080.tar.xz
abuild-cd5e0181517577a0c15d8f474a464f7464230080.zip
alpine.mk: use/build system repository if possible
Diffstat (limited to 'alpine.mk')
-rwxr-xr-xalpine.mk41
1 files changed, 25 insertions, 16 deletions
diff --git a/alpine.mk b/alpine.mk
index 627d3eb..1da1de5 100755
--- a/alpine.mk
+++ b/alpine.mk
@@ -16,7 +16,7 @@ APKDIRS ?= $(REPOS_DIR)/*/
ISO ?= $(ALPINE_NAME)-$(ALPINE_RELEASE)-$(ALPINE_ARCH).iso
ISO_LINK ?= $(ALPINE_NAME).iso
ISO_DIR := $(DESTDIR)/isofs
-REPOS_DIR := $(ISO_DIR)/packages
+REPOS_DIR ?= /var/lib/packages
# limitations for find_apk:
# can not be a subpackage
@@ -42,9 +42,10 @@ BUSYBOX_APK := $(call find_apk,busybox)
APK_TOOLS_APK := $(call find_apk,apk-tools)
SYSLINUX_APK := $(call find_apk,syslinux)
STRACE_APK := $(call find_apk,strace)
+ACCT_APK := $(call find_apk,acct)
-SOURCE_APKBUILDS := $(wildcard $(addprefix $(APORTS_DIR)/,$(REPOS))/*/APKBUILD)
-SOURCE_APKS = $(wildcard $(APKDIRS)/*apk)
+#SOURCE_APKBUILDS := $(wildcard $(addprefix $(APORTS_DIR)/,$(REPOS))/*/APKBUILD)
+#SOURCE_APKS = $(wildcard $(APKDIRS)/*apk)
#APK_BIN := $(shell which apk)
#ifneq ($(words $(KERNEL_APK) $(MODULE_APK) $(ALPINEBASELAYOUT_APK) $(UCLIBC_APK) $(BUSYBOX_APK) $(APK_TOOLS_APK)),6)
@@ -131,7 +132,7 @@ INITFS_DIR := $(DESTDIR)/initfs
INITFS_MODDIR := $(INITFS_DIR)/lib/modules/$(KERNEL)
INITFS_MODDIRSTAMP := $(DESTDIR)/stamp.initfs.modules
-INITFS_APKS := $(UCLIBC_APK) $(BUSYBOX_APK)
+INITFS_APKS := $(UCLIBC_APK) $(BUSYBOX_APK) $(ACCT_APK)
INITFS_RAWBASEFILES := etc/mdev.conf etc/passwd etc/group etc/fstab \
etc/modules etc/modprobe.d/blacklist
INITFS_BASEFILES := $(addprefix $(INITFS_DIR)/, $(INITFS_RAWBASEFILES))
@@ -223,17 +224,25 @@ $(ISOLINUX_CFG):
@echo " append initrd=/boot/$(KERNEL_NAME).gz alpine_dev=cdrom:iso9660 modules=floppy quiet" >>$(ISOLINUX_CFG)
ISO_KERNEL := $(ISO_DIR)/boot/$(KERNEL_NAME)
-#ISO_APKS := $(ISO_DIR)/apks
-#ISO_APKINDEX := $(ISO_APKS)/APK_INDEX.gz
-
-#$(ISO_APKS): $(SOURCE_APKS)
-# @echo "==> iso: prepare APK repository"
-# @rm -rf $(ISO_APKS)
-# @mkdir -p $(ISO_APKS)
-# @for a in $(SOURCE_APKS) ; do \
-# ln -f $$a $(ISO_APKS) 2>/dev/null || cp $$a $(ISO_APKS) ; \
-# done
-# @apk index $(SOURCE_APKS) | gzip -9 > $(ISO_APKINDEX)
+ISO_PKGDIR := $(ISO_DIR)/packages
+ISO_REPOS := $(addprefix $(ISO_PKGDIR)/,$(REPOS))
+ISO_APKINDEX := $(addsuffix /APK_INDEX.gz,$(ISO_REPOS))
+ISO_REPOS_DIRSTAMP := $(DESTDIR)/stamp.isorepos
+
+$(ISO_REPOS_DIRSTAMP): $(addsuffix /APK_INDEX.gz,$(addprefix $(REPOS_DIR)/,$(REPOS)))
+ @echo "==> iso: prepare repositories $(REPOS)"
+ @rm -rf $(ISO_PKGDIR)
+ @mkdir -p $(ISO_REPOS)
+ @for r in $(REPOS); do \
+ for a in $(REPOS_DIR)/$$r/*; do \
+ ln -f "$$a" $(ISO_PKGDIR)/$$r/$${a##*/} 2>/dev/null \
+ || cp -r "$$a" $(ISO_PKGDIR)/$$r/$${a##*/} ;\
+ done;\
+ done
+ @touch $@
+
+#$(ISO_APKINDEX): $(ISO_REPOS)
+# @apk index $(dir $@)/*.apk | gzip -9 > $@
$(ISO_KERNEL): $(KERNEL_APK)
@echo "==> iso: install kernel $(KERNEL)"
@@ -242,7 +251,7 @@ $(ISO_KERNEL): $(KERNEL_APK)
@rm -f $(ISO_DIR)/.[A-Z]*
@touch $(ISO_KERNEL)
-$(ISO): $(MODLOOP) $(INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ISO_KERNEL)
+$(ISO): $(MODLOOP) $(INITFS) $(ISOLINUX_CFG) $(ISOLINUX_BIN) $(ISO_KERNEL) $(ISO_REPOS_DIRSTAMP)
@echo "==> iso: building $(notdir $(ISO))"
@echo "$(ALPINE_NAME)-$(ALPINE_RELEASE) $(BUILD_DATE)" \
> $(ISO_DIR)/.alpine-release