diff options
| author | maximilian attems <maks@debian.org> | 2007-06-21 11:51:08 +0200 |
|---|---|---|
| committer | maximilian attems <maks@debian.org> | 2007-06-21 11:51:08 +0200 |
| commit | 879602b218973fc7a5f92874bbaf41ea818fae31 (patch) | |
| tree | c0143e88824508251ac1c61af69db9c1fd931e69 | |
| parent | ea411290cf026aa07d8cf4c2a0f8154e0dbde977 (diff) | |
| download | initramfs-tools-879602b218973fc7a5f92874bbaf41ea818fae31.tar.gz initramfs-tools-879602b218973fc7a5f92874bbaf41ea818fae31.zip | |
mkinitramfs: add patch from joeyh fixing arm boot
acked by aurel32:
11:07 <aurel32> maks: I ack the fact to always add libgcc to arm,
init needs libgcc1 for _Unwind_* functions
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rwxr-xr-x | mkinitramfs | 5 |
2 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 4993f97..e1aa7c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,21 @@ initramfs-tools (0.89) unstable; urgency=low + [ maximilian attems ] * initramfs.conf.5: Document ROOT hardcoding. - * scripts/local: Use simpler fstype invocation. - * initramfs-tools.8, initramfs.conf.5: Fix typos. (closes: #427837, #427838) Thanks "A. Costa" <agcosta@gis.net> for the patch. - * scripts/local: Try to warn for renamed root dev. (closes: #374611) - * minitramfs: Fall back to bootable default MODULES=most if unsupported MODULES setting is passed. Thanks Henning Sprang <henning_sprang@gmx.de> for report. (closes: #429144) - -- maximilian attems <maks@debian.org> Wed, 20 Jun 2007 21:06:43 +0200 + [ Joey Hess ] + * mkinitramfs: Include libgcc_s.so.1 on arm since glibc always tries to load + it for the SJLJ exception handling on that architecture. (closes: #426395) + Thanks to Aurelien Jarno for ack and review. + + -- maximilian attems <maks@debian.org> Thu, 21 Jun 2007 11:49:23 +0200 initramfs-tools (0.88) unstable; urgency=low diff --git a/mkinitramfs b/mkinitramfs index d8a24fe..e1cf857 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -261,6 +261,11 @@ copy_exec /sbin/rmmod /sbin mkdir -p "${DESTDIR}/etc/modprobe.d" cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d" +# workaround: libgcc always needed on old-abi arm +if [ "$DPKG_ARCH" = arm ] || [ "$DPKG_ARCH" = armeb ]; then + cp -a /lib/libgcc_s.so.1 "${DESTDIR}/lib" +fi + run_scripts /usr/share/initramfs-tools/hooks run_scripts "${CONFDIR}"/hooks |