mirror of
https://git.yoctoproject.org/poky
synced 2026-04-28 15:32:27 +02:00
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
64
meta/recipes-devtools/syslinux/files/cross-build.patch
Normal file
64
meta/recipes-devtools/syslinux/files/cross-build.patch
Normal file
@@ -0,0 +1,64 @@
|
||||
Use ?= for Makefile variables to use poky environment variables.
|
||||
Original method to sed s/CC =/CC ?=/ is not applicable anymore
|
||||
because of the Makefile changes.
|
||||
|
||||
against 3.86
|
||||
|
||||
06/28/2010 - qhe
|
||||
|
||||
also AUXDIR stays in $(LIBDIR)/syslinux rather than $(DATADIR)/syslinux
|
||||
|
||||
07/08/2010 - qhe
|
||||
|
||||
---
|
||||
diff --git a/MCONFIG b/MCONFIG
|
||||
index e9c16d3..4d49f33 100644
|
||||
--- a/MCONFIG
|
||||
+++ b/MCONFIG
|
||||
@@ -18,13 +18,13 @@
|
||||
MAKEFLAGS += -r
|
||||
MAKE += -r
|
||||
|
||||
-BINDIR = /usr/bin
|
||||
-SBINDIR = /sbin
|
||||
-LIBDIR = /usr/lib
|
||||
-DATADIR = /usr/share
|
||||
-AUXDIR = $(DATADIR)/syslinux
|
||||
-MANDIR = /usr/man
|
||||
-INCDIR = /usr/include
|
||||
+BINDIR ?= /usr/bin
|
||||
+SBINDIR ?= /sbin
|
||||
+LIBDIR ?= /usr/lib
|
||||
+DATADIR ?= /usr/share
|
||||
+AUXDIR = $(LIBDIR)/syslinux
|
||||
+MANDIR ?= /usr/man
|
||||
+INCDIR ?= /usr/include
|
||||
TFTPBOOT = /tftpboot
|
||||
COM32DIR = $(AUXDIR)/com32
|
||||
|
||||
@@ -38,18 +38,18 @@ PERL = perl
|
||||
|
||||
CHMOD = chmod
|
||||
|
||||
-CC = gcc
|
||||
+CC ?= gcc
|
||||
gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \
|
||||
if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \
|
||||
then echo '$(1)'; else echo '$(2)'; fi; \
|
||||
rm -f $$tmpf)
|
||||
|
||||
-LD = ld
|
||||
-OBJDUMP = objdump
|
||||
-OBJCOPY = objcopy
|
||||
-AR = ar
|
||||
-NM = nm
|
||||
-RANLIB = ranlib
|
||||
+LD ?= ld
|
||||
+OBJDUMP ?= objdump
|
||||
+OBJCOPY ?= objcopy
|
||||
+AR ?= ar
|
||||
+NM ?= nm
|
||||
+RANLIB ?= ranlib
|
||||
GZIPPROG = gzip
|
||||
PNGTOPNM = pngtopnm
|
||||
MCOPY = mcopy
|
||||
46
meta/recipes-devtools/syslinux/syslinux_3.86.bb
Normal file
46
meta/recipes-devtools/syslinux/syslinux_3.86.bb
Normal file
@@ -0,0 +1,46 @@
|
||||
DESCRIPTION = "A multi-purpose linux bootloader"
|
||||
HOMEPAGE = "http://syslinux.zytor.com/"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
|
||||
file://README;beginline=28;endline=34;md5=a4607efd4a6392017186d08099e7d546"
|
||||
|
||||
# If you really want to run syslinux, you need mtools. We just want the
|
||||
# ldlinux.* stuff for now, so skip mtools-native
|
||||
DEPENDS = "nasm-native"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
|
||||
file://cross-build.patch"
|
||||
|
||||
COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)'
|
||||
|
||||
EXTRA_OEMAKE = " \
|
||||
BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \
|
||||
DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \
|
||||
"
|
||||
# syslinux uses $LD for linking, strip `-Wl,' so it can work
|
||||
export LDFLAGS = "`echo $LDFLAGS | sed 's/-Wl,//g'`"
|
||||
|
||||
do_configure() {
|
||||
# drop win32 targets or build fails
|
||||
sed -e 's,win32/\S*,,g' -i Makefile
|
||||
|
||||
# clean installer executables included in source tarball
|
||||
oe_runmake clean
|
||||
}
|
||||
|
||||
do_compile() {
|
||||
# Rebuild only the installer; keep precompiled bootloaders
|
||||
# as per author's request (doc/distrib.txt)
|
||||
oe_runmake CC="${CC}" installer
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install INSTALLROOT="${D}"
|
||||
|
||||
install -d ${D}${libdir}/syslinux/
|
||||
install -m 644 ${S}/core/ldlinux.sys ${D}${libdir}/syslinux/
|
||||
install -m 644 ${S}/core/ldlinux.bss ${D}${libdir}/syslinux/
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Reference in New Issue
Block a user