summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/build.mk2
-rw-r--r--mk/rootfs.mk2
-rw-r--r--package/dosfstools/Makefile5
-rw-r--r--package/dosfstools/patches/patch-Makefile10
-rw-r--r--package/xfsprogs/Makefile3
-rw-r--r--target/config/Config.in3
-rw-r--r--target/linux/config/Config.in.audio5
-rw-r--r--target/linux/config/Config.in.netdevice11
-rw-r--r--target/linux/config/Config.in.usb48
-rw-r--r--target/linux/kernel.config1
-rw-r--r--target/mips/Makefile2
-rw-r--r--target/mips/kernel/lemote-yeelong27
-rw-r--r--target/mips/sys-available/lemote-yeelong3
-rw-r--r--target/sparc64/Makefile3
-rw-r--r--toolchain/uClibc/patches/uclibc-git-20140313.patch (renamed from toolchain/uClibc/patches/uclibc-git-20140212.patch)13761
-rw-r--r--toolchain/uClibc/patches/xxx-n32-pread_pwrite.patch32
16 files changed, 6595 insertions, 7323 deletions
diff --git a/mk/build.mk b/mk/build.mk
index fd1d12c11..5821e6c20 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -37,6 +37,8 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_PACKAGE_OPENAFS=n \
ADK_PACKAGE_OPENJDK7=n \
ADK_PKG_XORG=n \
+ ADK_PKG_CONSOLE=n \
+ ADK_PKG_TEST=n \
ADK_PKG_MPDBOX=n \
ADK_PKG_DEVELOPMENT=n \
ADK_PKG_CONSOLE=n \
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 5ec5f3107..55830b23c 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -36,7 +36,7 @@ ROOTFS:= root=/dev/sda1 rootwait
endif
ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
-USB:= rootwait
+USB:= rootwait root=/dev/sdc1
else
USB:= rootdelay=2
endif
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index 2235e73af..1dd82182a 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= dosfstools
PKG_VERSION:= 3.0.26
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 45012f5f56f2aae3afcd62120b9e5a08
PKG_DESCR:= utilities to create and check FAT filesystems
PKG_SECTION:= fs
+PKG_BUILDDEP:= libiconv-tiny
PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/
PKG_SITES:= http://daniel-baumann.ch/files/software/dosfstools/
@@ -19,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-XAKE_FLAGS+= PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64"
+XAKE_FLAGS+= PREFIX=""
dosfstools-install:
${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin
diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile
index c20b7f4dc..1d127acbc 100644
--- a/package/dosfstools/patches/patch-Makefile
+++ b/package/dosfstools/patches/patch-Makefile
@@ -1,11 +1,13 @@
---- dosfstools-3.0.9.orig/Makefile 2009-10-04 11:03:23.000000000 +0200
-+++ dosfstools-3.0.9/Makefile 2011-01-07 21:50:15.000000000 +0100
-@@ -29,7 +29,7 @@ OPTFLAGS = -O2 -fomit-frame-pointer $(sh
+--- dosfstools-3.0.26.orig/Makefile 2014-01-17 07:09:28.000000000 +0100
++++ dosfstools-3.0.26/Makefile 2014-03-13 08:58:52.000000000 +0100
+@@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G
#WARNFLAGS = -Wall -pedantic -std=c99
- WARNFLAGS = -Wall
+ WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes
DEBUGFLAGS = -g
-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
++CFLAGS ?=
+CFLAGS += $(WARNFLAGS)
++LDLIBS = -liconv
VPATH = src
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 78e30a09a..c06803164 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -9,8 +9,9 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= d6159f7a664d95b4c150d580399d4400
PKG_DESCR:= Utilities for XFS filesystems
PKG_SECTION:= fs
-PKG_BUILDDEP:= e2fsprogs util-linux
+PKG_BUILDDEP:= e2fsprogs util-linux ncurses
PKG_DEPENDS:= libuuid libpthread libblkid librt libgcc
+PKG_DEPENDS+= libncurses
PKG_URL:= http://oss.sgi.com/projects/xfs
PKG_SITES:= ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
diff --git a/target/config/Config.in b/target/config/Config.in
index c50fbd289..3de5e3a23 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -213,6 +213,7 @@ config ADK_TARGET_KERNEL_MINICONFIG
default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I
default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+ default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
config ADK_QEMU_ARGS
string
@@ -612,7 +613,7 @@ config ADK_TARGET_CFLAGS
config ADK_TARGET_CMDLINE
string
default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI
- default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+ default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I
default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index c466bed45..8a4198aee 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -4,6 +4,9 @@ depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND
config ADK_KERNEL_SND_ARM
boolean
+config ADK_KERNEL_SND_PCI
+ boolean
+
config ADK_KERNEL_SND_USB
boolean
@@ -36,7 +39,6 @@ config ADK_KPACKAGE_KMOD_SND_RAWMIDI
config ADK_KPACKAGE_KMOD_SND_AC97_CODEC
tristate
- depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND
config ADK_KPACKAGE_KMOD_SND
prompt "kmod-snd...................... ALSA sound support"
@@ -93,6 +95,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370
config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver"
tristate
+ select ADK_KERNEL_SND_PCI
select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
select ADK_KPACKAGE_KMOD_SND
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 789b75b7d..7aabc0b7e 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -68,17 +68,6 @@ config ADK_KERNEL_NATSEMI
default n
help
-config ADK_KERNEL_8139TOO
- boolean
- select ADK_KERNEL_NETDEVICES
- select ADK_KERNEL_NET_ETHERNET
- select ADK_KERNEL_NET_PCI
- select ADK_KERNEL_MII
- default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default n
- help
-
-
config ADK_KERNEL_VIA_RHINE
boolean
select ADK_KERNEL_NETDEVICES
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index f6fd22339..2d50e24b2 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -5,20 +5,23 @@ config ADK_KERNEL_USB_SUPPORT
boolean
config ADK_KERNEL_USB
+ boolean
select ADK_KERNEL_USB_SUPPORT
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
- boolean
+ default n
config ADK_KERNEL_USB_OHCI_HCD
+ boolean
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
- boolean
+ default n
config ADK_KERNEL_USB_OHCI_HCD_PLATFORM
+ boolean
default y if ADK_TARGET_SYSTEM_QEMU_SH4
default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
- boolean
+ default n
config ADK_KERNEL_USB_LIBUSUAL
tristate
@@ -47,8 +50,6 @@ config ADK_KPACKAGE_KMOD_USB
select ADK_KERNEL_NLS
select ADK_KERNEL_USB_SUPPORT
depends on !ADK_KERNEL_USB
- default y if ADK_TARGET_SYSTEM_QEMU_I686
- default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
@@ -111,15 +112,12 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
tristate
select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
- #depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- default y if ADK_TARGET_SYSTEM_QEMU_SH4
- default y if ADK_TARGET_SYSTEM_QEMU_SH4EB
default n
help
The Open Host Controller Interface (OHCI) is a standard for accessing
@@ -176,8 +174,6 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
depends on ADK_KPACKAGE_KMOD_USB
- default y if ADK_TARGET_SYSTEM_QEMU_I686
- default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
@@ -212,34 +208,34 @@ config ADK_PACKAGE_KMOD_USB_CONTROLLER
config ADK_KPACKAGE_KMOD_USB_ACM
prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_PEGASUS
prompt "kmod-usb-pegasus.................. Support for USB Pegasus"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_HSO
prompt "kmod-usb-hso...................... Support for USB HSO devices"
tristate
select ADK_KPACKAGE_KMOD_RFKILL
select ADK_KPACKAGE_KMOD_USB_STORAGE
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_PRINTER
prompt "kmod-usb-printer.................. Support for USB printers"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_SERIAL
prompt "kmod-usb-serial................... Support for USB-to-serial converters"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
help
Say Y here if you have a USB device that provides normal serial
ports, or acts like a serial device, and you want to connect it to
@@ -253,8 +249,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL
config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN
prompt "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use a Belkin USB Serial single port
adaptor (F5U103 is one of the model numbers) or the Peracom single
@@ -263,8 +259,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN
config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO
prompt "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converter"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use a FTDI SIO single port USB to serial
converter device. The implementation I have is called the USC-1000.
@@ -276,8 +272,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_FTDI_SIO
config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232
prompt "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use a USB Serial single port adapter from
Magic Control Technology Corp. (U232 is one of the model numbers).
@@ -288,8 +284,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_MCT_U232
config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303
prompt "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to use the PL2303 USB Serial single port
adapter from Prolific.
@@ -297,8 +293,8 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_PL2303
config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR
prompt "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_SERIAL
+ default n
help
Say Y here if you want to connect to your HandSpring Visor, Palm
m500 or m505 through its USB docking station. See
@@ -308,43 +304,43 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL_VISOR
config ADK_KPACKAGE_KMOD_USB_STORAGE
prompt "kmod-usb-storage.................. Support for USB storage devices"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on !ADK_KERNEL_USB_STORAGE
select ADK_KPACKAGE_KMOD_SCSI if !ADK_KERNEL_SCSI
select ADK_KPACKAGE_KMOD_BLK_DEV_SD if !ADK_KERNEL_SCSI
+ default n
config ADK_KPACKAGE_KMOD_USB_ATM
prompt "kmod-usb-atm...................... Support for USB ATM devices"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_ATM_SPEEDTOUCH
prompt "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem"
tristate
- default n
depends on ADK_KPACKAGE_KMOD_USB_ATM
+ default n
config ADK_KPACKAGE_KMOD_USB_USBNET
prompt "kmod-usb-usbnet................... Multi-purpose USB Networking Framework"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_SND_USB_AUDIO
prompt "kmod-snd-usb-audio................ USB sound adapter"
tristate
- default n
select ADK_KERNEL_SND_USB
select ADK_KPACKAGE_KMOD_SND
select ADK_KPACKAGE_KMOD_SND_RAWMIDI
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
config ADK_KPACKAGE_KMOD_USB_SISUSBVGA
prompt "kmod-usb-svga..................... USB 2.0 SVGA dongle support (Net2280/SiS315)"
tristate
- default n
depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
endmenu
diff --git a/target/linux/kernel.config b/target/linux/kernel.config
index a28c2088b..9d9d7619e 100644
--- a/target/linux/kernel.config
+++ b/target/linux/kernel.config
@@ -25,6 +25,7 @@ CONFIG_EMBEDDED=y
CONFIG_MODULES=y
CONFIG_BINFMT_ELF=y
CONFIG_BINFMT_SCRIPT=y
+CONFIG_HOTPLUG=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
diff --git a/target/mips/Makefile b/target/mips/Makefile
index ae51eaa8e..68c2ea0fe 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -137,7 +137,7 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL)
ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
@echo "Startup the netbook and type del to enter PMON:"
@echo "PMON> load /dev/fs/ext2@usb0/boot/kernel"
- @echo "PMON> g root=/dev/sdc1"
+ @echo "PMON> g"
endif
endif
ifeq ($(ADK_TARGET_FS),cf)
diff --git a/target/mips/kernel/lemote-yeelong b/target/mips/kernel/lemote-yeelong
new file mode 100644
index 000000000..c37d40271
--- /dev/null
+++ b/target/mips/kernel/lemote-yeelong
@@ -0,0 +1,27 @@
+CONFIG_MIPS=y
+CONFIG_MACH_LOONGSON=y
+CONFIG_LEMOTE_MACH2F=y
+CONFIG_CS5536=y
+CONFIG_CPU_LOONGSON2F=y
+CONFIG_CPU_NOP_WORKAROUNDS=y
+CONFIG_CPU_JUMP_WORKAROUNDS=y
+CONFIG_CPU_LOONGSON2F_WORKAROUNDS=y
+CONFIG_64BIT=y
+CONFIG_PAGE_SIZE_16KB=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_MIPS32_COMPAT=y
+CONFIG_COMPAT=y
+CONFIG_MIPS32_O32=y
+CONFIG_MIPS32_N32=y
+CONFIG_BLK_DEV=y
+CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_8139TOO=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_LIBPS2=y
+
diff --git a/target/mips/sys-available/lemote-yeelong b/target/mips/sys-available/lemote-yeelong
index 10db77945..62eeb88ee 100644
--- a/target/mips/sys-available/lemote-yeelong
+++ b/target/mips/sys-available/lemote-yeelong
@@ -5,8 +5,6 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
select ADK_lemote_yeelong
select ADK_LINUX_64
select ADK_CPU_LOONGSON2F
- select ADK_KERNEL_MACH_LOONGSON
- select ADK_KERNEL_LEMOTE_MACH2F
select ADK_TARGET_WITH_USB_BOOT
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_VGA
@@ -15,6 +13,7 @@ config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
select ADK_TARGET_WITH_HDD
select ADK_TARGET_WITH_PCI
select ADK_TARGET_KERNEL_VMLINUZ
+ select ADK_USE_KERNEL_MINICONFIG
help
System profile for Lemote Yeelong laptop.
diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile
index 12900ec8c..8fe5ebbcc 100644
--- a/target/sparc64/Makefile
+++ b/target/sparc64/Makefile
@@ -19,8 +19,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y)
@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following command line:"
ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
- @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 \
- -net nic,model=virtio -net user'
+ @echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user'
else
@echo 'qemu-system-sparc64 -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img'
endif
diff --git a/toolchain/uClibc/patches/uclibc-git-20140212.patch b/toolchain/uClibc/patches/uclibc-git-20140313.patch
index 049e3e5f3..561c08007 100644
--- a/toolchain/uClibc/patches/uclibc-git-20140212.patch
+++ b/toolchain/uClibc/patches/uclibc-git-20140313.patch
@@ -1,6 +1,6 @@
-diff -Nur uClibc-0.9.33.2/docs/man/arc4random.3 uClibc/docs/man/arc4random.3
+diff -Nur uClibc-0.9.33.2/docs/man/arc4random.3 uClibc-git/docs/man/arc4random.3
--- uClibc-0.9.33.2/docs/man/arc4random.3 1970-01-01 01:00:00.000000000 +0100
-+++ uClibc/docs/man/arc4random.3 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/docs/man/arc4random.3 2014-02-03 12:32:56.000000000 +0100
@@ -0,0 +1,110 @@
+.\" $OpenBSD: arc4random.3,v 1.19 2005/07/17 08:50:55 jaredy Exp $
+.\"
@@ -112,9 +112,9 @@ diff -Nur uClibc-0.9.33.2/docs/man/arc4random.3 uClibc/docs/man/arc4random.3
+.Pp
+These functions first appeared in
+.Ox 2.1 .
-diff -Nur uClibc-0.9.33.2/docs/PORTING uClibc/docs/PORTING
+diff -Nur uClibc-0.9.33.2/docs/PORTING uClibc-git/docs/PORTING
--- uClibc-0.9.33.2/docs/PORTING 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/docs/PORTING 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/docs/PORTING 2014-02-03 12:32:56.000000000 +0100
@@ -130,9 +130,6 @@
====================
=== Misc Cruft ===
@@ -125,9 +125,9 @@ diff -Nur uClibc-0.9.33.2/docs/PORTING uClibc/docs/PORTING
- MAINTAINERS - presumably you're going to submit this code back to mainline
and since you're the only one who cares about this arch (right now), you
should add yourself to the toplevel MAINTAINERS file. do it.
-diff -Nur uClibc-0.9.33.2/extra/config/check.sh uClibc/extra/config/check.sh
+diff -Nur uClibc-0.9.33.2/extra/config/check.sh uClibc-git/extra/config/check.sh
--- uClibc-0.9.33.2/extra/config/check.sh 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/check.sh 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/check.sh 2014-02-03 12:32:56.000000000 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
# Needed for systems without gettext
@@ -136,9 +136,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/check.sh uClibc/extra/config/check.sh
#include <libintl.h>
int main()
{
-diff -Nur uClibc-0.9.33.2/extra/config/conf.c uClibc/extra/config/conf.c
+diff -Nur uClibc-0.9.33.2/extra/config/conf.c uClibc-git/extra/config/conf.c
--- uClibc-0.9.33.2/extra/config/conf.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/conf.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/conf.c 2014-02-03 12:32:56.000000000 +0100
@@ -10,42 +10,48 @@
#include <string.h>
#include <time.h>
@@ -728,9 +728,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/conf.c uClibc/extra/config/conf.c
+ if (fgets(str, size, in) == NULL)
+ fprintf(stderr, "\nError in reading or end of file.\n");
+}
-diff -Nur uClibc-0.9.33.2/extra/config/confdata.c uClibc/extra/config/confdata.c
+diff -Nur uClibc-0.9.33.2/extra/config/confdata.c uClibc-git/extra/config/confdata.c
--- uClibc-0.9.33.2/extra/config/confdata.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/confdata.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/confdata.c 2014-02-03 12:32:56.000000000 +0100
@@ -5,24 +5,27 @@
#include <sys/stat.h>
@@ -1939,9 +1939,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/confdata.c uClibc/extra/config/confdata.c
+
+ return has_changed;
}
-diff -Nur uClibc-0.9.33.2/extra/config/expr.c uClibc/extra/config/expr.c
+diff -Nur uClibc-0.9.33.2/extra/config/expr.c uClibc-git/extra/config/expr.c
--- uClibc-0.9.33.2/extra/config/expr.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/expr.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/expr.c 2014-02-03 12:32:56.000000000 +0100
@@ -7,15 +7,13 @@
#include <stdlib.h>
#include <string.h>
@@ -2116,9 +2116,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/expr.c uClibc/extra/config/expr.c
}
void expr_gstr_print(struct expr *e, struct gstr *gs)
-diff -Nur uClibc-0.9.33.2/extra/config/expr.h uClibc/extra/config/expr.h
+diff -Nur uClibc-0.9.33.2/extra/config/expr.h uClibc-git/extra/config/expr.h
--- uClibc-0.9.33.2/extra/config/expr.h 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/expr.h 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/expr.h 2014-02-03 12:32:56.000000000 +0100
@@ -10,7 +10,9 @@
extern "C" {
#endif
@@ -2229,9 +2229,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/expr.h uClibc/extra/config/expr.h
#ifdef __cplusplus
}
-diff -Nur uClibc-0.9.33.2/extra/config/gconf.c uClibc/extra/config/gconf.c
+diff -Nur uClibc-0.9.33.2/extra/config/gconf.c uClibc-git/extra/config/gconf.c
--- uClibc-0.9.33.2/extra/config/gconf.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/gconf.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/gconf.c 2014-02-03 12:32:56.000000000 +0100
@@ -10,6 +10,7 @@
# include <config.h>
#endif
@@ -2717,9 +2717,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/gconf.c uClibc/extra/config/gconf.c
switch (view_mode) {
case SINGLE_VIEW:
display_tree_part();
-diff -Nur uClibc-0.9.33.2/extra/config/gconf.glade uClibc/extra/config/gconf.glade
+diff -Nur uClibc-0.9.33.2/extra/config/gconf.glade uClibc-git/extra/config/gconf.glade
--- uClibc-0.9.33.2/extra/config/gconf.glade 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/gconf.glade 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/gconf.glade 2014-02-03 12:32:56.000000000 +0100
@@ -1,11 +1,10 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
@@ -2798,9 +2798,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/gconf.glade uClibc/extra/config/gconf.gla
<signal name="cursor_changed" handler="on_treeview2_cursor_changed" last_modification_time="Sun, 12 Jan 2003 15:57:55 GMT"/>
<signal name="button_press_event" handler="on_treeview2_button_press_event" last_modification_time="Sun, 12 Jan 2003 15:57:58 GMT"/>
<signal name="key_press_event" handler="on_treeview2_key_press_event" last_modification_time="Sun, 12 Jan 2003 15:58:01 GMT"/>
-diff -Nur uClibc-0.9.33.2/extra/config/.gitignore uClibc/extra/config/.gitignore
+diff -Nur uClibc-0.9.33.2/extra/config/.gitignore uClibc-git/extra/config/.gitignore
--- uClibc-0.9.33.2/extra/config/.gitignore 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/.gitignore 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/.gitignore 2014-02-03 12:32:56.000000000 +0100
@@ -2,18 +2,21 @@
# Generated files
#
@@ -2825,9 +2825,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/.gitignore uClibc/extra/config/.gitignore
qconf
gconf
kxgettext
-diff -Nur uClibc-0.9.33.2/extra/config/kconfig-language.txt uClibc/extra/config/kconfig-language.txt
+diff -Nur uClibc-0.9.33.2/extra/config/kconfig-language.txt uClibc-git/extra/config/kconfig-language.txt
--- uClibc-0.9.33.2/extra/config/kconfig-language.txt 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/kconfig-language.txt 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/kconfig-language.txt 2014-02-03 12:32:56.000000000 +0100
@@ -112,7 +112,13 @@
(no prompts anywhere) and for symbols with no dependencies.
That will limit the usefulness but on the other hand avoid
@@ -2897,9 +2897,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/kconfig-language.txt uClibc/extra/config/
limits FOO to module (=m) or disabled (=n).
-
-diff -Nur uClibc-0.9.33.2/extra/config/kconfig_load.c uClibc/extra/config/kconfig_load.c
+diff -Nur uClibc-0.9.33.2/extra/config/kconfig_load.c uClibc-git/extra/config/kconfig_load.c
--- uClibc-0.9.33.2/extra/config/kconfig_load.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/kconfig_load.c 1970-01-01 01:00:00.000000000 +0100
++++ uClibc-git/extra/config/kconfig_load.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-#include <dlfcn.h>
-#include <stdio.h>
@@ -2936,11 +2936,11 @@ diff -Nur uClibc-0.9.33.2/extra/config/kconfig_load.c uClibc/extra/config/kconfi
-#include "lkc_proto.h"
-#undef P
-}
-Binary files uClibc-0.9.33.2/extra/config/kconfig-to-uclibc.patch.gz and uClibc/extra/config/kconfig-to-uclibc.patch.gz differ
-Binary files uClibc-0.9.33.2/extra/config/kconfig-to-uclibc.tar.gz and uClibc/extra/config/kconfig-to-uclibc.tar.gz differ
-diff -Nur uClibc-0.9.33.2/extra/config/kxgettext.c uClibc/extra/config/kxgettext.c
+Binary files uClibc-0.9.33.2/extra/config/kconfig-to-uclibc.patch.gz and uClibc-git/extra/config/kconfig-to-uclibc.patch.gz differ
+Binary files uClibc-0.9.33.2/extra/config/kconfig-to-uclibc.tar.gz and uClibc-git/extra/config/kconfig-to-uclibc.tar.gz differ
+diff -Nur uClibc-0.9.33.2/extra/config/kxgettext.c uClibc-git/extra/config/kxgettext.c
--- uClibc-0.9.33.2/extra/config/kxgettext.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/kxgettext.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/kxgettext.c 2014-02-03 12:32:56.000000000 +0100
@@ -7,7 +7,6 @@
#include <stdlib.h>
#include <string.h>
@@ -3023,9 +3023,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/kxgettext.c uClibc/extra/config/kxgettext
{
struct message *m = message__list;
-diff -Nur uClibc-0.9.33.2/extra/config/lex.zconf.c_shipped uClibc/extra/config/lex.zconf.c_shipped
+diff -Nur uClibc-0.9.33.2/extra/config/lex.zconf.c_shipped uClibc-git/extra/config/lex.zconf.c_shipped
--- uClibc-0.9.33.2/extra/config/lex.zconf.c_shipped 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lex.zconf.c_shipped 1970-01-01 01:00:00.000000000 +0100
++++ uClibc-git/extra/config/lex.zconf.c_shipped 1970-01-01 01:00:00.000000000 +0100
@@ -1,2416 +0,0 @@
-
-#line 3 "scripts/kconfig/lex.zconf.c"
@@ -5443,9 +5443,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lex.zconf.c_shipped uClibc/extra/config/l
- return current_pos.file ? current_pos.file->name : "<none>";
-}
-
-diff -Nur uClibc-0.9.33.2/extra/config/list.h uClibc/extra/config/list.h
+diff -Nur uClibc-0.9.33.2/extra/config/list.h uClibc-git/extra/config/list.h
--- uClibc-0.9.33.2/extra/config/list.h 1970-01-01 01:00:00.000000000 +0100
-+++ uClibc/extra/config/list.h 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/list.h 2014-02-03 12:32:56.000000000 +0100
@@ -0,0 +1,131 @@
+#ifndef LIST_H
+#define LIST_H
@@ -5578,9 +5578,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/list.h uClibc/extra/config/list.h
+ entry->prev = (struct list_head*)LIST_POISON2;
+}
+#endif
-diff -Nur uClibc-0.9.33.2/extra/config/lkc.h uClibc/extra/config/lkc.h
+diff -Nur uClibc-0.9.33.2/extra/config/lkc.h uClibc-git/extra/config/lkc.h
--- uClibc-0.9.33.2/extra/config/lkc.h 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lkc.h 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lkc.h 2014-02-03 12:32:56.000000000 +0100
@@ -14,29 +14,37 @@
static inline const char *gettext(const char *txt) { return txt; }
static inline void textdomain(const char *domainname) {}
@@ -5710,9 +5710,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lkc.h uClibc/extra/config/lkc.h
struct symbol *sym_check_deps(struct symbol *sym);
struct property *prop_alloc(enum prop_type type, struct symbol *sym);
struct symbol *prop_get_symbol(struct property *prop);
-diff -Nur uClibc-0.9.33.2/extra/config/lkc_proto.h uClibc/extra/config/lkc_proto.h
+diff -Nur uClibc-0.9.33.2/extra/config/lkc_proto.h uClibc-git/extra/config/lkc_proto.h
--- uClibc-0.9.33.2/extra/config/lkc_proto.h 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lkc_proto.h 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lkc_proto.h 2014-02-03 12:32:56.000000000 +0100
@@ -1,28 +1,40 @@
+#include <stdarg.h>
@@ -5755,9 +5755,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lkc_proto.h uClibc/extra/config/lkc_proto
P(sym_re_search,struct symbol **,(const char *pattern));
P(sym_type_name,const char *,(enum symbol_type type));
P(sym_calc_value,void,(struct symbol *sym));
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/checklist.c uClibc/extra/config/lxdialog/checklist.c
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/checklist.c uClibc-git/extra/config/lxdialog/checklist.c
--- uClibc-0.9.33.2/extra/config/lxdialog/checklist.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/checklist.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/checklist.c 2014-02-03 12:32:56.000000000 +0100
@@ -31,6 +31,10 @@
static void print_item(WINDOW * win, int choice, int selected)
{
@@ -5820,9 +5820,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/checklist.c uClibc/extra/config/
check_x = (list_width - check_x) / 2;
item_x = check_x + 4;
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/check-lxdialog.sh uClibc/extra/config/lxdialog/check-lxdialog.sh
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/check-lxdialog.sh uClibc-git/extra/config/lxdialog/check-lxdialog.sh
--- uClibc-0.9.33.2/extra/config/lxdialog/check-lxdialog.sh 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/check-lxdialog.sh 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/check-lxdialog.sh 2014-02-03 12:32:56.000000000 +0100
@@ -4,7 +4,9 @@
# What library to link
ldflags()
@@ -5862,9 +5862,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/check-lxdialog.sh uClibc/extra/c
#include CURSES_LOC
main() {}
EOF
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/dialog.h uClibc/extra/config/lxdialog/dialog.h
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/dialog.h uClibc-git/extra/config/lxdialog/dialog.h
--- uClibc-0.9.33.2/extra/config/lxdialog/dialog.h 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/dialog.h 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/dialog.h 2014-02-03 12:32:56.000000000 +0100
@@ -106,8 +106,14 @@
int hl; /* highlight this item */
};
@@ -5932,9 +5932,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/dialog.h uClibc/extra/config/lxd
int dialog_inputbox(const char *title, const char *prompt, int height,
int width, const char *init);
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/inputbox.c uClibc/extra/config/lxdialog/inputbox.c
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/inputbox.c uClibc-git/extra/config/lxdialog/inputbox.c
--- uClibc-0.9.33.2/extra/config/lxdialog/inputbox.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/inputbox.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/inputbox.c 2014-02-03 12:32:56.000000000 +0100
@@ -45,7 +45,8 @@
const char *init)
{
@@ -6133,9 +6133,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/inputbox.c uClibc/extra/config/l
print_buttons(dialog, height, width, 1);
break;
case 1:
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/menubox.c uClibc/extra/config/lxdialog/menubox.c
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/menubox.c uClibc-git/extra/config/lxdialog/menubox.c
--- uClibc-0.9.33.2/extra/config/lxdialog/menubox.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/menubox.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/menubox.c 2014-02-03 12:32:56.000000000 +0100
@@ -154,12 +154,14 @@
*/
static void print_buttons(WINDOW * win, int height, int width, int selected)
@@ -6251,9 +6251,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/menubox.c uClibc/extra/config/lx
case 'e':
case 'x':
key = KEY_ESC;
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/textbox.c uClibc/extra/config/lxdialog/textbox.c
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/textbox.c uClibc-git/extra/config/lxdialog/textbox.c
--- uClibc-0.9.33.2/extra/config/lxdialog/textbox.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/textbox.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/textbox.c 2014-02-03 12:32:56.000000000 +0100
@@ -22,23 +22,25 @@
#include "dialog.h"
@@ -6605,9 +6605,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/textbox.c uClibc/extra/config/lx
return line;
}
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/util.c uClibc/extra/config/lxdialog/util.c
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/util.c uClibc-git/extra/config/lxdialog/util.c
--- uClibc-0.9.33.2/extra/config/lxdialog/util.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/util.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/util.c 2014-02-03 12:32:56.000000000 +0100
@@ -19,8 +19,13 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
@@ -6777,9 +6777,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/util.c uClibc/extra/config/lxdia
if (sp && *sp == ' ') {
cur_x++; /* double space */
while (*++sp == ' ') ;
-diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/yesno.c uClibc/extra/config/lxdialog/yesno.c
+diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/yesno.c uClibc-git/extra/config/lxdialog/yesno.c
--- uClibc-0.9.33.2/extra/config/lxdialog/yesno.c 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/lxdialog/yesno.c 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/lxdialog/yesno.c 2014-02-03 12:32:56.000000000 +0100
@@ -45,14 +45,14 @@
WINDOW *dialog;
@@ -6799,9 +6799,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/lxdialog/yesno.c uClibc/extra/config/lxdi
draw_shadow(stdscr, y, x, height, width);
-diff -Nur uClibc-0.9.33.2/extra/config/Makefile uClibc/extra/config/Makefile
+diff -Nur uClibc-0.9.33.2/extra/config/Makefile uClibc-git/extra/config/Makefile
--- uClibc-0.9.33.2/extra/config/Makefile 2012-05-15 09:20:09.000000000 +0200
-+++ uClibc/extra/config/Makefile 2014-02-03 12:32:56.000000000 +0100
++++ uClibc-git/extra/config/Makefile 2014-02-03 12:32:56.000000000 +0100
@@ -1,16 +1,17 @@
top_srcdir ?= ../../
@@ -6912,9 +6912,9 @@ diff -Nur uClibc-0.9.33.2/extra/config/Makefile uClibc/extra/config/Makefile
-FORCE:
-.PHONY: FORCE clean distclean $(always)
+.PHONY: clean distclean $(PHONY)
-diff -Nur uClibc-0.9.33.2/extra/config/Makefile.kconfig uClibc/extra/config/Makefile.kconfig
+diff -Nur uClibc-0.9.33.2/extra/config/Makefile.kconfig uClibc-git/extra/config/Makefile.kconfig
--- uClibc-0.9.33.2/extra/config/Makef