Commit b591e695 authored by Pierre Schmitz's avatar Pierre Schmitz
Browse files

add initial [multilib] support

parent 2f18ca18

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ install: 
	ln -sf commitpkg $(DESTDIR)/usr/bin/stagingpkg

	ln -sf commitpkg $(DESTDIR)/usr/bin/communitypkg

	ln -sf commitpkg $(DESTDIR)/usr/bin/community-testingpkg

	ln -sf commitpkg $(DESTDIR)/usr/bin/multilibpkg

	# arch{co,release,rm}

	install -m 755 archco $(DESTDIR)/usr/bin

	install -m 755 communityco $(DESTDIR)/usr/bin
@@ -29,6 +30,7 @@ install: 
	ln -sf archbuild $(DESTDIR)/usr/bin/testing-x86_64-build

	ln -sf archbuild $(DESTDIR)/usr/bin/staging-i686-build

	ln -sf archbuild $(DESTDIR)/usr/bin/staging-x86_64-build

	ln -sf archbuild $(DESTDIR)/usr/bin/multilib-build

	# Additional packaging helper scripts

	install -m 755 lddd $(DESTDIR)/usr/bin

	install -m 755 finddeps $(DESTDIR)/usr/bin
@@ -51,6 +53,7 @@ uninstall: 
	rm $(DESTDIR)/usr/bin/stagingpkg

	rm $(DESTDIR)/usr/bin/communitypkg

	rm $(DESTDIR)/usr/bin/community-testingpkg

	rm $(DESTDIR)/usr/bin/multilibpkg

	rm $(DESTDIR)/usr/sbin/mkarchroot

	rm $(DESTDIR)/usr/sbin/makechrootpkg

	rm $(DESTDIR)/usr/bin/extra-i686-build
@@ -59,6 +62,7 @@ uninstall: 
	rm $(DESTDIR)/usr/bin/testing-x86_64-build

	rm $(DESTDIR)/usr/bin/staging-i686-build

	rm $(DESTDIR)/usr/bin/staging-x86_64-build

	rm $(DESTDIR)/usr/bin/multilib-build

	rm $(DESTDIR)/usr/bin/lddd

	rm $(DESTDIR)/usr/bin/finddeps

	rm $(DESTDIR)/usr/bin/archco

archbuild

+12 −2
Original line number Diff line number Diff line 
#!/bin/bash



cmd="$(basename "${0%-build}")"

if [ "${cmd}" == 'multilib' ]; then

	repo='multilib'

	arch='x86_64'

else

	repo=${cmd%-*}

	arch=${cmd#*-}

fi

chroots='/var/tmp/archbuild'

clean_first=false
@@ -26,6 +31,11 @@ if [ "$(uname -m)" == 'i686' -a "${arch}" != 'i686' ]; then 
	exit 1

fi



if [ "$(uname -m)" != 'x86_64' -a "${repo}" == 'multilib' ]; then

	echo 'You can only build multilib packages on a x86_64 system'

	exit 1

fi



if ${clean_first} || [ ! -d "${chroots}/${repo}-${arch}" ]; then

	echo "Creating chroot for [${repo}] (${arch})..."

	sudo rm -rf ${chroots}/${repo}-${arch}

commitpkg

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ elif [ "$cmd" == 'communitypkg' ]; then 
elif [ "$cmd" == 'community-testingpkg' ]; then

	repo='community-testing'

	server='aur.archlinux.org'

elif [ "$cmd" == 'multilibpkg' ]; then

	repo='multilib'

	server='aur.archlinux.org'

else

	if [ $# -eq 0 ]; then

		abort 'usage: commitpkg <reponame> [-l limit] [commit message]'