diff options
| -rw-r--r-- | packages/altboot/altboot_1.1.1+wip-SVNR80.bb (renamed from packages/altboot/altboot_1.1.1+wip-SVNR79.bb) | 2 | ||||
| -rw-r--r-- | packages/klibc/files/staging.patch | 96 | ||||
| -rw-r--r-- | packages/klibc/klibc-utils-static_1.5.bb | 4 | ||||
| -rw-r--r-- | packages/klibc/klibc.inc | 1 | ||||
| -rw-r--r-- | packages/klibc/klibc_1.5.bb | 2 | ||||
| -rw-r--r-- | packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb | 1 | ||||
| -rw-r--r-- | packages/ttf-fonts/ttf-liberation_0.2.bb | 2 | ||||
| -rw-r--r-- | packages/ttf-fonts/ttf-sazanami_20040629.bb | 1 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb | 2 |
9 files changed, 63 insertions, 48 deletions
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR79.bb b/packages/altboot/altboot_1.1.1+wip-SVNR80.bb index 335572f3c1..b333264d34 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR79.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR80.bb @@ -2,7 +2,7 @@ require altboot.inc PR = "r0" -SVN_REV = "79" +SVN_REV = "80" SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \ " diff --git a/packages/klibc/files/staging.patch b/packages/klibc/files/staging.patch index f5ce23af9f..215daad456 100644 --- a/packages/klibc/files/staging.patch +++ b/packages/klibc/files/staging.patch @@ -1,6 +1,7 @@ -diff -ru klibc.clean/Makefile klibc-1.5/Makefile ---- klibc.clean/Makefile 2008-02-08 22:37:36.000000000 +0100 -+++ klibc-1.5/Makefile 2008-02-15 12:46:48.000000000 +0100 +Index: klibc-1.5/Makefile +=================================================================== +--- klibc-1.5.orig/Makefile 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/Makefile 2008-02-24 15:25:15.213824149 +0100 @@ -33,7 +33,7 @@ export PERL := perl @@ -10,10 +11,11 @@ diff -ru klibc.clean/Makefile klibc-1.5/Makefile export bindir = $(prefix)/bin export libdir = $(prefix)/lib export mandir = $(prefix)/man -diff -ru klibc.clean/scripts/Kbuild.install klibc-1.5/scripts/Kbuild.install ---- klibc.clean/scripts/Kbuild.install 2008-02-08 22:37:36.000000000 +0100 -+++ klibc-1.5/scripts/Kbuild.install 2008-02-18 22:36:35.434193918 +0100 -@@ -88,14 +88,11 @@ +Index: klibc-1.5/scripts/Kbuild.install +=================================================================== +--- klibc-1.5.orig/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/scripts/Kbuild.install 2008-02-24 15:24:28.085825030 +0100 +@@ -88,25 +88,21 @@ header: $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)" $(Q)mkdir -p $(INSTALLROOT)$(bindir) @@ -24,12 +26,15 @@ diff -ru klibc.clean/scripts/Kbuild.install klibc-1.5/scripts/Kbuild.install $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib - $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin -- $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ -+ $(Q)-set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ + $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \ for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \ $(KLIBCKERNELOBJ)/include2 ; do \ -@@ -106,7 +103,6 @@ + [ ! -d $$r/$$d ] || \ +- cp -rfL $$r/$$d/. \ ++ cp -rfd $$r/$$d/. \ + $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \ + done ; \ done $(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/. @@ -37,91 +42,100 @@ diff -ru klibc.clean/scripts/Kbuild.install klibc-1.5/scripts/Kbuild.install $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir) footer: header -diff -ru klibc.clean/usr/dash/Kbuild klibc-1.5/usr/dash/Kbuild ---- klibc.clean/usr/dash/Kbuild 2008-02-08 22:37:41.000000000 +0100 -+++ klibc-1.5/usr/dash/Kbuild 2008-02-15 12:18:08.000000000 +0100 +Index: klibc-1.5/usr/dash/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/dash/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/dash/Kbuild 2008-02-24 15:13:50.189827040 +0100 @@ -107,5 +107,3 @@ $(obj)/arith.c: $(obj)/arith.h $(Q): -# Targets to install -install-y := sh.shared -diff -ru klibc.clean/usr/gzip/Kbuild klibc-1.5/usr/gzip/Kbuild ---- klibc.clean/usr/gzip/Kbuild 2008-02-08 22:37:42.000000000 +0100 -+++ klibc-1.5/usr/gzip/Kbuild 2008-02-15 12:18:24.000000000 +0100 +Index: klibc-1.5/usr/gzip/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/gzip/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/gzip/Kbuild 2008-02-24 15:13:50.197824604 +0100 @@ -21,5 +21,3 @@ # Cleaning targets := gzip gzip.g gunzip zcat -# Targets to install -install-y := gzip gunzip zcat -diff -ru klibc.clean/usr/kinit/fstype/Kbuild klibc-1.5/usr/kinit/fstype/Kbuild ---- klibc.clean/usr/kinit/fstype/Kbuild 2008-02-08 22:37:40.000000000 +0100 -+++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-15 12:26:20.000000000 +0100 +Index: klibc-1.5/usr/kinit/fstype/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/kinit/fstype/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/kinit/fstype/Kbuild 2008-02-24 15:13:50.201824503 +0100 @@ -21,5 +21,3 @@ # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) -diff -ru klibc.clean/usr/kinit/ipconfig/Kbuild klibc-1.5/usr/kinit/ipconfig/Kbuild ---- klibc.clean/usr/kinit/ipconfig/Kbuild 2008-02-08 22:37:40.000000000 +0100 -+++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-15 12:26:33.000000000 +0100 +Index: klibc-1.5/usr/kinit/ipconfig/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/kinit/ipconfig/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/kinit/ipconfig/Kbuild 2008-02-24 15:13:50.205824123 +0100 @@ -27,5 +27,3 @@ # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) -diff -ru klibc.clean/usr/kinit/Kbuild klibc-1.5/usr/kinit/Kbuild ---- klibc.clean/usr/kinit/Kbuild 2008-02-08 22:37:40.000000000 +0100 -+++ klibc-1.5/usr/kinit/Kbuild 2008-02-15 12:18:43.000000000 +0100 +Index: klibc-1.5/usr/kinit/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/kinit/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/kinit/Kbuild 2008-02-24 15:13:50.209824302 +0100 @@ -33,5 +33,3 @@ subdir- := fstype ipconfig nfsmount resume run-init -# install binary -install-y := kinit kinit.shared -diff -ru klibc.clean/usr/kinit/nfsmount/Kbuild klibc-1.5/usr/kinit/nfsmount/Kbuild ---- klibc.clean/usr/kinit/nfsmount/Kbuild 2008-02-08 22:37:40.000000000 +0100 -+++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-15 12:26:46.000000000 +0100 +Index: klibc-1.5/usr/kinit/nfsmount/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/kinit/nfsmount/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/kinit/nfsmount/Kbuild 2008-02-24 15:13:50.213824201 +0100 @@ -23,5 +23,3 @@ clean-dirs := static shared -# Install binary -install-y := $(shared-y) -diff -ru klibc.clean/usr/kinit/resume/Kbuild klibc-1.5/usr/kinit/resume/Kbuild ---- klibc.clean/usr/kinit/resume/Kbuild 2008-02-08 22:37:39.000000000 +0100 -+++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-15 12:27:01.000000000 +0100 +Index: klibc-1.5/usr/kinit/resume/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/kinit/resume/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/kinit/resume/Kbuild 2008-02-24 15:13:50.217824380 +0100 @@ -26,5 +26,3 @@ # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) -diff -ru klibc.clean/usr/kinit/run-init/Kbuild klibc-1.5/usr/kinit/run-init/Kbuild ---- klibc.clean/usr/kinit/run-init/Kbuild 2008-02-08 22:37:39.000000000 +0100 -+++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-15 12:27:12.000000000 +0100 +Index: klibc-1.5/usr/kinit/run-init/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/kinit/run-init/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/kinit/run-init/Kbuild 2008-02-24 15:13:50.221824559 +0100 @@ -21,5 +21,3 @@ # Cleaning clean-dirs := static shared -# install binary -install-y := $(shared-y) -Only in klibc-1.5/usr/klibc/arch/arm: klib.list -diff -ru klibc.clean/usr/klibc/Kbuild klibc-1.5/usr/klibc/Kbuild ---- klibc.clean/usr/klibc/Kbuild 2008-02-08 22:37:49.000000000 +0100 -+++ klibc-1.5/usr/klibc/Kbuild 2008-02-15 12:17:24.000000000 +0100 +Index: klibc-1.5/usr/klibc/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/klibc/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/klibc/Kbuild 2008-02-24 15:13:50.229824358 +0100 @@ -175,5 +175,3 @@ $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib)) $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)lib - $(Q)$(install-lib) $(obj)/klibc-$(SOLIBHASH).so \ - $(INSTALLROOT)$(SHLIBDIR) -diff -ru klibc.clean/usr/utils/Kbuild klibc-1.5/usr/utils/Kbuild ---- klibc.clean/usr/utils/Kbuild 2008-02-08 22:37:37.000000000 +0100 -+++ klibc-1.5/usr/utils/Kbuild 2008-02-15 12:17:51.000000000 +0100 +Index: klibc-1.5/usr/utils/Kbuild +=================================================================== +--- klibc-1.5.orig/usr/utils/Kbuild 2007-03-04 02:52:10.000000000 +0100 ++++ klibc-1.5/usr/utils/Kbuild 2008-02-24 15:13:50.229824358 +0100 @@ -64,5 +64,3 @@ # Clean deletes the static and shared dir clean-dirs := static shared diff --git a/packages/klibc/klibc-utils-static_1.5.bb b/packages/klibc/klibc-utils-static_1.5.bb index 7248576c9f..cac8c1c67f 100644 --- a/packages/klibc/klibc-utils-static_1.5.bb +++ b/packages/klibc/klibc-utils-static_1.5.bb @@ -1,9 +1,7 @@ require klibc-common.inc -PR = "r4" +PR = "r5" -SRC_URI_append_linux-gnueabi = "\ - file://klibc-config-eabi.patch;patch=1" # We only want the static utils. klibc build both. So we install only what we want. do_install() { diff --git a/packages/klibc/klibc.inc b/packages/klibc/klibc.inc index d7065f1e67..78e1bca125 100644 --- a/packages/klibc/klibc.inc +++ b/packages/klibc/klibc.inc @@ -3,7 +3,6 @@ require klibc-common.inc SRC_URI += "file://staging.patch;patch=1 \ file://klibc_kexecsyscall.patch;patch=1 \ " -SRC_URI_append_linux-gnueabi = "file://klibc-config-eabi.patch;patch=1" # we want only the shared programms and the lib so we chose them manually do_install() { diff --git a/packages/klibc/klibc_1.5.bb b/packages/klibc/klibc_1.5.bb index a8f054cd23..524437f9f9 100644 --- a/packages/klibc/klibc_1.5.bb +++ b/packages/klibc/klibc_1.5.bb @@ -1,2 +1,2 @@ require klibc.inc -PR = "r1" +PR = "r3" diff --git a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb index 2964d7a7d8..a3126c00d3 100644 --- a/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb +++ b/packages/ttf-fonts/ttf-hunkyfonts_0.3.0.bb @@ -10,5 +10,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" S = "${WORKDIR}/hunkyfonts-${PV}/TTF/" PACKAGES = "${PN}-dbg ttf-hunky-sans ttf-hunky-serif" +RRECOMMENDS_${PN}-dbg = "" FILES_ttf-hunky-sans = "${datadir}/fonts/truetype/HunkySans*.ttf" FILES_ttf-hunky-serif = "${datadir}/fonts/truetype/HunkySerif*.ttf" diff --git a/packages/ttf-fonts/ttf-liberation_0.2.bb b/packages/ttf-fonts/ttf-liberation_0.2.bb index 08d450e2ab..048d43c1c8 100644 --- a/packages/ttf-fonts/ttf-liberation_0.2.bb +++ b/packages/ttf-fonts/ttf-liberation_0.2.bb @@ -9,6 +9,8 @@ SRC_URI = "http://www.redhat.com/f/fonts/liberation-fonts-ttf-3.tar.gz" S = "${WORKDIR}/liberation-fonts-${PV}" PACKAGES = "${PN}-dbg ttf-liberation-mono ttf-liberation-sans ttf-liberation-serif" +RRECOMMENDS_${PN}-dbg = "" + FILES_ttf-liberation-mono = "${datadir}/fonts/truetype/*Mono*" FILES_ttf-liberation-sans = "${datadir}/fonts/truetype/*Sans*" FILES_ttf-liberation-serif = "${datadir}/fonts/truetype/*Serif*" diff --git a/packages/ttf-fonts/ttf-sazanami_20040629.bb b/packages/ttf-fonts/ttf-sazanami_20040629.bb index ef65d40b6b..8cf46ae82d 100644 --- a/packages/ttf-fonts/ttf-sazanami_20040629.bb +++ b/packages/ttf-fonts/ttf-sazanami_20040629.bb @@ -14,6 +14,7 @@ SRC_URI = "http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" PACKAGES = "${PN}-dbg ttf-sazanami-gothic ttf-sazanami-mincho" +RRECOMMENDS_${PN}-dbg = "" FILES_ttf-sazanami-gothic = "${datadir}/fonts/truetype/sazanami-gothic.ttf \ ${datadir}/doc/ttf-sazanami-gothic/README" FILES_ttf-sazanami-mincho = "${datadir}/fonts/truetype/sazanami-mincho.ttf \ diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb index 622b32179d..54fe19d990 100644 --- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb @@ -9,7 +9,7 @@ PROVIDES = "virtual/xserver" PE = "1" PR = "r4" -FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive" +FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ file://kdrive-evdev.patch;patch=1 \ |
