- PLD merge

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 74573a874d06cded448c182119d5ef62d2a70031..d34776ba74aea75b6eeb3a29f64016f28232d113 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -288,8 +288,10 @@ CONFIG_USLEEP=y
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
 # CONFIG_KBD_MODE is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
+CONFIG_LOADFONT=y
+CONFIG_FEATURE_LOADFONT_PSF2=y
+CONFIG_FEATURE_LOADFONT_RAW=y
+CONFIG_LOADKMAP=y
 # CONFIG_OPENVT is not set
 # CONFIG_RESET is not set
 # CONFIG_RESIZE is not set

diff --git a/busybox.spec b/busybox.spec
index 16784b68f1b7fc0697640337216b6f9806f52bd0..bf8d4defe9ff3ffdcfb718c8855f37e743546e62 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -18,7 +18,7 @@
 %bcond_without initrd          # don't build initrd version
 %bcond_with    dietlibc        # build dietlibc-based initrd and static versions
 %bcond_with    glibc           # build glibc-based initrd and static versions
-%bcond_with    verbose         # verbose build
+%bcond_without verbose         # verbose build
 # Options below are useful, when you want fileutils and grep providing.
 # For example, ash package requires fileutils and grep.
 %bcond_with    fileutl_prov    # adds fileutils providing
@@ -38,7 +38,7 @@ Summary(pt_BR.UTF-8): BusyBox é um conjunto de utilitários UNIX em um único b
 Name:          busybox
 # stable line only
 Version:       1.22.1
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
@@ -52,6 +52,8 @@ Patch101:     http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-date.patch
 # Patch101-md5:        bc381f9ceb3824141c968f5bc4353943
 Patch102:      http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-iplink.patch
 # Patch102-md5:        24686ec2750a8703feb57fc9c6aaed1d
+Patch103:      http://busybox.net/downloads/fixes-1.22.1/busybox-1.22.1-nc.patch
+# Patch103-md5:        69eecaae5f812d08655dfdf34b60503f
 Patch1:                %{name}-logconsole.patch
 Patch2:                %{name}-printf-gettext.patch
 Patch3:                %{name}-loadfont.patch
@@ -161,6 +163,7 @@ Statycznie skonsolidowany busybox dla initrd.
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
 %patch1 -p1
 %patch2 -p1
 #%patch3 -p1