0.7.4-alt1

- ppc builds
initial PowerPC support
2012-07-16 21:33:00 +03:00 · 2012-07-16 21:20:12 +03:00 · 2012-07-16 21:19:06 +03:00 · 2012-07-16 18:24:18 +03:00 · 2012-07-16 18:24:18 +03:00 · 2012-07-16 18:20:55 +03:00
19 changed files with 82 additions and 26 deletions
--- a/.gear/mkimage-profiles.spec
+++ b/.gear/mkimage-profiles.spec
@@ -1,5 +1,5 @@
 Name: mkimage-profiles
-Version: 0.7.2
+Version: 0.7.4
 Release: alt1

 Summary: ALT Linux based distribution metaprofile
@@ -61,6 +61,12 @@ cp -a * %buildroot%mpdir
 %doc README QUICKSTART

 %changelog
+* Mon Jul 16 2012 Michael Shigorin <mike@altlinux.org> 0.7.4-alt1
+- ppc builds
+
+* Mon Jul 09 2012 Michael Shigorin <mike@altlinux.org> 0.7.3-alt1
+- arm builds
+
 * Mon Jul 02 2012 Michael Shigorin <mike@altlinux.org> 0.7.2-alt1
 - simply fixes

--- a/.gear/tags/481bb0d094cd33495db82c7b3341fd500fa8f467
+++ b/.gear/tags/481bb0d094cd33495db82c7b3341fd500fa8f467
@@ -1,6 +0,0 @@
-object 5c4cedb8730b5ad4ff4c5102a5de30d275ac23ed
-type commit
-tag v0.7.1
-tagger Michael Shigorin <mike@altlinux.org> 1340645389 +0300
-
-mulberry!
--- a/.gear/tags/ad042fed42eebceae830142ad84d7742bdce509d
+++ b/.gear/tags/ad042fed42eebceae830142ad84d7742bdce509d
@@ -0,0 +1,6 @@
+object 49eb551fefafb42ea72fbe460f7dff0f326165b5
+type commit
+tag v0.7.3
+tagger Michael Shigorin <mike@altlinux.org> 1341866845 +0300
+
+arm builds
--- a/.gear/tags/list
+++ b/.gear/tags/list
@@ -1 +1 @@
-481bb0d094cd33495db82c7b3341fd500fa8f467 v0.7.1
+ad042fed42eebceae830142ad84d7742bdce509d v0.7.3
--- a/5
+++ b/5
@@ -10,7 +10,7 @@ ifndef ARCHES
 ifdef ARCH
 ARCHES := $(ARCH)
 else
-ARCHES := $(shell arch | sed 's/i686/i586/')
+ARCHES := $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
 endif
 endif
 export ARCHES
@@ -36,6 +36,9 @@ export NUM_TARGETS := $(words $(MAKECMDGOALS))
 # for pipefail
 SHELL = /bin/bash

+# don't even consider remaking a configuration file
+.PHONY: $(HOME)/.mkimage/profiles.mk
+
 # real targets need real work
 %:
 	@n=1; \
