system/iso
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added busybox glibc 2.16 build fix and initramfs losetup tweak

Browse Source
This commit is contained in:
Matt Housh 2012-08-09 10:24:51 -05:00
parent c6e55e2124
commit 08c16c5647
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -112,6 +112,7 @@ busybox/busybox-$(BB_VERSION).tar.bz2:
busybox/busybox-$(BB_VERSION): busybox/busybox-$(BB_VERSION).tar.bz2
@tar -C busybox -xjmf busybox/busybox-$(BB_VERSION).tar.bz2
@(cd busybox/busybox-$(BB_VERSION) && patch -p1 -i ../busybox-$(BB_VERSION)-glibc-2.16.patch)
busybox/busybox: busybox/busybox-$(BB_VERSION)
@cp -f busybox/busybox-$(BB_VERSION).config busybox/busybox-$(BB_VERSION)/.config

11
busybox/busybox-1.20.2-glibc-2.16.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urN busybox-1.20.2.orig/include/libbb.h busybox-1.20.2/include/libbb.h
--- busybox-1.20.2.orig/include/libbb.h 2012-07-02 14:08:25.000000000 +0000
+++ busybox-1.20.2/include/libbb.h 2012-08-09 03:59:39.107609249 +0000
@@ -40,6 +40,7 @@
#include <sys/poll.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
+#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/time.h>

2
initramfs/init
View File

@ -113,7 +113,7 @@ find_and_mount_media() {
rmdir /.tmpfs/.squashfs
# disassociate the loopback device associated with the squashfs filesystem
/bin/losetup -d /dev/loop0
/bin/losetup -d /dev/loop0 2>/dev/null
# the media gets unmounted here and remounted after switch_root
umount /.tmpfs/.media