manifest problems on ARM
I ran a build of xfree86-4.0.2-7 on ARM. Aside from needing one small patch
to elf.h (attached) the compilation went OK, but the manifest check failed. I
don't know enough about what goes on here to say whether the manifest is just
wrong or outdated, or whether something bad happened.
Thanks for any help. BTW, the attached elf.h.diff is essentially a less
intrusive equivalent to held-patches/613_arm_newelfheader.diff.
p.
# compare manifests
(cd debian/tmp && find -type f | sort | cut -c3-) > debian/MANIFEST.arm.new
# confirm that the installed file list has not changed
# remove initial test once we have MANIFESTs for every arch
[ -e debian/MANIFEST.arm ] && if ! cmp -s debian/MANIFEST.arm debian/MANIFEST.arm.new; then diff -u -0 debian/MANIFEST.arm debian/MANIFEST.arm.new; echo 'MANIFEST check failed; please see debian/README'; exit 1; fi
--- debian/MANIFEST.arm Sun Feb 25 12:50:43 2001
+++ debian/MANIFEST.arm.new Wed Mar 7 14:23:58 2001
@@ -0,0 +1 @@
+etc/X11/XftConfig
@@ -231,2 +231,0 @@
-etc/X11/xkb/symbols/lt_b
-etc/X11/xkb/symbols/lt_new
@@ -233,0 +233 @@
+etc/X11/xkb/symbols/lt_std
@@ -264,0 +265 @@
+etc/X11/xkb/symbols/tr
@@ -545,0 +547,2 @@
+usr/X11R6/include/X11/Xft/Xft.h
+usr/X11R6/include/X11/Xft/XftFreetype.h
@@ -960,0 +964 @@
+usr/X11R6/lib/X11/doc/README.newport
@@ -2304,0 +2309 @@
+usr/X11R6/lib/X11/locale/mk_MK.UTF-8/Compose
@@ -2337 +2342 @@
-usr/X11R6/lib/libX11.so.6.1
+usr/X11R6/lib/libX11.so.6.2
@@ -2349,0 +2355 @@
+usr/X11R6/lib/libXft.a
@@ -2354 +2360 @@
-usr/X11R6/lib/libXmu.so.6.1
+usr/X11R6/lib/libXmu.so.6.2
@@ -2410 +2415,0 @@
-usr/X11R6/lib/modules/dri/ffb_dri.so
@@ -2420,0 +2426 @@
+usr/X11R6/lib/modules/drivers/savage_drv.o
@@ -2426 +2431,0 @@
-usr/X11R6/lib/modules/extensions/libdri.a
@@ -2436,0 +2442,2 @@
+usr/X11R6/lib/modules/input/citron_drv.o
+usr/X11R6/lib/modules/input/digitaledge_drv.o
@@ -2438 +2444,0 @@
-usr/X11R6/lib/modules/input/elo2300_drv.o
@@ -2440 +2445,0 @@
-usr/X11R6/lib/modules/input/magellan_drv.o
@@ -2444,0 +2450 @@
+usr/X11R6/lib/modules/input/summa_drv.o
@@ -2471 +2476,0 @@
-usr/X11R6/lib/modules/linux/libdrm.a
@@ -3209,0 +3215 @@
+usr/X11R6/man/man3/Xft.3x
@@ -3525,0 +3532,11 @@
+usr/X11R6/man/man3/Xutf8DrawImageString.3x
+usr/X11R6/man/man3/Xutf8DrawString.3x
+usr/X11R6/man/man3/Xutf8DrawText.3x
+usr/X11R6/man/man3/Xutf8LookupString.3x
+usr/X11R6/man/man3/Xutf8ResetIC.3x
+usr/X11R6/man/man3/Xutf8SetWMProperties.3x
+usr/X11R6/man/man3/Xutf8TextEscapement.3x
+usr/X11R6/man/man3/Xutf8TextExtents.3x
+usr/X11R6/man/man3/Xutf8TextListToTextProperty.3x
+usr/X11R6/man/man3/Xutf8TextPerCharExtents.3x
+usr/X11R6/man/man3/Xutf8TextPropertyToTextList.3x
@@ -3557,0 +3575 @@
+usr/X11R6/man/man4/citron.4
@@ -3569,0 +3588 @@
+usr/X11R6/man/man4/savage.4
@@ -3581,0 +3601 @@
+usr/bin/dexconf
@@ -3598 +3617,0 @@
-usr/lib/libOSMesa.so.3.3
MANIFEST check failed; please see debian/README
make: *** [debian/stampdir/install] Error 1
--- xc/programs/Xserver/hw/xfree86/loader/elf.h Thu Sep 7 20:06:52 2000
+++ xc/programs/Xserver/hw/xfree86/loader/elf.h Sun Feb 25 13:12:16 2001
@@ -416,6 +416,44 @@
#define R_PPC_SECTOFF_HA 36
#endif
+/* ARM relocs. */
+#define R_ARM_NONE 0 /* No reloc */
+#define R_ARM_PC24 1 /* PC relative 26 bit branch */
+#define R_ARM_ABS32 2 /* Direct 32 bit */
+#define R_ARM_REL32 3 /* PC relative 32 bit */
+#define R_ARM_PC13 4
+#define R_ARM_ABS16 5 /* Direct 16 bit */
+#define R_ARM_ABS12 6 /* Direct 12 bit */
+#define R_ARM_THM_ABS5 7
+#define R_ARM_ABS8 8 /* Direct 8 bit */
+#define R_ARM_SBREL32 9
+#define R_ARM_THM_PC22 10
+#define R_ARM_THM_PC8 11
+#define R_ARM_AMP_VCALL9 12
+#define R_ARM_SWI24 13
+#define R_ARM_THM_SWI8 14
+#define R_ARM_XPC25 15
+#define R_ARM_THM_XPC22 16
+#define R_ARM_COPY 20 /* Copy symbol at runtime */
+#define R_ARM_GLOB_DAT 21 /* Create GOT entry */
+#define R_ARM_JUMP_SLOT 22 /* Create PLT entry */
+#define R_ARM_RELATIVE 23 /* Adjust by program base */
+#define R_ARM_GOTOFF 24 /* 32 bit offset to GOT */
+#define R_ARM_GOTPC 25 /* 32 bit PC relative offset to GOT */
+#define R_ARM_GOT32 26 /* 32 bit GOT entry */
+#define R_ARM_PLT32 27 /* 32 bit PLT address */
+#define R_ARM_GNU_VTENTRY 100
+#define R_ARM_GNU_VTINHERIT 101
+#define R_ARM_THM_PC11 102 /* thumb unconditional branch */
+#define R_ARM_THM_PC9 103 /* thumb conditional branch */
+#define R_ARM_RXPC25 249
+#define R_ARM_RSBREL32 250
+#define R_ARM_THM_RPC22 251
+#define R_ARM_RREL32 252
+#define R_ARM_RABS22 253
+#define R_ARM_RPC24 254
+#define R_ARM_RBASE 255
+
typedef struct elf32_rel {
Elf32_Addr r_offset;
Elf32_Word r_info;
Reply to: