From 494a100b94bc393c0a8cd664f63dc75fc29b9984 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 9 Jun 2014 10:50:40 +0200 Subject: [PATCH] - rel 2; verbose build by default; upstream nc fix; enable loadfont features in initrd --- busybox-initrd.config | 6 ++++-- busybox.spec | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/busybox-initrd.config b/busybox-initrd.config index 74573a8..d34776b 100644 --- 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 db22f26..c02ce7c 100644 --- 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 -- 2.44.0