merged experimental support for opensuse

This isn't ready for general consumption (just as centos one) but the notion of REPO is floating around along with apt-conf thoughts, and it might still be useful to someone poking around conf.d/test.mk. Request hasher-pkg-init.spec from mike@ or led@ if interested; the experiments were carried out using openSUSE 11.4 repository and slightly patched hasher (cpio blacklist for devices).

merged experimental support for opensuse
23175f00 · Michael Shigorin · eb3df648 · 23175f00 · 23175f00
Commit 23175f00 authored Dec 29, 2011 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

test.mk conf.d/test.mk +12 -0

profile.mk lib/profile.mk +2 -0

No files found.
--- a/conf.d/test.mk
+++ b/conf.d/test.mk
@@ -33,12 +33,24 @@ endif # IMAGE_CLASS: distro

 ifeq (ve,$(IMAGE_CLASS))

+ifeq (centos,$(REPO))
+
 ve/.centos-base: ve/.bare
 	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)

 ve/centos: ve/.centos-base
 	@$(call add,BASE_PACKAGES,openssh-server)

+endif # REPO: centos
+
+ifeq (opensuse,$(REPO))
+
+ve/.opensuse-base: ve/.bare
+	@$(call set,IMAGE_INIT_LIST,hasher-pkg-init)
+	@$(call add,BASE_PACKAGES,aaa_base)
+
+endif # REPO: opensuse
+
 endif # IMAGE_CLASS: ve

 ifeq (vm,$(IMAGE_CLASS))

--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -85,7 +85,9 @@ profile/bare: profile/init
 	@$(call try,IMAGEDIR,$(IMAGEDIR))
 	@$(call try,LOGDIR,$(LOGDIR))
 	@$(call try,BRANDING,altlinux-sisyphus)
+ifeq (,$(REPO:altlinux%=))
 	@$(call set,IMAGE_INIT_LIST,+branding-$$(BRANDING)-release)
+endif
 	@mp-commit "$(BUILDDIR)" "image configuration defaults set"

 # put the derived SUBPROFILE_DIRS here to get it logged in clear text by the way