[Glibc-bsd-commits] r1310 - in trunk: freebsd-libs/debian
kfreebsd-kernel-headers/debian
kfreebsd-kernel-headers/debian/patches libfreebsd/debian
web/cdscripts
Robert Millan
rmh at costa.debian.org
Sat Mar 4 19:08:23 UTC 2006
Author: rmh
Date: 2006-03-04 19:08:20 +0000 (Sat, 04 Mar 2006)
New Revision: 1310
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/libfreebsd/debian/changelog
trunk/libfreebsd/debian/control
trunk/web/cdscripts/mfsroot.sh
trunk/web/cdscripts/netinst.sh
trunk/web/cdscripts/tarball.sh
Log:
Misc amd64 fixes.
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/freebsd-libs/debian/changelog 2006-03-04 19:08:20 UTC (rev 1310)
@@ -1,3 +1,9 @@
+freebsd-libs (5.4-7) UNRELEASED; urgency=low
+
+ * Add kfreebsd-amd64.
+
+ -- Robert Millan <rmh at aybabtu.com> Sat, 4 Mar 2006 20:34:20 +0100
+
freebsd-libs (5.4-6) unreleased; urgency=low
* Added libipx.
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/freebsd-libs/debian/control 2006-03-04 19:08:20 UTC (rev 1310)
@@ -7,7 +7,7 @@
Standards-Version: 3.6.2
Package: libsbuf0
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD string buffer library
This library provide a way to handle string buffers. It contains
@@ -16,14 +16,14 @@
Package: libsbuf-dev
Section: libdevel
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, libsbuf0 (>= ${Source-Version}), libc0.1-dev | libc-dev
Description: Development files for libsbuf
This package contains the header files and static library needed to
compile applications that use libsbuf.
Package: libcam0
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD CAM (Common Access Method) library
The CAM (Common Access Method) library provides a way for userland
@@ -31,14 +31,14 @@
Package: libcam-dev
Section: libdevel
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, libcam0 (>= ${Source-Version}), libc0.1-dev | libc-dev, libbsd-dev
Description: Development files for libcam
This package contains the header files and static library needed to
compile applications that use libcam.
Package: libusbhid1
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD library to access USB HID devices
The usbhid library provides routines to extract data from USB Human
@@ -51,14 +51,14 @@
Package: libusbhid-dev
Section: libdevel
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, libusbhid1 (>= ${Source-Version}), libc0.1-dev | libc-dev, libbsd-dev
Description: Development files for libusbhid
This package contains the header files and static library needed to
compile applications that use libusbhid.
Package: libkvm0
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD kvm (kernel memory interface) library
The kvm library provides a uniform interface for accessing kernel virtual
@@ -66,21 +66,21 @@
Package: libkvm-dev
Section: libdevel
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, libkvm0 (>= ${Source-Version}), libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
Description: Development files for libkvm
This package contains the header files and static library needed to
compile applications that use libkvm.
Package: libipx2
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}
Description: FreeBSD IPX address conversion support library
The IPX library provides a set of routune to convert IPX addresses.
Package: libipx-dev
Section: libdevel
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, libipx2 (>= ${Source-Version}), libc0.1-dev | libc-dev
Description: Development files for libipx
This package contains the header files and static library needed to
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2006-03-04 19:08:20 UTC (rev 1310)
@@ -1,8 +1,9 @@
kfreebsd-kernel-headers (0.16) UNRELEASED; urgency=low
* control (Architecture): Add kfreebsd-amd64.
+ * patches/011_wine.diff: Add more elf header fixes.
- -- Robert Millan <rmh at aybabtu.com> Mon, 27 Feb 2006 23:27:30 +0100
+ -- Robert Millan <rmh at aybabtu.com> Sat, 4 Mar 2006 21:05:32 +0100
kfreebsd-kernel-headers (0.15) unreleased; urgency=low
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2006-03-04 19:08:20 UTC (rev 1310)
@@ -204,3 +204,209 @@
/* Macros for accessing the fields of st_info. */
#define ELF32_ST_BIND(info) ((info) >> 4)
#define ELF32_ST_TYPE(info) ((info) & 0xf)
+--- sys/sys/elf64.h~ 2006-03-01 20:28:58.000000000 +0100
++++ sys/sys/elf64.h 2006-03-04 20:43:36.000000000 +0100
+@@ -30,6 +30,7 @@
+ #define _SYS_ELF64_H_ 1
+
+ #include <sys/elf_common.h>
++#include <elf.h>
+
+ /*
+ * ELF definitions common to all 64-bit architectures.
+@@ -56,89 +57,6 @@
+ typedef Elf64_Half Elf64_Hashelt;
+ #endif
+
+-/*
+- * ELF header.
+- */
+-
+-typedef struct {
+- unsigned char e_ident[EI_NIDENT]; /* File identification. */
+- Elf64_Quarter e_type; /* File type. */
+- Elf64_Quarter e_machine; /* Machine architecture. */
+- Elf64_Half e_version; /* ELF format version. */
+- Elf64_Addr e_entry; /* Entry point. */
+- Elf64_Off e_phoff; /* Program header file offset. */
+- Elf64_Off e_shoff; /* Section header file offset. */
+- Elf64_Half e_flags; /* Architecture-specific flags. */
+- Elf64_Quarter e_ehsize; /* Size of ELF header in bytes. */
+- Elf64_Quarter e_phentsize; /* Size of program header entry. */
+- Elf64_Quarter e_phnum; /* Number of program header entries. */
+- Elf64_Quarter e_shentsize; /* Size of section header entry. */
+- Elf64_Quarter e_shnum; /* Number of section header entries. */
+- Elf64_Quarter e_shstrndx; /* Section name strings section. */
+-} Elf64_Ehdr;
+-
+-/*
+- * Section header.
+- */
+-
+-typedef struct {
+- Elf64_Half sh_name; /* Section name (index into the
+- section header string table). */
+- Elf64_Half sh_type; /* Section type. */
+- Elf64_Size sh_flags; /* Section flags. */
+- Elf64_Addr sh_addr; /* Address in memory image. */
+- Elf64_Off sh_offset; /* Offset in file. */
+- Elf64_Size sh_size; /* Size in bytes. */
+- Elf64_Half sh_link; /* Index of a related section. */
+- Elf64_Half sh_info; /* Depends on section type. */
+- Elf64_Size sh_addralign; /* Alignment in bytes. */
+- Elf64_Size sh_entsize; /* Size of each entry in section. */
+-} Elf64_Shdr;
+-
+-/*
+- * Program header.
+- */
+-
+-typedef struct {
+- Elf64_Half p_type; /* Entry type. */
+- Elf64_Half p_flags; /* Access permission flags. */
+- Elf64_Off p_offset; /* File offset of contents. */
+- Elf64_Addr p_vaddr; /* Virtual address in memory image. */
+- Elf64_Addr p_paddr; /* Physical address (not used). */
+- Elf64_Size p_filesz; /* Size of contents in file. */
+- Elf64_Size p_memsz; /* Size of contents in memory. */
+- Elf64_Size p_align; /* Alignment in memory and file. */
+-} Elf64_Phdr;
+-
+-/*
+- * Dynamic structure. The ".dynamic" section contains an array of them.
+- */
+-
+-typedef struct {
+- Elf64_Size d_tag; /* Entry type. */
+- union {
+- Elf64_Size d_val; /* Integer value. */
+- Elf64_Addr d_ptr; /* Address value. */
+- } d_un;
+-} Elf64_Dyn;
+-
+-/*
+- * Relocation entries.
+- */
+-
+-/* Relocations that don't need an addend field. */
+-typedef struct {
+- Elf64_Addr r_offset; /* Location to be relocated. */
+- Elf64_Size r_info; /* Relocation type and symbol index. */
+-} Elf64_Rel;
+-
+-/* Relocations that need an addend field. */
+-typedef struct {
+- Elf64_Addr r_offset; /* Location to be relocated. */
+- Elf64_Size r_info; /* Relocation type and symbol index. */
+- Elf64_Off r_addend; /* Addend. */
+-} Elf64_Rela;
+-
+ /* Macros for accessing the fields of r_info. */
+ #define ELF64_R_SYM(info) ((info) >> 32)
+ #define ELF64_R_TYPE(info) ((unsigned char)(info))
+@@ -146,19 +64,6 @@
+ /* Macro for constructing r_info from field values. */
+ #define ELF64_R_INFO(sym, type) (((sym) << 32) + (unsigned char)(type))
+
+-/*
+- * Symbol table entries.
+- */
+-
+-typedef struct {
+- Elf64_Half st_name; /* String table index of name. */
+- unsigned char st_info; /* Type and binding information. */
+- unsigned char st_other; /* Reserved (not used). */
+- Elf64_Quarter st_shndx; /* Section index of symbol. */
+- Elf64_Addr st_value; /* Symbol value. */
+- Elf64_Size st_size; /* Size of associated object. */
+-} Elf64_Sym;
+-
+ /* Macros for accessing the fields of st_info. */
+ #define ELF64_ST_BIND(info) ((info) >> 4)
+ #define ELF64_ST_TYPE(info) ((info) & 0xf)
+--- sys/sys/elf64.h~ 2006-03-04 20:44:39.000000000 +0100
++++ sys/sys/elf64.h 2006-03-04 20:46:46.000000000 +0100
+@@ -37,10 +37,7 @@
+ */
+
+ typedef u_int64_t Elf64_Addr;
+-typedef u_int32_t Elf64_Half;
+ typedef u_int64_t Elf64_Off;
+-typedef int64_t Elf64_Sword;
+-typedef u_int64_t Elf64_Word;
+ typedef u_int64_t Elf64_Size;
+ typedef u_int16_t Elf64_Quarter;
+
+--- sys/sys/elf_common.h~ 2006-03-01 20:28:58.000000000 +0100
++++ sys/sys/elf_common.h 2006-03-04 21:01:38.000000000 +0100
+@@ -29,6 +29,8 @@
+ #ifndef _SYS_ELF_COMMON_H_
+ #define _SYS_ELF_COMMON_H_ 1
+
++#include <stdint.h>
++
+ /*
+ * ELF definitions that are independent of architecture or word size.
+ */
+@@ -43,9 +45,9 @@
+ */
+
+ typedef struct {
+- u_int32_t n_namesz; /* Length of name. */
+- u_int32_t n_descsz; /* Length of descriptor. */
+- u_int32_t n_type; /* Type of this note. */
++ uint32_t n_namesz; /* Length of name. */
++ uint32_t n_descsz; /* Length of descriptor. */
++ uint32_t n_type; /* Type of this note. */
+ } Elf_Note;
+
+ /* Indexes into the e_ident array. Keep synced with
+--- sys/sys/elf64.h~ 2006-03-04 20:47:50.000000000 +0100
++++ sys/sys/elf64.h 2006-03-04 21:01:55.000000000 +0100
+@@ -31,15 +31,16 @@
+
+ #include <sys/elf_common.h>
+ #include <elf.h>
++#include <stdint.h>
+
+ /*
+ * ELF definitions common to all 64-bit architectures.
+ */
+
+-typedef u_int64_t Elf64_Addr;
+-typedef u_int64_t Elf64_Off;
+-typedef u_int64_t Elf64_Size;
+-typedef u_int16_t Elf64_Quarter;
++typedef uint64_t Elf64_Addr;
++typedef uint64_t Elf64_Off;
++typedef uint64_t Elf64_Size;
++typedef uint16_t Elf64_Quarter;
+
+ /*
+ * Types of dynamic symbol hash table bucket and chain elements.
+--- sys/sys/elf32.h~ 2006-03-04 20:47:50.000000000 +0100
++++ sys/sys/elf32.h 2006-03-04 21:02:14.000000000 +0100
+@@ -31,17 +31,18 @@
+
+ #include <sys/elf_common.h>
+ #include <elf.h>
++#include <stdint.h>
+
+ /*
+ * ELF definitions common to all 32-bit architectures.
+ */
+
+-typedef u_int32_t Elf32_Addr;
+-typedef u_int16_t Elf32_Half;
+-typedef u_int32_t Elf32_Off;
++typedef uint32_t Elf32_Addr;
++typedef uint16_t Elf32_Half;
++typedef uint32_t Elf32_Off;
+ typedef int32_t Elf32_Sword;
+-typedef u_int32_t Elf32_Word;
+-typedef u_int32_t Elf32_Size;
++typedef uint32_t Elf32_Word;
++typedef uint32_t Elf32_Size;
+ typedef Elf32_Off Elf32_Hashelt;
+
+ /* Macros for accessing the fields of r_info. */
Modified: trunk/libfreebsd/debian/changelog
===================================================================
--- trunk/libfreebsd/debian/changelog 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/libfreebsd/debian/changelog 2006-03-04 19:08:20 UTC (rev 1310)
@@ -1,3 +1,9 @@
+libfreebsd (0.0-2) UNRELEASED; urgency=low
+
+ * Add kfreebsd-amd64.
+
+ -- Robert Millan <rmh at aybabtu.com> Sat, 4 Mar 2006 20:35:26 +0100
+
libfreebsd (0.0-1) unreleased; urgency=low
* Initial release.
Modified: trunk/libfreebsd/debian/control
===================================================================
--- trunk/libfreebsd/debian/control 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/libfreebsd/debian/control 2006-03-04 19:08:20 UTC (rev 1310)
@@ -8,7 +8,7 @@
Package: libfreebsd0
Section: libs
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: FreeBSD compatibility library - shared library
This library provides some functions specific to FreeBSD's libc, either in
@@ -20,7 +20,7 @@
Package: libfreebsd-dev
Section: libdevel
-Architecture: kfreebsd-i386
+Architecture: kfreebsd-i386 kfreebsd-amd64
Depends: libfreebsd0 (= ${Source-Version})
Description: Development files for libfreebsd
This package contains the header files and static library needed to
Modified: trunk/web/cdscripts/mfsroot.sh
===================================================================
--- trunk/web/cdscripts/mfsroot.sh 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/web/cdscripts/mfsroot.sh 2006-03-04 19:08:20 UTC (rev 1310)
@@ -41,9 +41,10 @@
ln ${mnt}/stand/sysinstall ${mnt}/stand/$i
done
-# debian commands
-for i in ld.so.1 libc.so.0.1 libufs.so.2 ; do
- cp /lib/$i ${mnt}/lib/
+# debian commands. fsck.ufs is illustrative of the libraries we need, because
+# it drags in libufs.so, libc.so and ld.so
+for i in `which fsck.ufs | xargs ldd | sed -e "s/ (0x[0-f]*)$//g" -e "s/.* //g" -e "s/\t*//g"` ; do
+ cp $i ${mnt}/lib/
done
cp `which mkfs.ufs` ${mnt}/stand/newfs
Modified: trunk/web/cdscripts/netinst.sh
===================================================================
--- trunk/web/cdscripts/netinst.sh 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/web/cdscripts/netinst.sh 2006-03-04 19:08:20 UTC (rev 1310)
@@ -15,7 +15,7 @@
distribution_lowcase=`echo ${distribution} | tr [A-Z] [a-z] | tr " " "_"`
version=`date +%Y%m%d`
-cpu=i386
+cpu=`dpkg-architecture -qDEB_HOST_ARCH_CPU`
cdname=${distribution_lowcase}-${version}-kfreebsd-${cpu}-install.iso
if [ "$UID" != "0" ] ; then
@@ -41,8 +41,15 @@
tar -C ${tmp1} -xzf base.tgz
case ${distribution_lowcase} in
debian)
- dpkg --extract ${tmp1}/var/cache/apt/archives/kfreebsd-loader_*_kfreebsd-i386.deb ${tmp}/
- kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-5.*-486_*_kfreebsd-i386.deb`
+ dpkg --extract ${tmp1}/var/cache/apt/archives/kfreebsd-loader_*_kfreebsd-${cpu}.deb ${tmp}/
+ case ${cpu} in
+ i386)
+ kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-5.*-486_*_kfreebsd-${cpu}.deb`
+ ;;
+ *)
+ kfreebsd_image=`echo ${tmp1}/var/cache/apt/archives/kfreebsd-image-6.*-${cpu}-generic_*_kfreebsd-${cpu}.deb`
+ ;;
+ esac
dpkg --extract ${kfreebsd_image} ${tmp}/
kfreebsd_version=`echo ${kfreebsd_image} | sed -e "s,.*/kfreebsd-image-,,g" -e "s,_.*,,g"`
;;
Modified: trunk/web/cdscripts/tarball.sh
===================================================================
--- trunk/web/cdscripts/tarball.sh 2006-03-04 16:18:48 UTC (rev 1309)
+++ trunk/web/cdscripts/tarball.sh 2006-03-04 19:08:20 UTC (rev 1310)
@@ -32,7 +32,7 @@
if test -e base.tgz ; then
tar --same-owner -xzpf base.tgz -C ${tmp}
else
- /usr/share/crosshurd/makehurddir.sh ${tmp} i486 kfreebsd-gnu
+ /usr/share/crosshurd/makehurddir.sh ${tmp} `dpkg-architecture -qDEB_HOST_GNU_CPU` kfreebsd-gnu
fi
if test -e native-install ; then
More information about the Glibc-bsd-commits
mailing list