--- a/bin/mktmpdir
+++ b/bin/mktmpdir
@@ -43,7 +43,7 @@ choose_tmpdir() {
 	for i in "$@"; do
 		[ -d "$i" -a -w "$i" ] || continue
 		echo -n "$i "
-		df -Tl "$i" | tail -1
+		df -PT "$i" | tail -1
 	done \
 	| sort -unk6 \
 	| while read dir dev fstype size used free percent mnt; do
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -20,7 +20,8 @@ distro/live-isomd5sum: distro/.base use/live/base use/isomd5sum
 	@$(call add,LIVE_PACKAGES,livecd-isomd5sum)

 distro/live-builder: pkgs := livecd-tmpfs livecd-online-repo mkimage-profiles
-distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
+distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo \
+	use/syslinux/timeout/30
 	@$(call set,KFLAVOURS,$(BIGRAM))
 	@$(call add,LIVE_LISTS,$(call tags,base && (server || builder)))
 	@$(call add,LIVE_PACKAGES,zsh sudo)
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -10,7 +10,7 @@

 - ARCH
  + задаёт целевую архитектуру образов
-  + значение: пусто (по умолчанию авто), i586 или x86_64
+  + значение: пусто (по умолчанию авто), i586, x86_64, arm, ppc
  + см. ../lib/build.mk

 - ARCHES
--- a/doc/qemu.txt
+++ b/doc/qemu.txt
@@ -0,0 +1,26 @@
+Для сборки с применением трансляции посредством QEMU
+выполните от имени root следующие команды:
+
+apt-get install qemu-user-binfmt_misc
+modprobe binfmt_misc
+echo 32768 > /proc/sys/vm/mmap_min_addr
+
+и сконфигурируйте его применение для требуемых платформ:
+
+echo ":arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/.host/qemu-arm:" > /proc/sys/fs/binfmt_misc/register
+echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/.host/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register
+
+Если файл /proc/sys/fs/binfmt_misc/register не существует,
+потребуется установить и загрузить иное ядро (например, std-def).
+
+Также нужен sources.list с указанием соответствующего репозитория
+и ссылающийся на него apt.conf (см. apt.conf.sample); например:
+
+--- sources.list.sisyphus.arm
+rpm http://ftp.altlinux.org/pub/distributions/ALTLinux/Sisyphus arm classic
+---
+
+--- sources.list.4.1.ppc
+rpm http://ftp.altlinux.org/pub/people/wart/repos/lioka/powerpc ppc classic
+rpm http://ftp.altlinux.org/pub/people/wart/repos/lioka/powerpc noarch classic
+---
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
@@ -22,7 +22,7 @@ MKI_SORTFILE := /tmp/isosort
 all: $(GLOBAL_DEBUG) prep copy-subdirs copy-tree run-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)

-prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER) imagedir
+prep: $(GLOBAL_DEBUG) dot-disk $(WHATEVER)

 dot-disk:
 	@mkdir -p files/.disk
--- a/features.in/build-ve/lib/90-build-ve.mk
+++ b/features.in/build-ve/lib/90-build-ve.mk
@@ -15,5 +15,3 @@ IMAGE_PACKAGES = $(call list,$(BASE_LISTS)) \

 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	postprocess $(GLOBAL_CLEAN_WORKDIR)
-
-prep: imagedir
--- a/features.in/build-vm/lib/90-build-vm.mk
+++ b/features.in/build-vm/lib/90-build-vm.mk
@@ -50,5 +50,3 @@ pack-image: MKI_PACK_RESULTS := tar:$(VM_TARBALL)

 all: $(GLOBAL_DEBUG) build-image copy-tree run-image-scripts pack-image \
 	convert-image postprocess $(GLOBAL_CLEAN_WORKDIR)
-
-prep: imagedir
--- a/features.in/dev/config.mk
+++ b/features.in/dev/config.mk
@@ -3,7 +3,7 @@ use/dev:
 	@$(call add,THE_PACKAGES,git-core hasher gear)

 use/dev/mkimage: use/dev
-	@$(call add,THE_PACKAGES,mkimage shadow-change)
+	@$(call add,THE_PACKAGES,mkimage shadow-change su)

 use/dev/repo: use/dev use/repo/main
 	@$(call add,THE_PACKAGES,apt-repo)
--- a/features.in/dev/live/image-scripts.d/40-hasher
+++ b/features.in/dev/live/image-scripts.d/40-hasher
@@ -13,10 +13,10 @@ HOME="/home/$USER"
 install -dm750 -o "$USER" -g "$USER" "$HOME"

 # we honestly don't know much more
-if type -t git >&/dev/null; then
+if type -t git && type -t su; then
 	su - -c "git config --global user.email $USER@localhost" "$USER"
 	su - -c "git config --global user.name 'live builder'" "$USER"
-fi
+fi >&/dev/null

 # developer should feel comfortable, eh? ;-)
 ZSHELL="/bin/zsh"
--- a/image.in/Makefile
+++ b/image.in/Makefile
@@ -48,6 +48,7 @@ COPY_TREE = ./files
 # outdir shouldn't be wiped clean before use
 CLEANUP_OUTDIR ?=

+GLOBAL_TARGET := $(ARCH)
 GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))

 # the lib/build-*.mk comes from features.in/build-*/lib
@@ -67,6 +68,8 @@ save-profile:

 .PHONY: imagedir postprocess debug

+prep: imagedir
+
 imagedir:
 	@mkdir -p "$(IMAGE_OUTDIR)"

@@ -88,4 +91,6 @@ debug:
 	@echo "TOPDIR=$(TOPDIR)"
 	@echo "IMAGEDIR=$(IMAGEDIR)"
 	@echo "ARCH=$(ARCH)"
+	@echo "GLOBAL_TARGET=$(GLOBAL_TARGET)"
 	@echo "GLOBAL_HSH_APT_CONFIG=$(GLOBAL_HSH_APT_CONFIG)"
+	@echo "GLOBAL_HSH_USE_QEMU=$(GLOBAL_HSH_USE_QEMU)"
--- a/image.in/functions.mk
+++ b/image.in/functions.mk
@@ -2,7 +2,7 @@
 PKGDIR := $(GLOBAL_BUILDDIR)/pkg

 # duplicated from metaprofile makefiles for the sake of "local" builds
-ARCH ?= $(shell arch | sed 's/i686/i586/')
+ARCH ?= $(shell arch | sed 's/i686/i586/; s/armv.*/arm/; s/ppc.*/ppc/')
 DATE ?= $(shell date +%Y%m%d)

 # prefix pkglist name with its directory to form a path (relative/absolute)
--- a/lib/build.mk
+++ b/lib/build.mk
@@ -3,7 +3,7 @@ ANSI_OK   ?= 1;32
 ANSI_FAIL ?= 1;31

 MAX_ERRORS = 3
-GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed)\.))$$
+GOTCHA := ^(((\*\* )?(E:|[Ee]rror|[Ww]arning).*)|(.* (conflicts|Depends:) .*)|(.* (Stop|failed|not found)\.))$$

 ifndef MKIMAGE_PROFILES
 $(error this makefile is designed to be included in toplevel one)
@@ -20,8 +20,15 @@ LOWSPACE = 1024
 # it's also nice to know how long and much it takes
 START += time -f "%E %PCPU %Mk"

-# /usr/bin/{i586,x86_64} are setarch(8) symlinks
+# /usr/bin/{i586,x86_64} are setarch(8) symlinks but arm is not;
+# also check whether non-x86 build is running native
+ifeq (,$(wildcard $(subst :,/$(ARCH) ,$(PATH):)))
+ifeq (,$(findstring $(ARCH),$(shell uname -m)))
+export GLOBAL_HSH_USE_QEMU=$(ARCH)
+endif
+else
 START += $(ARCH)
+endif

 # to be passed into distcfg.mk; suggestions are welcome
 IMAGEDIR ?= $(shell \
--- a/lib/kernel.mk
+++ b/lib/kernel.mk
@@ -6,5 +6,5 @@ endif
 ifeq (i586,$(ARCH))
 BIGRAM := std-pae
 else
-BUGRAM := std-def
+BIGRAM := std-def
 endif
--- a/lib/profile.mk
+++ b/lib/profile.mk
@@ -52,13 +52,25 @@ profile/init: distclean
 		fi $(LOG); \
 	fi; \
 	{ \
-		eval `apt-config shell $${APTCONF:+-c=$(wildcard $(APTCONF))} \
+		APTCONF="$(wildcard $(APTCONF))"; \
+		echo "** using $${APTCONF:-system apt configuration}:"; \
+		eval `apt-config shell $${APTCONF:+-c=$$APTCONF} \
 			SOURCELIST Dir::Etc::sourcelist/f \
 			SOURCEPARTS Dir::Etc::sourceparts/d`; \
 		find "$$SOURCEPARTS" -name '*.list' \
-		| xargs egrep -Rhv '^#|^[[:blank:]]*$$' "$$SOURCELIST" && \
+		| xargs egrep -Rhv '^#|^[[:blank:]]*$$' "$$SOURCELIST" \
+		| tee $(BUILDDIR)/sources.list; \
 		echo; \
 	} $(LOG); \
+	if ! grep -q "[	 ]$(ARCH)[ 	]" $(BUILDDIR)/sources.list; then \
+		echo -n "requested arch '$$ARCH' unavailable" >&2; \
+		if [ -z "$(APTCONF)" ]; then \
+			echo " (no APTCONF)"; \
+		else \
+			echo; \
+		fi >&2; \
+		exit 1; \
+	fi; \
 	if type -t git >&/dev/null; then \
 		if cd $(BUILDDIR); then \
 			git init -q && \
Author	SHA1	Message	Date
Michael Shigorin	0a3aaf15c2	0.7.4-alt1 - ppc builds	2012-07-16 21:33:00 +03:00
Michael Shigorin	1ee997e832	initial PowerPC support As it happens, adding another architecture required almost no changes; native 32-bit ppc build took only ARCH and a repo, qemu-ppc one still has problems (/.host/entry hangs while unpacking setup for fakedata). Proof of concept on a QS22: $ make ve/bare.tar.gz ARCH: ppc /bin/sh: rpmvercmp: command not found 21:41:01 cleaning up 21:41:03 initializing BUILDDIR: build/ 21:41:03 preparing distro config 21:41:05 starting image build (coffee time) 21:42:48 done (1:42) image: $TMP/out/bare-20120716-ppc.tar.gz [21M]	2012-07-16 21:20:12 +03:00
Michael Shigorin	18f1a6360a	bin/mktmpdir: grok NFS root "df -l" is going to hurt (or at least spam) if it's a diskless node; "df -P" helps maintain output parseability. So be it.	2012-07-16 21:19:06 +03:00
Michael Shigorin	809ae4d9e8	live-builder: minor fixes su wasn't making it into the image breaking ~/.git setup, and there's no reason for a full default boot timeout either.	2012-07-16 18:24:18 +03:00
Michael Shigorin	24edc620d8	prep optimization There was some extra duplication, just clean it up.	2012-07-16 18:24:18 +03:00
Michael Shigorin	d31a2555bd	non-native ARM support via qemu mkimage and hasher can make use of qemu to run non-native binaries while working on the chroots; thanks kas@, manowar@ and sbolshakov@ for implementing this functionality as well as providing nice examples through mkimage-profiles-arm and mkimage-profile-armrootfs. This required the architecture check to be added since baking a tarball with "arm" as its specified arch and x86_64 inside isn't particularly good thing to let slip through; however the implementation is quite fragile, bugreports and patches are seriously welcome. NB: APTCONF evaluation order between lazy make and nimble shell turned out to be quite a delicate issue in this particular case.	2012-07-16 18:20:55 +03:00
Michael Shigorin	03ba4631f6	gear-store-tags	2012-07-09 23:47:49 +03:00
Michael Shigorin	49eb551fef	0.7.3-alt1 - arm builds	2012-07-09 23:46:49 +03:00
Michael Shigorin	3c26cc869d	initial native ARM support The only thing to be fixed was setarch(8) symlinks assumption that is correct for x86 but not for ARM. There's also some hasher(7) setup to be done: mkdir -p ~/.hasher echo >> ~/.hasher/config <<-EOF def_target=arm #cache_dir=$HOME/tmp # depends on RAM/storage configuration EOF ...and of course apt(8) should be properly set up too. An example PoC build on a CM-A510 board (tmpfs): $ make BRANDING=altlinux-centaurus ve/bare.tar.gz ARCH: arm 18:10:45 initializing BUILDDIR: build/ 18:10:45 preparing distro config: build/distcfg.mk 18:10:46 starting image build: tail -f build/build.log 18:14:49 done (4:02) image: $TMP/out/bare-20120706-arm.tar.gz [23M]	2012-07-09 21:32:54 +03:00
Michael Shigorin	698c5e314a	Makefile: drop noise when no config is found ~/.mkimage/profiles.mk is useful but not requisite by any margin; no need to make noise trying to make it either.	2012-07-09 21:31:37 +03:00
Michael Shigorin	7683532ea2	lib/kernel.mk: single byte bugfix Whoops, an overlooked character didn't bring too many things down but was a BUG indeed :-/	2012-07-06 18:52:46 +03:00
Michael Shigorin	cf21fd4298	gear-store-tags	2012-07-02 16:19:06 +03:00