sb1-qemu: create more scratchbox-like package

diff --git a/debian/control b/debian/control
index 1212c42..dbb2b54 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 5), quilt (>= 0.40), binutils (>= 2.16), nasm,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64],
  libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64],
  libgpmg1-dev [amd64 arm armel hppa i386 powerpc sparc ppc64],
- scratchbox-core (>= 1.0.12) [i386]
 Standards-Version: 3.8.0
 
 Package: sb2-qemu-arm
@@ -22,10 +21,8 @@ Description: Qemu for scratchbox2
  Qemu packaging for sb2. This should become eventually temporary
  when mainstream qemu merges any remaining patches.
 
-Package: sb1-qemu
+Package: scratchbox-devkit-qemu
 Architecture: i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: scratchbox-devkit-cputransp
-Conflicts: scratchbox-devkit-cputransp
+Depends: ${shlibs:Depends}, ${misc:Depends}, scratchbox-core (>= 1.0.12)
 Description: Qemu scratchbox devkit
  The qemu for the scratchbox1 lovers.

diff --git a/debian/cputransp-methods b/debian/cputransp-methods
index 6e79c83..164f458 100644 (file)
--- a/debian/cputransp-methods
+++ b/debian/cputransp-methods
@@ -1,2 +1,7 @@
-qemu-arm-cvs-m
-sbrsh
+qemu-arm-sb
+qemu-armeb-sb
+qemu-i386-sb
+qemu-mips-sb
+qemu-mipsel-sb
+qemu-ppc-sb
+qemu-sparc-sb

diff --git a/debian/rules b/debian/rules
index c568f63..b0743d8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ TARGET_SYSTEM_TCG    = arm-softmmu i386-softmmu
 TARGET_LINUX_TCG     = arm-linux-user i386-linux-user
 package_list         = obj-sb2/config-host.mak obj-system/config-host.mak
 install_list         = sb2-qemu-install sb-system-qemu-install
-sb1_prefix           = /scratchbox/devkits/cputransp
+sb1_prefix           = /scratchbox/devkits/qemu
 
 target_system_list = $(TARGET_SYSTEM_TCG)
 
@@ -101,10 +101,12 @@ clean:
 
 # cputransp-methods should be generated at postinst
 sb1-qemu-install:
-       mkdir -p debian/sb1-qemu/$(sb1_prefix)/{bin,etc}
-       cp debian/cputransp-methods debian/sb1-qemu/$(sb1_prefix)/etc
-       cp obj-sb1/*-linux-user/qemu-* debian/sb1-qemu/$(sb1_prefix)/bin
-       ln -s qemu-arm debian/sb1-qemu/$(sb1_prefix)/bin/qemu-cvs-arm-m
+       mkdir -p debian/scratchbox-devkit-qemu/$(sb1_prefix)/{bin,etc}
+       cp debian/cputransp-methods \
+               debian/scratchbox-devkit-qemu/$(sb1_prefix)/etc
+       for i in obj-sb1/*-linux-user/qemu-* ; do \
+               install -m 755 $$i debian/scratchbox-devkit-qemu/$(sb1_prefix)/bin/`basename $$i`-sb ; \
+       done
 
 sb2-qemu-install:
        mkdir -p debian/sb2-qemu-arm/usr/bin