diff -Naur fwsetup-0.7.5.orig/configure fwsetup-0.7.5/configure --- fwsetup-0.7.5.orig/configure 2007-05-24 20:27:00.000000000 +0200 +++ fwsetup-0.7.5/configure 2007-06-01 23:41:53.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/env python -import pacman, os, sys +import alpm, os, sys from optparse import OptionParser # since we're not in chroot, we need up to date libs. but don't be too @@ -42,13 +42,13 @@ sys.stdout.flush() def pkgGetVers(db, names, ret={}): - lp = pacman.db_getpkgcache(db) + lp = alpm.db_getpkgcache(db) while lp: - pkg = pacman.void_to_PM_PKG(pacman.list_getdata(lp)) - pkgname = pacman.void_to_char(pacman.pkg_getinfo(pkg, pacman.PKG_NAME)) + pkg = alpm.void_to_PM_PKG(alpm.list_getdata(lp)) + pkgname = alpm.void_to_char(alpm.pkg_getinfo(pkg, alpm.PKG_NAME)) if pkgname in names and pkgname not in ret: - ret[pkgname] = pkgname = pacman.void_to_char(pacman.pkg_getinfo(pkg, pacman.PKG_VERSION)) - lp = pacman.list_next(lp) + ret[pkgname] = pkgname = alpm.void_to_char(alpm.pkg_getinfo(pkg, alpm.PKG_VERSION)) + lp = alpm.list_next(lp) return ret try: @@ -56,11 +56,11 @@ except OSError: pass -if pacman.initialize("/") == -1: +if alpm.initialize("/") == -1: raise "failed to init the pacman lib" -remote = pacman.db_register("frugalware-current") -local = pacman.db_register("local") +remote = alpm.db_register("frugalware") +local = alpm.db_register("local") sys.stdout.write("reading the remote database... ") sys.stdout.flush() remotevers = pkgGetVers(remote, libs) diff -Naur fwsetup-0.7.5.orig/Makefile fwsetup-0.7.5/Makefile --- fwsetup-0.7.5.orig/Makefile 2007-05-24 20:27:00.000000000 +0200 +++ fwsetup-0.7.5/Makefile 2007-06-01 23:50:21.000000000 +0200 @@ -36,7 +36,7 @@ QEMU_OPTS ?= -hda ~/documents/qemu/hda.img KERNELV = $(shell echo $(KERNELVER)|sed 's/-.*//') -KERNELREL = $(shell echo $(KERNELVER)|sed 's/.*-//') +KERNELREL = 4 DESTDIR = $(shell source /etc/repoman.conf; [ -e ~/.repoman.conf ] && source ~/.repoman.conf; echo $$fst_root) CLEANUP = rm -rf $(BDIR) && mkdir $(BDIR) && rm -rf $@ @@ -140,6 +140,7 @@ ifneq ($(DEBUG),false) sed -i 's|/bin/setup|/usr/bin/gdb /bin/setup|' $(MDIR)/etc/inittab endif + mkdir -p $(MDIR)/etc/rc.d/ cp etc/rc.S $(MDIR)/etc/rc.d/ chmod +x $(MDIR)/etc/rc.d/rc.S cp bin/bootstrap $(MDIR)/bin/ @@ -305,7 +306,7 @@ mkdir -p pacman-g2/bin pacman-g2/etc/pacman.d/ pacman-g2/usr/{lib,share} $(UNPACK) cp -a $(BDIR)/usr/bin/pacman{,-g2} pacman-g2/bin/ - cp -a $(BDIR)/usr/lib/libpacman.so* pacman-g2/usr/lib/ + cp -a $(BDIR)/usr/lib/libalpm.so* pacman-g2/usr/lib/ cp -a $(BDIR)/usr/bin/vercmp pacman-g2/bin/ cp -a $(BDIR)/usr/share/locale pacman-g2/usr/share/ cp -a $(BDIR)/etc/pacman.d/* pacman-g2/etc/pacman.d/ diff -Naur fwsetup-0.7.5.orig/src/plugins/Makefile fwsetup-0.7.5/src/plugins/Makefile --- fwsetup-0.7.5.orig/src/plugins/Makefile 2007-05-24 20:27:00.000000000 +0200 +++ fwsetup-0.7.5/src/plugins/Makefile 2007-06-01 23:41:38.000000000 +0200 @@ -23,7 +23,7 @@ CFLAGS ?= -g -Wall -Werror endif CFLAGS += -I.. $(FINAL) -DARCH="\"$(shell arch)\"" -LDFLAGS += -lparted -ldl -lpacman +LDFLAGS += -lparted -ldl -lalpm ifeq ($(shell arch),x86_64) CFLAGS += -fPIC endif diff -Naur fwsetup-0.7.5.orig/src/plugins/select.c fwsetup-0.7.5/src/plugins/select.c --- fwsetup-0.7.5.orig/src/plugins/select.c 2007-05-24 20:27:00.000000000 +0200 +++ fwsetup-0.7.5/src/plugins/select.c 2007-06-01 23:41:38.000000000 +0200 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include @@ -94,44 +94,44 @@ for (i=0; i