Bas van der Vlies wrote:
> Which the 3.9.3 ;-) version i get an error that the file is not there.
> Is it generated?
Yes, it's generated by make manpages.
> Andrea the x86_64 is the name for Redhat and other distro's in
> Debian/Ubuntu the name is amd64 (some historical reasons and it is not
> only for amd but also for intel ;-) ).
>
> So i want to leaf the directories names the same for:
> * <patH>/systemimager/boot
> i386 ia64 x86_64
>
> Sometimes you have setup a debian systemimager server and you want to
> install x86_64 redhat clients and amd64 debian clients with the standard
> boot images. They can both use the x86_64 directory. It depends on the
> client which architecture we must have. The simplest solution would be
> that we make a simlink:
> ln -s x86_64 amd64
>
> Or we adjust the software that amd64 is equivalent to x86_64.
>
> This patch seems to introduce a new architecture for debian and that is
> not needed.
OK, I understand now. Anyway, if the "standard" name in Debian/Ubuntu is amd64 I
think we should use that for packaging and x86_64 for the systemimager
directories (the contents of the package).
A possible solution could be to define in debian/rules 2 different variables:
ARCH = $(shell dpkg --print-architecture)
UNAME_ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e
s/arm.*/arm/ -e s/sa110/arm/)
ARCH is the architecture that uses the Debian naming schema and UNAME_ARCH is
the architecture seen by the kernel.
See the following patch (uncompiled/untested and to be applied on-top-of the
previous one).
What do you think?
Thanks,
-Andrea
Index: debian/rules
===================================================================
--- debian/rules (revision 4182)
+++ debian/rules (working copy)
@@ -12,6 +12,8 @@
UPSTREAM_TARBALL = $(PKG)_$(VERSION).tar.gz
ARCH = $(shell dpkg --print-architecture)
+UNAME_ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e
s/arm.*/arm/ -e s/sa110/arm/)
+
BOOTPKG = $(PKG)-boot-$(ARCH)-standard
INITRD_TEMPLATE_PKG = $(PKG)-initrd-template-$(ARCH)
@@ -24,7 +26,7 @@
-p $(PKG)-server-flamethrowerd \
-p $(PKG)-server-bittorrent
-BOOTARCHS = alpha i386 ia64 parisc ppc64-iSeries ppc64-ps3 ppc64 ppc64ydl ppc
x86_64
+BOOTARCHS = alpha i386 ia64 parisc ppc64-iSeries ppc64-ps3 ppc64 ppc64ydl ppc
amd64
PATCHES=$(sort $(shell find $(CURDIR)/patches -name "*.patch"))
@@ -109,7 +111,7 @@
#
# systemimager-boot-$(ARCH)-standard.postinst
#
- cd
$(CURDIR)/debian/$(BOOTPKG)/usr/share/systemimager/boot/$(ARCH)/standard/initrd_template/dev
&& \
+ cd
$(CURDIR)/debian/$(BOOTPKG)/usr/share/systemimager/boot/$(UNAME_ARCH)/standard/initrd_template/dev
&& \
rm -f tty1 && \
rm -f tty2 && \
rm -f tty3 && \
@@ -120,9 +122,9 @@
rm -f null
# Copy the needed files into the initrd_template package.
- mkdir -p
$(CURDIR)/debian/$(INITRD_TEMPLATE_PKG)/usr/share/systemimager/boot/$(ARCH)/standard
- mv
$(CURDIR)/debian/$(BOOTPKG)/usr/share/systemimager/boot/$(ARCH)/standard/initrd_template
\
-
$(CURDIR)/debian/$(INITRD_TEMPLATE_PKG)/usr/share/systemimager/boot/$(ARCH)/standard
+ mkdir -p
$(CURDIR)/debian/$(INITRD_TEMPLATE_PKG)/usr/share/systemimager/boot/$(UNAME_ARCH)/standard
+ mv
$(CURDIR)/debian/$(BOOTPKG)/usr/share/systemimager/boot/$(UNAME_ARCH)/standard/initrd_template
\
+
$(CURDIR)/debian/$(INITRD_TEMPLATE_PKG)/usr/share/systemimager/boot/$(UNAME_ARCH)/standard
install-indep: build-indep
dh_testdir
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
sisuite-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sisuite-users
