aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-01-04 19:57:33 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 04:27:53 +0200
commit7c986ba5b0ab45485b61fe56ba73abe1fa2507ed (patch)
tree1fe9dbee88283e3360edad05c2ba4ccf47c2078a /src
parent5c0479ac14755429bc65c47eafec3e2bfb72431f (diff)
Multiarch support.
Run 'ARCH=amd64 make' to preseed an AMD64 ISO image, etc.
Diffstat (limited to 'src')
-rw-r--r--src/fripost-partman-udeb/Makefile8
-rw-r--r--src/fripost-partman-udeb/debian/control4
-rwxr-xr-xsrc/fripost-partman-udeb/debian/rules2
-rwxr-xr-xsrc/fripost-postinst-udeb/debian/rules2
4 files changed, 11 insertions, 5 deletions
diff --git a/src/fripost-partman-udeb/Makefile b/src/fripost-partman-udeb/Makefile
index b1f19cf..a1e0e73 100644
--- a/src/fripost-partman-udeb/Makefile
+++ b/src/fripost-partman-udeb/Makefile
@@ -1,12 +1,18 @@
CC ?= gcc
CFLAGS ?= -Wall -x c -s
+ifeq (${ARCH}, amd64)
+CFLAGS += -m64
+endif
+ifeq (${ARCH}, i386)
+CFLAGS += -m32
+endif
+
LIBS = lib/stdbuf.so
all: ${LIBS}
%.so: %.c
- # TODO: multiarch (-m32/-m64)
${CC} ${CFLAGS} $< -fPIC -shared -o $@
clean:
diff --git a/src/fripost-partman-udeb/debian/control b/src/fripost-partman-udeb/debian/control
index 043fa49..355bc68 100644
--- a/src/fripost-partman-udeb/debian/control
+++ b/src/fripost-partman-udeb/debian/control
@@ -6,11 +6,11 @@ Build-Depends: debhelper (>= 7)
Package: fripost-partman
XC-Package-Type: udeb
-Architecture: all
+Architecture: any
Depends: cdebconf-udeb, parted-udeb, xfsprogs-udeb, hw-detect, md-modules,
mdadm-udeb, lvm2-udeb, dmsetup-udeb, ntfstools-udeb, xfs-modules,
ext2-modules, ext3-modules, openssh-server-udeb, cryptsetup-udeb,
- crypto-dm-modules, ${misc:Depends}
+ crypto-dm-modules, ${misc:Depends}, ${shlibs:Depends}
Provides: created-fstab, made-filesystems, mounted-partitions,
partitioned-harddrives
Description: Partition Hard Drives using shell scripts.
diff --git a/src/fripost-partman-udeb/debian/rules b/src/fripost-partman-udeb/debian/rules
index 514b55b..ed08263 100755
--- a/src/fripost-partman-udeb/debian/rules
+++ b/src/fripost-partman-udeb/debian/rules
@@ -3,4 +3,4 @@
dh $@
# dh_pysupport: This program is deprecated, you should use dh_python2 instead.
-override_dh_pysupport:
+override_dh_pysupport override_dh_strip:
diff --git a/src/fripost-postinst-udeb/debian/rules b/src/fripost-postinst-udeb/debian/rules
index 514b55b..ed08263 100755
--- a/src/fripost-postinst-udeb/debian/rules
+++ b/src/fripost-postinst-udeb/debian/rules
@@ -3,4 +3,4 @@
dh $@
# dh_pysupport: This program is deprecated, you should use dh_python2 instead.
-override_dh_pysupport:
+override_dh_pysupport override_dh_strip: