[oe-commits] org.oe.dev merge of '808beacef20f045331c5d32c4a877b9010fe989a'
thesing commit
openembedded-commits at lists.openembedded.org
Fri Feb 22 20:54:10 UTC 2008
merge of '808beacef20f045331c5d32c4a877b9010fe989a'
and 'f51d223df158f1cff524858100f483e0d4918266'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: cd252a2052020afb6a19af56adfc3d1b2a79aadd
ViewMTN: http://monotone.openembedded.org/revision/info/cd252a2052020afb6a19af56adfc3d1b2a79aadd
Files:
1
packages/klibc/files/install.patch
packages/klibc/klibc_0.190.bb
packages/klibc/klibc_1.1.1.bb
packages/klibc/klibc_1.5.bb
packages/kexec/files/kexec-klibc.patch
packages/klibc/files/klibc_kexecsyscall.patch
packages/klibc/files/staging.patch
packages/kexec/kexec-tools-static_1.101.bb
packages/kexec/kexec-tools.inc
packages/kexec/kexec-tools_1.101.bb
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc.inc
conf/distro/sharprom-compatible.conf
packages/bootsplash/bootsplash-native_3.0.7.bb
Diffs:
#
# mt diff -r808beacef20f045331c5d32c4a877b9010fe989a -rcd252a2052020afb6a19af56adfc3d1b2a79aadd
#
#
#
# delete "packages/klibc/files/install.patch"
#
# delete "packages/klibc/klibc_0.190.bb"
#
# rename "packages/klibc/klibc_1.1.1.bb"
# to "packages/klibc/klibc_1.5.bb"
#
# add_file "packages/kexec/files/kexec-klibc.patch"
# content [0c778df2238eb4e8880f42f1cbad2044a8dadd87]
#
# add_file "packages/klibc/files/klibc_kexecsyscall.patch"
# content [027581e82a2945c16d6bd7ee256967b69a2fc638]
#
# add_file "packages/klibc/files/staging.patch"
# content [744788fb708efea82c9caafcb0509e1581351bcb]
#
# patch "packages/kexec/kexec-tools-static_1.101.bb"
# from [674c9eaf4fafd6d5c38088e0bc02792ec9389d12]
# to [d0f22ab3acf2088a1f8f5c9d8c236df7ab851083]
#
# patch "packages/kexec/kexec-tools.inc"
# from [46447a70d4c5e42a305dc4920a1a924741867aca]
# to [26f7178b5fe7c56ce1096f1c04aa5e25320a6474]
#
# patch "packages/kexec/kexec-tools_1.101.bb"
# from [1d9c587e836f1b4b6071adcc2a9f6b91314468d5]
# to [99597c038f5dd47567309c34f3eefbecd95e5ad1]
#
# patch "packages/klibc/klibc-common.inc"
# from [ba81140300a9fbe13c2d1ef4661b42a4368a3b88]
# to [e31a6c551a6ead6e8029e2b0f4cb5117dcf1677f]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [0aeaa25067f4778c45bbbd7ec34c5031db9f1f12]
# to [712cc1a9eaaf4de058b8926a6f376e589d0c865c]
#
# patch "packages/klibc/klibc.inc"
# from [cdee53d9d84aed0197c588fae6119d3f6701904c]
# to [53e4f37f521ba3c1a20198a13faa8a95f2f812b8]
#
# patch "packages/klibc/klibc_1.5.bb"
# from [d52cd890178b463fedaaf708ec6a0221604c1c9c]
# to [8afd19f9d2e288ae6198fe88d8c74fb36aa9b9b3]
#
============================================================
--- packages/kexec/files/kexec-klibc.patch 0c778df2238eb4e8880f42f1cbad2044a8dadd87
+++ packages/kexec/files/kexec-klibc.patch 0c778df2238eb4e8880f42f1cbad2044a8dadd87
@@ -0,0 +1,140 @@
+Index: kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-elf-rel-arm.c 2008-02-22 20:45:15.907610333 +0100
++++ kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c 2008-02-22 20:45:27.508612989 +0100
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <elf.h>
++#include "../../../include/elf.h"
+ #include "../../kexec.h"
+ #include "../../kexec-elf.h"
+
+Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c 2008-02-22 20:45:15.959611260 +0100
++++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c 2008-02-22 20:45:27.508612989 +0100
+@@ -110,13 +110,13 @@
+ }
+
+ fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp);
+- if (ferror(fp)) {
++/* if (ferror(fp)) {
+ fprintf(stderr, "Cannot read %s: %s\n",
+ fn, strerror(errno));
+ fclose(fp);
+ return NULL;
+ }
+-
++*/
+ fclose(fp);
+ return (struct tag *) buf;
+ }
+Index: kexec-tools-1.101/kexec/ifdown.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/ifdown.c 2004-06-09 20:55:31.000000000 +0200
++++ kexec-tools-1.101/kexec/ifdown.c 2008-02-22 20:45:27.508612989 +0100
+@@ -14,7 +14,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+-#include <sys/errno.h>
++#include <errno.h>
+
+ #include <net/if.h>
+ #include <netinet/in.h>
+Index: kexec-tools-1.101/purgatory/Makefile
+===================================================================
+--- kexec-tools-1.101.orig/purgatory/Makefile 2005-01-08 23:36:32.000000000 +0100
++++ kexec-tools-1.101/purgatory/Makefile 2008-02-22 20:45:27.516611391 +0100
+@@ -13,7 +13,7 @@
+
+ PCFLAGS += $(call cc-option, -ffreestanding)
+ PCFLAGS += $(call cc-option, -fnobuiltin)
+-PCFLAGS += $(call cc-option, -fnostdinc)
++PCFLAGS += $(call cc-option, -nostdinc)
+ PCFLAGS += $(call cc-option, -fno-zero-initialized-in-bss)
+
+ PURGATORY_C_SRCS:=
+Index: kexec-tools-1.101/kexec/kexec-elf-rel.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/kexec-elf-rel.c 2005-01-13 14:04:21.000000000 +0100
++++ kexec-tools-1.101/kexec/kexec-elf-rel.c 2008-02-22 20:45:27.524612027 +0100
+@@ -4,7 +4,7 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <stdlib.h>
+-#include "elf.h"
++#include "../include/elf.h"
+ #include <boot/elf_boot.h>
+ #include "kexec.h"
+ #include "kexec-elf.h"
+Index: kexec-tools-1.101/kexec/kexec-syscall.h
+===================================================================
+--- kexec-tools-1.101.orig/kexec/kexec-syscall.h 2008-02-22 20:45:15.923611048 +0100
++++ kexec-tools-1.101/kexec/kexec-syscall.h 2008-02-22 20:45:27.524612027 +0100
+@@ -2,7 +2,7 @@
+ #define KEXEC_SYSCALL_H
+
+ #define __LIBRARY__
+-#include <syscall.h>
++/*#include <syscall.h>*/
+ #include <sys/syscall.h>
+ #include <unistd.h>
+
+@@ -21,7 +21,7 @@
+ #define LINUX_REBOOT_CMD_KEXEC_OLD 0x81726354
+ #define LINUX_REBOOT_CMD_KEXEC_OLD2 0x18263645
+ #define LINUX_REBOOT_CMD_KEXEC 0x45584543
+-
++/*
+ #ifdef __i386__
+ #define __NR_kexec_load 283
+ #endif
+@@ -43,18 +43,19 @@
+ #ifndef __NR_kexec_load
+ #error Unknown processor architecture. Needs a kexec_load syscall number.
+ #endif
+-
++*/
+ struct kexec_segment;
+-
++/*
+ static inline long kexec_load(void *entry, unsigned long nr_segments,
+ struct kexec_segment *segments, unsigned long flags)
+ {
+ return (long) syscall(__NR_kexec_load, entry, nr_segments, segments, flags);
+ }
+-
++*/
+ static inline long kexec_reboot(void)
+ {
+- return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
++ //return (long) syscall(__NR_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
++ return __reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_KEXEC, 0);
+ }
+
+
+Index: kexec-tools-1.101/kexec/kexec.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/kexec.c 2008-02-22 20:45:15.923611048 +0100
++++ kexec-tools-1.101/kexec/kexec.c 2008-02-22 20:45:38.847612035 +0100
+@@ -29,9 +29,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <getopt.h>
+-#ifdef HAVE_ZLIB_H
+-#include <zlib.h>
+-#endif
++#include "zlib.h"
+ #include <sha256.h>
+ #include "kexec.h"
+ #include "kexec-syscall.h"
+@@ -383,7 +381,7 @@
+ return buf;
+ }
+
+-#if HAVE_ZLIB_H
++#if 1
+ char *slurp_decompress_file(const char *filename, off_t *r_size)
+ {
+ gzFile fp;
============================================================
--- packages/klibc/files/klibc_kexecsyscall.patch 027581e82a2945c16d6bd7ee256967b69a2fc638
+++ packages/klibc/files/klibc_kexecsyscall.patch 027581e82a2945c16d6bd7ee256967b69a2fc638
@@ -0,0 +1,11 @@
+--- klibc-1.5/usr/klibc/SYSCALLS.def 2007-03-04 02:52:10.000000000 +0100
++++ klibc.clean/usr/klibc/SYSCALLS.def 2008-02-22 17:12:23.663612084 +0100
+@@ -13,6 +13,8 @@
+ #include <asm/unistd.h>
+ #include <klibc/sysconfig.h>
+ #include <bitsize.h>
++#include <asm/kexec.h>
++long kexec_load(void *, unsigned long , struct kexec_segment *, unsigned long );
+
+ /*
+ * Process-related syscalls
============================================================
--- packages/klibc/files/staging.patch 744788fb708efea82c9caafcb0509e1581351bcb
+++ packages/klibc/files/staging.patch 744788fb708efea82c9caafcb0509e1581351bcb
@@ -0,0 +1,130 @@
+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
+@@ -33,7 +33,7 @@
+ export PERL := perl
+
+ # Location for installation
+-export prefix = /usr
++export prefix = $(INST)
+ 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 @@
+ header:
+ $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+ $(Q)mkdir -p $(INSTALLROOT)$(bindir)
+- $(Q)mkdir -p $(INSTALLROOT)$(mandir)/man1
+- $(Q)mkdir -p $(INSTALLROOT)$(SHLIBDIR)
+ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)
+ $(Q)-rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ $(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 \
+ mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
+ for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
+ $(KLIBCKERNELOBJ)/include2 ; do \
+@@ -106,7 +103,6 @@
+ done
+ $(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm
+ $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
+- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
+ $(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
+@@ -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
+@@ -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
+@@ -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
+@@ -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
+@@ -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
+@@ -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
+@@ -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
+@@ -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
+@@ -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
+@@ -64,5 +64,3 @@
+ # Clean deletes the static and shared dir
+ clean-dirs := static shared
+
+-# install only install the shared binaries
+-install-y := $(shared-y) shared/reboot shared/poweroff
============================================================
--- packages/kexec/kexec-tools-static_1.101.bb 674c9eaf4fafd6d5c38088e0bc02792ec9389d12
+++ packages/kexec/kexec-tools-static_1.101.bb d0f22ab3acf2088a1f8f5c9d8c236df7ab851083
@@ -1,12 +1,23 @@
+# the binaries are statical linked against klibc
require kexec-tools.inc
-PR = "r0"
+PR = "r1"
+DEPENDS = "klibc"
-SRC_URI += "file://kexec-static.patch;patch=1"
+SRC_URI += "file://kexec-klibc.patch;patch=1"
S = "${WORKDIR}/kexec-tools-${PV}"
-PACKAGES =+ "kexec-static kdump-static"
+EXTRA_OECONF = " --without-zlib"
-FILES_kexec-static = "${sbindir}/kexec"
-FILES_kdump-static = "${sbindir}/kdump"
+export CC=${TARGET_PREFIX}klcc
+# standart oe cflags don't work with klcc
+export CFLAGS=""
+export CPPFLAGS=""
+export LDFLAGS=""
+
+PACKAGES =+ "kexec-klibc kdump-klibc"
+
+FILES_kexec-klibc = "${sbindir}/kexec"
+FILES_kdump-klibc = "${sbindir}/kdump"
+
============================================================
--- packages/kexec/kexec-tools.inc 46447a70d4c5e42a305dc4920a1a924741867aca
+++ packages/kexec/kexec-tools.inc 26f7178b5fe7c56ce1096f1c04aa5e25320a6474
@@ -7,8 +7,6 @@ inherit autotools
inherit autotools
-export LDFLAGS = "-L${STAGING_LIBDIR}"
-EXTRA_OECONF = " --with-zlib=yes"
SRC_URI = "http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-${PV}.tar.gz \
file://kexec-tools-arm.patch;patch=1 \
============================================================
--- packages/kexec/kexec-tools_1.101.bb 1d9c587e836f1b4b6071adcc2a9f6b91314468d5
+++ packages/kexec/kexec-tools_1.101.bb 99597c038f5dd47567309c34f3eefbecd95e5ad1
@@ -1,3 +1,5 @@ require kexec-tools.inc
require kexec-tools.inc
+export LDFLAGS = "-L${STAGING_LIBDIR}"
+EXTRA_OECONF = " --with-zlib=yes"
+PR = "r5"
-PR = "r4"
============================================================
--- packages/klibc/klibc-common.inc ba81140300a9fbe13c2d1ef4661b42a4368a3b88
+++ packages/klibc/klibc-common.inc e31a6c551a6ead6e8029e2b0f4cb5117dcf1677f
@@ -5,31 +5,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
minimal entaglement, and portability, not speed."
LICENSE = "BSD-ADV"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/klibc/Stable/klibc-${PV}.tar.bz2"
-SRC_URI += "file://install.patch;patch=1"
S = "${WORKDIR}/klibc-${PV}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-# for the correct kernel staging path
-# inherit module-base
-
-EXTRA_OEMAKE = "'ARCH=${KLIBC_ARCH}' \
- 'CROSS=${TARGET_PREFIX}' \
- 'CC=${HOST_PREFIX}gcc' \
- 'LD=${HOST_PREFIX}ld' \
- 'AR=${AR}' \
- 'RANLIB=${RANLIB}' \
- 'NM=${TARGET_PREFIX}nm' \
- 'STRIP=echo' \
- 'SHLIBDIR=/lib' \
- 'HOST_CC=${BUILD_CC}' \
- 'HOST_CFLAGS=${BUILD_CFLAGS}' \
- 'HOST_LDFLAGS=${BUILD_LDFLAGS}' \
- 'HOST_LIBS=' \
- 'LDFLAGS=' \
- 'ARCHREQFLAGS=${HOST_CC_ARCH}' \
- 'OPTFLAGS=${TARGET_CFLAGS}' \
- 'mandir=${mandir}'"
-
KLIBC_ARCH = '${TARGET_ARCH}'
KLIBC_ARCH_armeb = 'arm'
KLIBC_ARCH_mipsel = 'mips'
@@ -38,25 +16,14 @@ ARM_INSTRUCTION_SET = "arm"
# could be fixed, but for the moment:
ARM_INSTRUCTION_SET = "arm"
-TARGET_CFLAGS := "${@oe_filter_out('-I\S+', '${TARGET_CFLAGS}', d)} -I${STAGING_KERNEL_DIR}/include"
+SRC_URI_append_linux-gnueabi = "\
+ file://klibc-config-eabi.patch;patch=1"
-INSTALLDIR = "/usr/lib/klibc"
-INSTALLPREFIX = "${INSTALLDIR}/${TARGET_PREFIX}"
-INSTALLBINDIR = "${INSTALLPREFIX}bin"
-INSTALLLIBDIR = "${INSTALLPREFIX}lib"
-INSTALLINCDIR = "${INSTALLPREFIX}inc%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rf51d223df158f1cff524858100f483e0d4918266 -rcd252a2052020afb6a19af56adfc3d1b2a79aadd
#
#
#
# patch "conf/distro/sharprom-compatible.conf"
# from [1917f33c694aff55fe7253f1a1dcb3dcb92edde8]
# to [a56c571d457931934464e14394215bc4932503e6]
#
# patch "packages/bootsplash/bootsplash-native_3.0.7.bb"
# from [1c8a7f14c344e82b1663dacc32d4c29763ff29af]
# to [c428a0ad6f6c5fca5e91efdc78aac5d6ca5234ec]
#
============================================================
--- conf/distro/sharprom-compatible.conf 1917f33c694aff55fe7253f1a1dcb3dcb92edde8
+++ conf/distro/sharprom-compatible.conf a56c571d457931934464e14394215bc4932503e6
@@ -38,6 +38,7 @@ PREFERRED_PROVIDER_virtual/linux-libc-he
PREFERRED_PROVIDER_virtual/libc = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/arm-linux-gcc = "sharprom-toolchain-native"
PREFERRED_PROVIDER_virtual/linux-libc-headers = "linux-libc-headers"
+PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
PREFERRED_VERSION_glibc = "2.2.5"
@@ -52,6 +53,7 @@ PALMTOP_USE_MULTITHREADED_QT = "no"
QTE_VERSION = "2.3.10"
OPIE_VERSION = "1.2.2"
PALMTOP_USE_MULTITHREADED_QT = "no"
+export palmtopdir = "/opt/QtPalmtop"
require conf/distro/include/preferred-opie-versions.inc
#
============================================================
--- packages/bootsplash/bootsplash-native_3.0.7.bb 1c8a7f14c344e82b1663dacc32d4c29763ff29af
+++ packages/bootsplash/bootsplash-native_3.0.7.bb c428a0ad6f6c5fca5e91efdc78aac5d6ca5234ec
@@ -1,9 +1,11 @@ require bootsplash_${PV}.bb
# bootsplash-native OE build file
# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
# Released under the MIT license (see packages/COPYING)
require bootsplash_${PV}.bb
+DEPENDS += "jpeg-native"
+
inherit native
S="${WORKDIR}/bootsplash-${PV}"
More information about the Openembedded-commits
mailing list