Updates against mainline OE
git-svn-id: https://svn.o-hand.com/repos/poky@26 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
parent
f9e1d16bfa
commit
b4a7122cac
|
@ -145,7 +145,7 @@ autotools_stage_includes() {
|
|||
rm -rf ${STAGE_TEMP}
|
||||
mkdir -p ${STAGE_TEMP}
|
||||
make DESTDIR="${STAGE_TEMP}" install
|
||||
cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
|
||||
cp -pPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
|
||||
rm -rf ${STAGE_TEMP}
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -371,7 +371,7 @@ def oe_unpack_file(file, data, url = None):
|
|||
destdir = "."
|
||||
elif not os.access("%s/%s" % (os.getcwd(), destdir), os.F_OK):
|
||||
os.makedirs("%s/%s" % (os.getcwd(), destdir))
|
||||
cmd = 'cp -a %s %s/%s/' % (file, os.getcwd(), destdir)
|
||||
cmd = 'cp -pPR %s %s/%s/' % (file, os.getcwd(), destdir)
|
||||
else:
|
||||
(type, host, path, user, pswd, parm) = bb.decodeurl(url)
|
||||
if not 'patch' in parm:
|
||||
|
@ -496,8 +496,16 @@ python base_eventhandler() {
|
|||
note(msg)
|
||||
|
||||
if name.startswith("BuildStarted"):
|
||||
statusvars = ['TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO',
|
||||
'TARGET_FPU']
|
||||
bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
|
||||
path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
|
||||
path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )]
|
||||
monotone_revision = "<unknown>"
|
||||
try:
|
||||
monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip()
|
||||
except IOError:
|
||||
pass
|
||||
bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
|
||||
statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU']
|
||||
statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
|
||||
statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)
|
||||
print statusmsg
|
||||
|
|
|
@ -145,6 +145,7 @@ python do_package_ipk () {
|
|||
fields.append(["Maintainer: %s\n", ['MAINTAINER']])
|
||||
fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
|
||||
fields.append(["OE: %s\n", ['P']])
|
||||
fields.append(["Homepage: %s\n", ['HOMEPAGE']])
|
||||
|
||||
def pullData(l, d):
|
||||
l2 = []
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
DEPENDS += "qt3-x11"
|
||||
#
|
||||
# override variables set by qmake-base to compile Qt/X11 apps
|
||||
#
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
DEPENDS += "qt4-x11"
|
||||
#
|
||||
# override variables set by qmake-base to compile Qt/X11 apps
|
||||
#
|
||||
|
|
|
@ -43,7 +43,7 @@ sourcepkg_do_create_orig_tgz(){
|
|||
echo $src_tree
|
||||
oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
|
||||
tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz $src_tree --exclude-from temp/exclude-from-file
|
||||
cp -a $src_tree $src_tree.orig
|
||||
cp -pPR $src_tree $src_tree.orig
|
||||
}
|
||||
|
||||
sourcepkg_do_archive_bb() {
|
||||
|
|
|
@ -126,6 +126,7 @@ TMPDIR = "${TOPDIR}/tmp"
|
|||
CACHE = "${TMPDIR}/cache"
|
||||
DL_DIR = "${TMPDIR}/downloads"
|
||||
CVSDIR = "${DL_DIR}/cvs"
|
||||
GITDIR = "${DL_DIR}/git"
|
||||
|
||||
STAMP = "${TMPDIR}/stamps/${PF}"
|
||||
WORKDIR = "${TMPDIR}/work/${PF}"
|
||||
|
@ -170,6 +171,8 @@ IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_
|
|||
IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
|
||||
IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
|
||||
IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
|
||||
IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
|
||||
IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
|
||||
EXTRA_IMAGECMD = ""
|
||||
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
|
||||
EXTRA_IMAGECMD_squashfs = "-le -b 16384"
|
||||
|
|
|
@ -21,7 +21,7 @@ PREFERRED_PROVIDER_virtual/libiconv=glibc
|
|||
PREFERRED_PROVIDER_virtual/libintl=glibc
|
||||
PREFERRED_PROVIDER_x11=diet-x11
|
||||
|
||||
PREFERRED_VERSION_hostap-modules ?= "0.3.9
|
||||
PREFERRED_VERSION_hostap-modules ?= "0.3.9"
|
||||
|
||||
# The CSL compiler is unusable because
|
||||
# 1) certain programs stop to compile
|
||||
|
@ -37,7 +37,7 @@ PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
|
|||
PREFERRED_PROVIDERS += " virtual/libqpe:libqpe-opie"
|
||||
PREFERRED_VERSION_qte = "2.3.10"
|
||||
|
||||
#OPIE_VERSION = "1.2.0"
|
||||
OPIE_VERSION = "1.2.1"
|
||||
include conf/distro/preferred-opie-versions.inc
|
||||
|
||||
#
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
include conf/distro/openzaurus.conf
|
||||
include conf/distro/openzaurus.inc
|
||||
DISTRO = "openzaurus"
|
||||
DISTRO_NAME = "OpenZaurus"
|
||||
DISTRO_VERSION = "3.5.3-snapshot-${DATE}"
|
||||
|
@ -27,6 +27,16 @@ KERNEL_CONSOLE = "ttyS0"
|
|||
#DEBUG_BUILD = "1"
|
||||
#INHIBIT_PACKAGE_STRIP = "1"
|
||||
|
||||
PREFERRED_VERSION_gcc-cross ?= "3.4.4"
|
||||
PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4"
|
||||
|
||||
PREFERRED_VERSION_hostap-modules ?= "0.3.9"
|
||||
|
||||
#fix some iconv issues, needs to be adjusted when doing uclibc builds
|
||||
PREFERRED_PROVIDER_virtual/libiconv=glibc
|
||||
PREFERRED_PROVIDER_virtual/libintl=glibc
|
||||
|
||||
|
||||
#
|
||||
# Base
|
||||
#
|
||||
|
@ -48,12 +58,11 @@ include conf/distro/preferred-opie-versions.inc
|
|||
#
|
||||
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
|
||||
PREFERRED_PROVIDER_x11 = "diet-x11"
|
||||
#PREFERRED_PROVIDER_x11 = "x11"
|
||||
include conf/distro/preferred-gpe-versions-2.7.inc
|
||||
|
||||
#
|
||||
# E
|
||||
#
|
||||
include conf/distro/preferred-e-versions.inc
|
||||
#include conf/distro/preferred-e-versions.inc
|
||||
|
||||
include conf/distro/poky-additions.inc
|
|
@ -7,13 +7,14 @@
|
|||
|
||||
#set some preferred providers:
|
||||
PREFERRED_PROVIDER_gconf=gconf-dbus
|
||||
PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
|
||||
|
||||
#specify versions, as the header says :)
|
||||
PREFERRED_VERSION_libmatchbox ?= "1.7"
|
||||
PREFERRED_VERSION_matchbox ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-common ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
|
||||
PREFERRED_VERSION_matchbox-wm ?= "0.9.5"
|
||||
PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
|
||||
PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
|
||||
PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
|
||||
PREFERRED_VERSION_atk ?= "1.9.0"
|
||||
|
@ -49,7 +50,7 @@ PREFERRED_VERSION_gpe-today ?= "0.09"
|
|||
PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
|
||||
PREFERRED_VERSION_dbus ?= "0.23.4"
|
||||
PREFERRED_VERSION_gpe-beam ?= "0.2.8"
|
||||
PREFERRED_VERSION_gpe-bluetooth ?= "0.44"
|
||||
PREFERRED_VERSION_gpe-bluetooth ?= "0.45"
|
||||
PREFERRED_VERSION_gpe-su ?= "0.18"
|
||||
PREFERRED_VERSION_gpe-conf ?= "0.1.25"
|
||||
PREFERRED_VERSION_gpe-clock ?= "0.21"
|
||||
|
@ -86,7 +87,7 @@ PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}"
|
|||
PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
|
||||
PREFERRED_VERSION_linphone ?= "0.12.2"
|
||||
PREFERRED_VERSION_firefox ?= "1.0"
|
||||
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1"
|
||||
PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904"
|
||||
PREFERRED_VERSION_poppler ?= "0.3.3"
|
||||
PREFERRED_VERSION_evince ?= "0.3.2"
|
||||
PREFERRED_VERSION_gpe_mini_browser ?= "0.15"
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
# This file is not used, see build/conf/local.conf instead
|
||||
#
|
||||
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
|
||||
|
||||
#
|
||||
# OpenEmbedded local configuration file (sample)
|
||||
#
|
||||
|
@ -25,12 +26,11 @@
|
|||
# expansion. Stuff like starting with ${HOME} or ${TOPDIR} is ok).
|
||||
|
||||
# Use this to specify where BitBake should place the downloaded sources into
|
||||
DL_DIR = "POKYROOT/sources"
|
||||
DL_DIR = "${HOME}/sources"
|
||||
|
||||
# Delete the line below. Then specify which .bb files to consider for
|
||||
# your build. Typically this will be something like BBFILES = "/path/to/openembedded/packages/*/*.bb"
|
||||
#BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
|
||||
BBFILES := "POKYROOT/openembedded/packages/*/*.bb"
|
||||
BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
|
||||
|
||||
# Use the BBMASK below to instruct BitBake to _NOT_ consider some .bb files
|
||||
# This is a regulary expression, so be sure to get your parenthesis balanced.
|
||||
|
@ -77,7 +77,8 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
|
|||
|
||||
# Uncomment this to select a distribution policy. See the conf directory
|
||||
# for distributions currently known to OpenEmbedded.
|
||||
# DISTRO = "familiar"
|
||||
# Stay away from unversioned distros unless you really know what you are doing
|
||||
# DISTRO = "familiar-0.8.3"
|
||||
|
||||
# Uncomment this to select a particular kernel version if supported by
|
||||
# your MACHINE setting. Currently only supported on Zaurus Clamshells.
|
||||
|
@ -88,7 +89,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
|
|||
# INHERIT = "package_ipk"
|
||||
# INHERIT = "package_tar"
|
||||
|
||||
# Add the required image file system types below. Valid are jffs2, tar, cramfs
|
||||
# Add the required image file system types below. Valid are jffs2, tar, cramfs and ext2
|
||||
IMAGE_FSTYPES = "jffs2 tar"
|
||||
|
||||
# Uncomment this to disable the parse cache (not recommended).
|
||||
|
@ -97,7 +98,8 @@ IMAGE_FSTYPES = "jffs2 tar"
|
|||
# Uncomment this if you want BitBake to emit debugging output
|
||||
# BBDEBUG = "yes"
|
||||
|
||||
# Uncomment these two if you want BitBake to build images useful for debugging.
|
||||
# Uncomment these two if you want BitBake to build images useful for debugging.
|
||||
# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined
|
||||
# DEBUG_BUILD = "1"
|
||||
# INHIBIT_PACKAGE_STRIP = "1"
|
||||
|
||||
|
@ -125,4 +127,4 @@ BBINCLUDELOGS = "yes"
|
|||
CVS_TARBALL_STASH = "http://www.oesources.org/source/current/"
|
||||
|
||||
# EDIT THIS FILE and then remove the line below before using!
|
||||
#REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
|
||||
REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
TARGET_ARCH = "arm"
|
||||
IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
|
||||
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
|
||||
PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
|
||||
|
||||
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
|
||||
|
||||
|
@ -24,14 +25,14 @@ include conf/machine/ipaq-common.conf
|
|||
include conf/machine/handheld-common.conf
|
||||
|
||||
GUI_MACHINE_CLASS = "bigscreen"
|
||||
GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-filemanager gpe-nmf evince"
|
||||
GPE_EXTRA_INSTALL += "gaim sylpheed gpe-filemanager gpe-nmf evince"
|
||||
GPE_EXTRA_DEPENDS += "gaim sylpheed"
|
||||
GPE_EXTRA_INSTALL += "gaim sylpheed"
|
||||
|
||||
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
|
||||
include conf/machine/tune-xscale.conf
|
||||
|
||||
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
|
||||
HX4700_MODULES = "asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
|
||||
HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
|
||||
hx4700_ts hx4700_wlan snd_pxa_i2sound_hx4700 hx4700_power"
|
||||
|
||||
module_autoload_hx4700_power = "hx4700_power"
|
||||
|
|
|
@ -15,6 +15,6 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
|
|||
BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs"
|
||||
BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
|
||||
|
||||
IMAGE_FSTYPES = "jffs2 tar"
|
||||
IMAGE_FSTYPES = "jffs2 tar.gz"
|
||||
|
||||
ROOT_FLASH_SIZE = "100"
|
||||
|
|
|
@ -2,13 +2,12 @@
|
|||
# Don't forget to include zaurus-clamshell.conf as well
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
|
||||
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
|
||||
|
||||
BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules orinoco-modules \
|
||||
BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules spectrum-fw \
|
||||
pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
|
||||
ppp ppp-dialin openswan wpa-supplicant-nossl"
|
||||
|
||||
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs \
|
||||
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils hostap-modules-cs spectrum-fw \
|
||||
pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
|
||||
ppp ppp-dialin openswan wpa-supplicant-nossl"
|
||||
|
||||
|
@ -34,3 +33,5 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-
|
|||
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \
|
||||
kernel-module-g-serial kernel-module-g-ether"
|
||||
|
||||
# Wireless Modules
|
||||
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-orinoco-cs kernel-module-spectrum-cs"
|
||||
|
|
|
@ -4,6 +4,6 @@
|
|||
proc /proc proc defaults 0 0
|
||||
sys /sys sysfs defaults 0 0
|
||||
|
||||
/dev/hda1 /media/cf auto defaults,noauto,noatime,user,exec,suid 0 0
|
||||
/dev/hda1 /media/cf auto defaults,noauto,noatime,exec,suid 0 0
|
||||
tmpfs /var tmpfs defaults 0 0
|
||||
tmpfs /media/ram tmpfs defaults 0 0
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
DESCRIPTION = "Miscellaneous files for the base system."
|
||||
SECTION = "base"
|
||||
PRIORITY = "required"
|
||||
PR = "r40"
|
||||
PR = "r41"
|
||||
LICENSE = "GPL"
|
||||
|
||||
SRC_URI = " \
|
||||
|
|
|
@ -48,14 +48,14 @@ export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
|
|||
export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
|
||||
export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
|
||||
|
||||
export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
|
||||
export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
|
||||
export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
|
||||
export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
|
||||
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
export CPP_FOR_BUILD = "${BUILD_CPP}"
|
||||
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
|
||||
|
||||
export CC = "${CCACHE} ${HOST_PREFIX}gcc"
|
||||
export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
|
||||
|
||||
do_configure () {
|
||||
(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
|
||||
|
|
|
@ -69,7 +69,7 @@ do_configure() {
|
|||
|
||||
do_stage() {
|
||||
# The .h files get installed read-only, the autostage
|
||||
# function just uses cp -a, so do this by hand
|
||||
# function just uses cp -pPR, so do this by hand
|
||||
# Install, for the moment, into include/db4 to avoid
|
||||
# interfering with the db3 headers (which have the same
|
||||
# name). -I${STAGING_INCDIR}/db4 to use db4, as opposed
|
||||
|
@ -78,7 +78,7 @@ do_stage() {
|
|||
mkdir -p ${STAGE_TEMP}
|
||||
oe_runmake DESTDIR="${STAGE_TEMP}" install_include
|
||||
mkdir -p ${STAGING_INCDIR}/db4
|
||||
cp -af ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
|
||||
cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
|
||||
rm -rf ${STAGE_TEMP}
|
||||
oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
include gcc-cross_${PV}.bb
|
||||
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils ${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
|
||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils"
|
||||
DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}"
|
||||
PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
|
||||
PACKAGES = ""
|
||||
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- hostap-driver-0.2.4/Makefile.old 2004-07-31 10:35:50.000000000 +0100
|
||||
+++ hostap-driver-0.2.4/Makefile 2004-07-31 10:35:56.000000000 +0100
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
VERFILE := $(KERNEL_PATH)/include/linux/version.h
|
||||
KERNELRELEASE := $(shell if [ -r $(VERFILE) ]; \
|
||||
- then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -1 | xargs echo; \
|
||||
+ then (cat $(VERFILE); echo UTS_RELEASE) | $(CC) $(INCLUDES) $(CFLAGS) -E - | tail -n 1 | xargs echo; \
|
||||
else uname -r; fi)
|
||||
KERNELVER := $(shell echo "$(KERNELRELEASE)" | \
|
||||
sed "s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/")
|
|
@ -0,0 +1,28 @@
|
|||
Index: hostap-driver-0.3.7/driver/modules/hostap_cs.c
|
||||
===================================================================
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-08-03 17:05:53.000000000 +0100
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-08-03 17:07:59.000000000 +0100
|
||||
@@ -526,11 +526,13 @@
|
||||
dev_list = link;
|
||||
client_reg.dev_info = &dev_info;
|
||||
client_reg.Attributes = INFO_IO_CLIENT;
|
||||
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13))
|
||||
client_reg.EventMask = CS_EVENT_CARD_INSERTION |
|
||||
CS_EVENT_CARD_REMOVAL |
|
||||
CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
|
||||
CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
|
||||
client_reg.event_handler = &prism2_event;
|
||||
+#endif
|
||||
client_reg.Version = 0x0210;
|
||||
client_reg.event_callback_args.client_data = link;
|
||||
ret = pcmcia_register_client(&link->handle, &client_reg);
|
||||
@@ -913,6 +915,9 @@
|
||||
.name = "hostap_cs",
|
||||
},
|
||||
.attach = prism2_attach,
|
||||
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
|
||||
+ .event = prism2_event,
|
||||
+#endif
|
||||
.detach = prism2_detach,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
|
@ -0,0 +1,77 @@
|
|||
diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap.c hostap-driver-0.3.7/driver/modules/hostap.c
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap.c 2005-07-25 09:14:01.995965088 +0000
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap.c 2005-07-25 09:13:22.301999488 +0000
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/random.h>
|
||||
+#include <linux/utsname.h>
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
|
||||
#include <linux/tqueue.h>
|
||||
#else
|
||||
diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:14:01.996964936 +0000
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_ccmp.c 2005-07-25 09:13:22.302999336 +0000
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_arp.h>
|
||||
+#include <linux/utsname.h>
|
||||
#include <asm/string.h>
|
||||
|
||||
#include "hostap_crypt.h"
|
||||
diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:14:01.996964936 +0000
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_tkip.c 2005-07-25 09:13:22.302999336 +0000
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if_arp.h>
|
||||
+#include <linux/utsname.h>
|
||||
#include <asm/string.h>
|
||||
|
||||
#include "hostap_crypt.h"
|
||||
diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap_crypt_wep.c 2005-07-25 09:14:01.996964936 +0000
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap_crypt_wep.c 2005-07-25 09:13:22.302999336 +0000
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/random.h>
|
||||
+#include <linux/utsname.h>
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
|
||||
#include <linux/tqueue.h>
|
||||
#else
|
||||
diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c hostap-driver-0.3.7/driver/modules/hostap_cs.c
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap_cs.c 2005-07-25 09:14:01.997964784 +0000
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap_cs.c 2005-07-25 09:13:22.302999336 +0000
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <linux/timer.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/netdevice.h>
|
||||
+#include <linux/utsname.h>
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
|
||||
#include <linux/tqueue.h>
|
||||
#else
|
||||
diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c hostap-driver-0.3.7/driver/modules/hostap_pci.c
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap_pci.c 2005-07-25 09:14:01.997964784 +0000
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap_pci.c 2005-07-25 09:13:22.303999184 +0000
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <linux/if.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/netdevice.h>
|
||||
+#include <linux/utsname.h>
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
|
||||
#include <linux/tqueue.h>
|
||||
#else
|
||||
diff -r -U 3 hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c hostap-driver-0.3.7/driver/modules/hostap_plx.c
|
||||
--- hostap-driver-0.3.7.orig/driver/modules/hostap_plx.c 2005-07-25 09:14:01.997964784 +0000
|
||||
+++ hostap-driver-0.3.7/driver/modules/hostap_plx.c 2005-07-25 09:13:22.303999184 +0000
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <linux/if.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/netdevice.h>
|
||||
+#include <linux/utsname.h>
|
||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
|
||||
#include <linux/tqueue.h>
|
||||
#else
|
|
@ -0,0 +1,70 @@
|
|||
Index: hostap-driver-0.3.9/driver/modules/hostap_cs.c
|
||||
===================================================================
|
||||
--- hostap-driver-0.3.9.orig/driver/modules/hostap_cs.c 2005-08-24 10:11:47.000000000 +0100
|
||||
+++ hostap-driver-0.3.9/driver/modules/hostap_cs.c 2005-08-24 10:39:10.000000000 +0100
|
||||
@@ -908,6 +908,57 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
|
||||
+static struct pcmcia_device_id hostap_cs_ids[] = {
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
|
||||
+ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
|
||||
+ PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
|
||||
+ 0x7a954bd9, 0x74be00c6),
|
||||
+ PCMCIA_DEVICE_PROD_ID1234(
|
||||
+ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
|
||||
+ "Eval-RevA",
|
||||
+ 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
|
||||
+ PCMCIA_DEVICE_PROD_ID123(
|
||||
+ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
|
||||
+ 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
|
||||
+ PCMCIA_DEVICE_PROD_ID123(
|
||||
+ "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
|
||||
+ 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
|
||||
+ PCMCIA_DEVICE_PROD_ID123(
|
||||
+ "Instant Wireless ", " Network PC CARD", "Version 01.02",
|
||||
+ 0x11d901af, 0x6e9bd926, 0x4b74baa0),
|
||||
+ PCMCIA_DEVICE_PROD_ID123(
|
||||
+ "SMC", "SMC2632W", "Version 01.02",
|
||||
+ 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
|
||||
+ 0x54f7c49c, 0x15a75e5b),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
|
||||
+ 0x74c5e40d, 0xdb472a18),
|
||||
+ PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
|
||||
+ 0x0733cc81, 0x0c52f395),
|
||||
+ PCMCIA_DEVICE_PROD_ID12(
|
||||
+ "ZoomAir 11Mbps High", "Rate wireless Networking",
|
||||
+ 0x273fe3db, 0x32a1eaee),
|
||||
+ PCMCIA_DEVICE_NULL
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
|
||||
+#endif
|
||||
|
||||
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67)
|
||||
static struct pcmcia_driver hostap_driver = {
|
||||
@@ -917,6 +968,7 @@
|
||||
.attach = prism2_attach,
|
||||
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
|
||||
.event = prism2_event,
|
||||
+ .id_table = hostap_cs_ids,
|
||||
#endif
|
||||
.detach = prism2_detach,
|
||||
.owner = THIS_MODULE,
|
|
@ -3,10 +3,14 @@ SECTION = "kernel/modules"
|
|||
PRIORITY = "optional"
|
||||
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
|
||||
LICENSE = "GPL"
|
||||
PR = "r4"
|
||||
|
||||
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
|
||||
file://hostap_cs.conf "
|
||||
|
||||
file://hostap_cs.conf \
|
||||
file://Makefile.patch;patch=1 \
|
||||
file://add_event.patch;patch=1 \
|
||||
file://hostap-utsname.patch;patch=1 \
|
||||
file://hostap_cardid.patch;patch=1"
|
||||
SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
|
||||
file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
|
||||
SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
|
|
@ -6,7 +6,7 @@ DEPENDS = "makedevs"
|
|||
DEPENDS_openzaurus = "makedevs virtual/kernel"
|
||||
RDEPENDS = "makedevs"
|
||||
LICENSE = "GPL"
|
||||
PR = "r57"
|
||||
PR = "r58"
|
||||
|
||||
SRC_URI = "file://halt \
|
||||
file://ramdisk \
|
||||
|
@ -41,6 +41,8 @@ SRC_URI_append_tosa = " file://keymap-*.map"
|
|||
SRC_URI_append_akita = " file://keymap-*.map"
|
||||
SRC_URI_append_spitz = " file://keymap-*.map"
|
||||
SRC_URI_append_borzoi = " file://keymap-*.map"
|
||||
SRC_URI_append_collie = " file://keymap-*.map"
|
||||
SRC_URI_append_poodle = " file://keymap-*.map"
|
||||
|
||||
def read_kernel_version(d):
|
||||
import bb
|
||||
|
@ -103,7 +105,7 @@ do_install () {
|
|||
fi
|
||||
|
||||
case ${MACHINE} in
|
||||
c7x0 | tosa | spitz | akita | borzoi )
|
||||
c7x0 | tosa | spitz | akita | borzoi | collie | poodle )
|
||||
install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d
|
||||
ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap
|
||||
install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir}
|
||||
|
|
|
@ -10,6 +10,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
|
|||
file://m4.patch;patch=1 \
|
||||
file://init"
|
||||
|
||||
export SYS_INCLUDES="-I${STAGING_INCDIR}"
|
||||
|
||||
inherit autotools update-rc.d
|
||||
|
||||
INITSCRIPT_NAME = "irattach"
|
||||
|
|
|
@ -1,72 +0,0 @@
|
|||
|
||||
#
|
||||
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
|
||||
#
|
||||
|
||||
--- /dev/null 2004-06-02 16:28:12.000000000 -0500
|
||||
+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh4/sigcontext.h 2004-08-27 17:56:59.000000000 -0500
|
||||
@@ -0,0 +1,24 @@
|
||||
+#ifndef __ASM_CPU_SH4_SIGCONTEXT_H
|
||||
+#define __ASM_CPU_SH4_SIGCONTEXT_H
|
||||
+
|
||||
+struct sigcontext {
|
||||
+ unsigned long oldmask;
|
||||
+
|
||||
+ /* CPU registers */
|
||||
+ unsigned long sc_regs[16];
|
||||
+ unsigned long sc_pc;
|
||||
+ unsigned long sc_pr;
|
||||
+ unsigned long sc_sr;
|
||||
+ unsigned long sc_gbr;
|
||||
+ unsigned long sc_mach;
|
||||
+ unsigned long sc_macl;
|
||||
+
|
||||
+ /* FPU registers */
|
||||
+ unsigned long sc_fpregs[16];
|
||||
+ unsigned long sc_xfpregs[16];
|
||||
+ unsigned int sc_fpscr;
|
||||
+ unsigned int sc_fpul;
|
||||
+ unsigned int sc_ownedfp;
|
||||
+};
|
||||
+
|
||||
+#endif /* __ASM_CPU_SH4_SIGCONTEXT_H */
|
||||
--- /dev/null 2004-06-02 16:28:12.000000000 -0500
|
||||
+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh2/sigcontext.h 2004-08-27 17:57:54.000000000 -0500
|
||||
@@ -0,0 +1,17 @@
|
||||
+#ifndef __ASM_CPU_SH2_SIGCONTEXT_H
|
||||
+#define __ASM_CPU_SH2_SIGCONTEXT_H
|
||||
+
|
||||
+struct sigcontext {
|
||||
+ unsigned long oldmask;
|
||||
+
|
||||
+ /* CPU registers */
|
||||
+ unsigned long sc_regs[16];
|
||||
+ unsigned long sc_pc;
|
||||
+ unsigned long sc_pr;
|
||||
+ unsigned long sc_sr;
|
||||
+ unsigned long sc_gbr;
|
||||
+ unsigned long sc_mach;
|
||||
+ unsigned long sc_macl;
|
||||
+};
|
||||
+
|
||||
+#endif /* __ASM_CPU_SH2_SIGCONTEXT_H */
|
||||
--- /dev/null 2004-06-02 16:28:12.000000000 -0500
|
||||
+++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh3/sigcontext.h 2004-08-27 17:57:58.000000000 -0500
|
||||
@@ -0,0 +1,17 @@
|
||||
+#ifndef __ASM_CPU_SH3_SIGCONTEXT_H
|
||||
+#define __ASM_CPU_SH3_SIGCONTEXT_H
|
||||
+
|
||||
+struct sigcontext {
|
||||
+ unsigned long oldmask;
|
||||
+
|
||||
+ /* CPU registers */
|
||||
+ unsigned long sc_regs[16];
|
||||
+ unsigned long sc_pc;
|
||||
+ unsigned long sc_pr;
|
||||
+ unsigned long sc_sr;
|
||||
+ unsigned long sc_gbr;
|
||||
+ unsigned long sc_mach;
|
||||
+ unsigned long sc_macl;
|
||||
+};
|
||||
+
|
||||
+#endif /* __ASM_CPU_SH3_SIGCONTEXT_H */
|
|
@ -1,11 +0,0 @@
|
|||
--- include/asm-mips/atomic.h.orig 2004-10-01 10:10:05.487734944 +0200
|
||||
+++ include/asm-mips/atomic.h 2004-10-01 10:10:15.837161592 +0200
|
||||
@@ -15,8 +15,6 @@
|
||||
#define _ASM_ATOMIC_H
|
||||
|
||||
|
||||
-#include <asm/system.h>
|
||||
-
|
||||
typedef struct { volatile int counter; } atomic_t;
|
||||
typedef struct { volatile __s64 counter; } atomic64_t;
|
||||
|
|
@ -36,11 +36,11 @@ do_configure () {
|
|||
if test ! -e include/asm-$ARCH; then
|
||||
oefatal unable to create asm symlink in kernel headers
|
||||
fi
|
||||
cp -a "include/asm-$ARCH" "include/asm"
|
||||
cp -pPR "include/asm-$ARCH" "include/asm"
|
||||
if test "$ARCH" = "arm"; then
|
||||
cp -a include/asm/arch-ebsa285 include/asm/arch
|
||||
cp -pPR include/asm/arch-ebsa285 include/asm/arch
|
||||
elif test "$ARCH" = "sh"; then
|
||||
cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
|
||||
cp -pPR include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -1,56 +0,0 @@
|
|||
SECTION = "devel"
|
||||
DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
|
||||
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
PR = "r3"
|
||||
LICENSE = "GPL"
|
||||
# NOTE: no need to package these headers, since the c library includes them.
|
||||
PACKAGES = ""
|
||||
|
||||
SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
|
||||
file://sh-missing.patch;patch=1 \
|
||||
file://keyboard.patch;patch=1"
|
||||
S = "${WORKDIR}/linux-libc-headers-${PV}"
|
||||
|
||||
do_configure () {
|
||||
case ${TARGET_ARCH} in
|
||||
alpha*) ARCH=alpha ;;
|
||||
arm*) ARCH=arm ;;
|
||||
cris*) ARCH=cris ;;
|
||||
hppa*) ARCH=parisc ;;
|
||||
i*86*) ARCH=i386 ;;
|
||||
ia64*) ARCH=ia64 ;;
|
||||
mips*) ARCH=mips ;;
|
||||
m68k*) ARCH=m68k ;;
|
||||
powerpc*) ARCH=ppc ;;
|
||||
s390*) ARCH=s390 ;;
|
||||
sh*) ARCH=sh ;;
|
||||
sparc64*) ARCH=sparc64 ;;
|
||||
sparc*) ARCH=sparc ;;
|
||||
x86_64*) ARCH=x86_64 ;;
|
||||
esac
|
||||
if test ! -e include/asm-$ARCH; then
|
||||
oefatal unable to create asm symlink in kernel headers
|
||||
fi
|
||||
cp -a "include/asm-$ARCH" "include/asm"
|
||||
if test "$ARCH" = "arm"; then
|
||||
cp -a include/asm/arch-ebsa285 include/asm/arch
|
||||
elif test "$ARCH" = "sh"; then
|
||||
cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
|
||||
fi
|
||||
}
|
||||
|
||||
do_stage () {
|
||||
install -d ${STAGING_INCDIR}
|
||||
rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
|
||||
cp -pfLR include/linux ${STAGING_INCDIR}/
|
||||
cp -pfLR include/asm ${STAGING_INCDIR}/
|
||||
rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
|
||||
rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
|
||||
install -d ${CROSS_DIR}/${TARGET_SYS}/include
|
||||
cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
|
||||
cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
|
||||
|
||||
ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${STAGING_INCDIR}/linux/wireless.h
|
||||
ln -sf ${STAGING_KERNEL_DIR}/include/linux/wireless.h ${CROSS_DIR}/${TARGET_SYS}/include/linux/wireless.h
|
||||
}
|
|
@ -1,61 +0,0 @@
|
|||
SECTION = "devel"
|
||||
DESCRIPTION = "Sanitized set of 2.6 kernel headers for the C library's use."
|
||||
HOMEPAGE = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"
|
||||
# license note from the package:
|
||||
# Linux-libc-headers are derived from linux kernel headers. For license of a
|
||||
# particular header, check it's content, and if copyright notice isn't present,
|
||||
# standard linux kernel license applies.
|
||||
# since we assume GPL for linux i think we can also assume it here
|
||||
LICENSE = "GPL"
|
||||
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
|
||||
INHIBIT_DEFAULT_DEPS = "1"
|
||||
PR = "r7"
|
||||
|
||||
# NOTE: no need to package these headers, since the c library includes them.
|
||||
PACKAGES = ""
|
||||
|
||||
SRC_URI = "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-${PV}.tar.bz2 \
|
||||
file://mips-asm-atomic-system.diff;patch=1;pnum=0 \
|
||||
file://keyboard.patch;patch=1"
|
||||
|
||||
S = "${WORKDIR}/linux-libc-headers-${PV}"
|
||||
|
||||
do_configure () {
|
||||
case ${TARGET_ARCH} in
|
||||
alpha*) ARCH=alpha ;;
|
||||
arm*) ARCH=arm ;;
|
||||
cris*) ARCH=cris ;;
|
||||
hppa*) ARCH=parisc ;;
|
||||
i*86*) ARCH=i386 ;;
|
||||
ia64*) ARCH=ia64 ;;
|
||||
mips*) ARCH=mips ;;
|
||||
m68k*) ARCH=m68k ;;
|
||||
powerpc*) ARCH=ppc ;;
|
||||
s390*) ARCH=s390 ;;
|
||||
sh*) ARCH=sh ;;
|
||||
sparc64*) ARCH=sparc64 ;;
|
||||
sparc*) ARCH=sparc ;;
|
||||
x86_64*) ARCH=x86_64 ;;
|
||||
esac
|
||||
if test ! -e include/asm-$ARCH; then
|
||||
oefatal unable to create asm symlink in kernel headers
|
||||
fi
|
||||
cp -a "include/asm-$ARCH" "include/asm"
|
||||
if test "$ARCH" = "arm"; then
|
||||
cp -a include/asm/arch-ebsa285 include/asm/arch
|
||||
elif test "$ARCH" = "sh"; then
|
||||
cp -a include/asm/cpu-${TARGET_ARCH} include/asm/cpu || die "unable to create include/asm/cpu"
|
||||
fi
|
||||
}
|
||||
|
||||
do_stage () {
|
||||
install -d ${STAGING_INCDIR}
|
||||
rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm
|
||||
cp -pfLR include/linux ${STAGING_INCDIR}/
|
||||
cp -pfLR include/asm ${STAGING_INCDIR}/
|
||||
rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux
|
||||
rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm
|
||||
install -d ${CROSS_DIR}/${TARGET_SYS}/include
|
||||
cp -pfLR include/linux ${CROSS_DIR}/${TARGET_SYS}/include/
|
||||
cp -pfLR include/asm ${CROSS_DIR}/${TARGET_SYS}/include/
|
||||
}
|
|
@ -3,7 +3,7 @@ DESCRIPTION = "Matchbox window manager"
|
|||
LICENSE = "GPL"
|
||||
DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
|
||||
RDEPENDS = "matchbox-common"
|
||||
PV = "0.9cvs${CVSDATE}"
|
||||
PV = "0.9.5+cvs-${CVSDATE}"
|
||||
PR = "r1"
|
||||
DEFAULT_PREFERENCE = "-1"
|
||||
|
||||
|
|
|
@ -1,60 +0,0 @@
|
|||
LICENSE = "GPL"
|
||||
SECTION = "base"
|
||||
DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
|
||||
removing kernel modules for Linux (versions 2.5.48 and above). It serves \
|
||||
the same function that the modutils package serves for Linux 2.4."
|
||||
PR = "r2"
|
||||
|
||||
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
|
||||
RDEPENDS_${PN} += "module-init-tools-depmod"
|
||||
|
||||
FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
|
||||
FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
|
||||
|
||||
SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
|
||||
file://ignore_arch_directory;patch=1 \
|
||||
file://modutils_extension;patch=1 \
|
||||
file://no_man_rebuild;patch=1 \
|
||||
file://manpagesopt;patch=1 \
|
||||
file://soc.patch;patch=1;pnum=0"
|
||||
S = "${WORKDIR}/module-init-tools-${PV}"
|
||||
|
||||
EXTRA_OECONF = "--disable-manpages"
|
||||
|
||||
bindir = "/bin"
|
||||
sbindir = "/sbin"
|
||||
|
||||
inherit autotools
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
|
||||
mv ${D}/$f ${D}/$f.26
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --install /$f $bn /$f.26 20
|
||||
done
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --remove $bn /$f.26
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools-depmod() {
|
||||
#!/bin/sh
|
||||
update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
#!/bin/sh
|
||||
update-alternatives --remove depmod /sbin/depmod.26
|
||||
}
|
|
@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \
|
|||
the same function that the modutils package serves for Linux 2.4."
|
||||
LICENSE = "GPL"
|
||||
SECTION = "base"
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
||||
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
|
||||
RDEPENDS_${PN} += "module-init-tools-depmod"
|
||||
|
@ -34,18 +34,22 @@ do_install() {
|
|||
|
||||
pkg_postinst_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --install /$f $bn /$f.26 20
|
||||
done
|
||||
update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
|
||||
update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
#!/bin/sh
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --remove $bn /$f.26
|
||||
done
|
||||
update-alternatives --remove bin-lsmod /bin/lsmod.26
|
||||
update-alternatives --remove lsmod /bin/lsmod.26
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools-depmod() {
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
|
||||
LICENSE = "unknown"
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "file://get_symbol_fw \
|
||||
file://parse_symbol_fw"
|
||||
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_compile() {
|
||||
./get_symbol_fw
|
||||
}
|
||||
|
||||
FILES_${PN} += "${base_libdir}/firmware/symbol*"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${base_libdir}/firmware/
|
||||
install -m 0755 ${WORKDIR}/symbol_sp24t_prim_fw ${D}${base_libdir}/firmware/symbol_sp24t_prim_fw
|
||||
install -m 0755 ${WORKDIR}/symbol_sp24t_sec_fw ${D}${base_libdir}/firmware/symbol_sp24t_sec_fw
|
||||
}
|
|
@ -0,0 +1,43 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Get firmware for Symbol Spectrum24 Trilogy.
|
||||
# Both the header file and the binary firmware files are produced.
|
||||
|
||||
# Copyright (C) 2004 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
# This script is Free Software, and it can be copied, distributed and
|
||||
# modified as defined in the GNU General Public License. A copy of
|
||||
# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
|
||||
|
||||
# Usage: get_symbol_fw
|
||||
# Output: spectrum_fw.h symbol_sp24t_prim_fw symbol_sp24t_sec_fw
|
||||
# Needed tools: curl (or wget), unzip, perl.
|
||||
|
||||
set -e
|
||||
|
||||
URL_BASE='ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/'
|
||||
DL_FILE='MC&DriverOnlyInstallers.zip'
|
||||
DL_INT1='S24DRVR392B67-01.exe'
|
||||
DL_INT2='Driver Only Installer/NetWLan5.sys'
|
||||
DRIVER1=symbol1.drv
|
||||
DRIVER2=symbol2.drv
|
||||
|
||||
get_file() {
|
||||
curl --remote-name "$1" || \
|
||||
wget --passive-ftp "$1" || \
|
||||
wget "$1" || \
|
||||
ftp "$1" </dev/null || \
|
||||
exit 1
|
||||
}
|
||||
|
||||
if ! test -f $DL_FILE; then
|
||||
get_file $URL_BASE/$DL_FILE
|
||||
fi
|
||||
|
||||
unzip -p $DL_FILE "$DL_INT1" >$DRIVER1
|
||||
unzip -p $DRIVER1 "$DL_INT2" >$DRIVER2
|
||||
|
||||
perl parse_symbol_fw $DRIVER2 spectrum_fw.h symbol_sp24t_prim_fw \
|
||||
symbol_sp24t_sec_fw
|
||||
|
||||
rm -f $DRIVER1 $DRIVER2
|
|
@ -0,0 +1,129 @@
|
|||
#!/usr/bin/perl -w
|
||||
|
||||
# Extract Symbol firmware and convert is to a header file and two binary
|
||||
# files.
|
||||
|
||||
# Copyright (C) 2004 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
# This script is Free Software, and it can be copied, distributed and
|
||||
# modified as defined in the GNU General Public License. A copy of
|
||||
# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html
|
||||
|
||||
# Usage:
|
||||
# parse_symbol_fw infile header binfile1 binfile2
|
||||
|
||||
use strict;
|
||||
|
||||
# Print message and exit (like "die", but without raising an exception).
|
||||
# Newline is added at the end.
|
||||
sub error
|
||||
{
|
||||
printf STDERR "ERROR: ";
|
||||
printf STDERR @_;
|
||||
printf STDERR "\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
sub readnum_ba ()
|
||||
{
|
||||
my $byte_a;
|
||||
read INFILE,$byte_a,1;
|
||||
my $byte_b;
|
||||
read INFILE,$byte_b,1;
|
||||
return (ord($byte_b) << 8) + ord($byte_a);
|
||||
}
|
||||
|
||||
|
||||
if ($#ARGV != 3) {
|
||||
error ("Usage: parse_symbol_fw infile header binfile1 binfile2");
|
||||
}
|
||||
|
||||
unless (open (INFILE, "< $ARGV[0]")) {
|
||||
error ("couldn't open $ARGV[0] for reading: $!");
|
||||
}
|
||||
|
||||
unless (open (OUTFILE, "> $ARGV[1]")) {
|
||||
error ("couldn't open $ARGV[1] for writing: $!");
|
||||
}
|
||||
|
||||
# Process one array, either for primary or for secondary firmware
|
||||
sub process_one_array($$) {
|
||||
my $arrname = shift(@_);
|
||||
my $binfile = shift(@_);
|
||||
my $offset = -1;
|
||||
my $str_offset = 0;
|
||||
|
||||
# Skip to the beginning of firmware
|
||||
$/ = "\x00";
|
||||
while (<INFILE>) {
|
||||
if (m{FILE: }g) {
|
||||
$offset = $str_offset + pos() - 6;
|
||||
last;
|
||||
}
|
||||
$str_offset = tell(INFILE);
|
||||
}
|
||||
|
||||
if ($offset == -1) {
|
||||
error("Cannot find FILE: marker");
|
||||
}
|
||||
|
||||
my @fwdata = split;
|
||||
print $fwdata[1] . "\n";
|
||||
seek(INFILE, $offset, 0);
|
||||
|
||||
my $blknum = $fwdata[3];
|
||||
my $pdrlen = $fwdata[4];
|
||||
my $crclen = $fwdata[5];
|
||||
my $compatlen = $fwdata[6];
|
||||
|
||||
while (!eof(INFILE)) {
|
||||
my $byte;
|
||||
read INFILE, $byte, 1;
|
||||
last if (ord($byte) == 0x1a);
|
||||
}
|
||||
|
||||
# Walk all blocks
|
||||
my $block = $blknum;
|
||||
while ($block-- > 0) {
|
||||
seek(INFILE, 4, 1);
|
||||
my $len = readnum_ba();
|
||||
seek(INFILE, $len, 1);
|
||||
}
|
||||
|
||||
my $img_len = tell(INFILE) - $offset + $pdrlen + $crclen + $compatlen + 2;
|
||||
seek(INFILE, $offset, 0);
|
||||
|
||||
# Write binary file for the section
|
||||
unless (open (BINFILE, "> $binfile")) {
|
||||
error ("couldn't open $binfile for writing: $!");
|
||||
}
|
||||
|
||||
# Output the array
|
||||
printf OUTFILE "/* %s %s */\n", $fwdata[1], $fwdata[2];
|
||||
printf OUTFILE "static u8 %s[] = {\n", $arrname;
|
||||
|
||||
my $count = 0;
|
||||
while ($count++ < $img_len) {
|
||||
my $byte;
|
||||
read INFILE, $byte, 1;
|
||||
$byte = ord($byte);
|
||||
printf OUTFILE "0x%02x,", $byte;
|
||||
printf BINFILE "%c", $byte;
|
||||
if ($count % 16 == 0) {
|
||||
printf OUTFILE "\n";
|
||||
}
|
||||
}
|
||||
|
||||
if ($img_len % 16) {
|
||||
printf OUTFILE "\n";
|
||||
}
|
||||
|
||||
print OUTFILE "};\n";
|
||||
close(BINFILE);
|
||||
}
|
||||
|
||||
process_one_array("primsym", $ARGV[2]);
|
||||
process_one_array("secsym", $ARGV[3]);
|
||||
|
||||
close(INFILE);
|
||||
close(OUTFILE);
|
|
@ -1,109 +0,0 @@
|
|||
apmd-3.2.2-r3
|
||||
autoconf-native-2.59-r3
|
||||
automake-native-1.9.3-r5
|
||||
base-files-3.0.14-r39
|
||||
base-passwd-3.5.9-r2
|
||||
binutils-cross-2.15.99+csl-arm+cvs20050416-r0
|
||||
bison-native-2.0-r2
|
||||
busybox-1.00-r30
|
||||
compositeext-0.0cvs20050825-r0
|
||||
compositeext-0.0cvs20050826-r0
|
||||
console-tools-0.3.2-r1
|
||||
coreutils-native-5.1.3-r7
|
||||
damageext-1.0-r1
|
||||
db3-native-3.2.9-r1
|
||||
dbus-0.23.4-r1
|
||||
diet-x11-6.2.1-r2
|
||||
dropbear-0.46-r3
|
||||
expat-1.95.7-r0
|
||||
expat-native-1.95.7-r0
|
||||
fakeroot-native-1.2.13-r0
|
||||
fixesext-0.0cvs20050825-r0
|
||||
fixesext-0.0cvs20050826-r0
|
||||
flex-native-2.5.31-r2
|
||||
gcc-cross-3.4.4-r1
|
||||
gcc-cross-initial-3.4.4-r1
|
||||
gcc-cross-kernel-3.3.4-3.3.4-r2
|
||||
gdbm-native-1.8.3-r0
|
||||
gettext-native-0.14.1-r3
|
||||
glib-2.0-2.6.4-r0
|
||||
glib-2.0-native-2.6.5-r0
|
||||
glibc-2.3.5+cvs20050627-r0
|
||||
gmp-4.1.4-r0
|
||||
gnu-config-native-0.1cvs20050701-r4
|
||||
gtk-doc-1.0-r1
|
||||
gtk-doc-native-1.0-r1
|
||||
hotplug-dbus-0.9-r1
|
||||
initscripts-1.0-r56
|
||||
intltool-native-0.31-r0
|
||||
ipkg-0.99.152-r0
|
||||
ipkg-collateral-1.0-r2
|
||||
ipkg-link-1.6cvs20050825-r1
|
||||
ipkg-link-1.6cvs20050826-r1
|
||||
ipkg-native-0.99.152-r0
|
||||
ipkg-utils-native-1.6cvs20050825-r4
|
||||
ipkg-utils-native-1.6cvs20050826-r4
|
||||
irda-utils-0.9.16-r2
|
||||
libpcap-0.9.3-r1
|
||||
libtool-cross-1.5.10-r3
|
||||
libtool-native-1.5.10-r3
|
||||
libxdmcp-0.1.3-r1
|
||||
libxml-parser-perl-native-2.34-r0
|
||||
libxrandr-1.0.2-r1
|
||||
libxrender-0.8.4-r1
|
||||
linux-hotplug-20040920-r6
|
||||
linux-libc-headers-2.6.11.1-r1
|
||||
linux-omap1-2.6.12-rc2-r3
|
||||
lrzsz-0.12.20-r2
|
||||
m4-native-1.4.2-r0
|
||||
makedevs-1.0.0-r2
|
||||
module-init-tools-3.2-pre7-r0
|
||||
module-init-tools-cross-3.1-r3
|
||||
modutils-2.4.27-r7
|
||||
modutils-initscripts-1.0-r2
|
||||
ncurses-5.4-r8
|
||||
ncurses-native-5.4-r8
|
||||
netbase-4.21-r6
|
||||
network-suspend-scripts-1.1-r2
|
||||
nokia770-init-1.0-r3
|
||||
openswan-2.2.0-r3
|
||||
pcmcia-cs-3.2.8-r19
|
||||
perl-native-5.8.7-r0
|
||||
pkgconfig-native-0.15.0-r1
|
||||
portmap-5-9-r5
|
||||
ppp-2.4.3-r0
|
||||
ppp-dialin-0.1-r4
|
||||
psmisc-20.2-r3
|
||||
quilt-native-0.39-r0
|
||||
randrext-1.0-r0
|
||||
recordext-0.0cvs20050825-r0
|
||||
recordext-0.0cvs20050826-r0
|
||||
renderext-0.0cvs20050825-r0
|
||||
renderext-0.0cvs20050826-r0
|
||||
resourceext-1.0-r0
|
||||
rp1
|
||||
scap-0.1-r1
|
||||
setserial-2.17-r1
|
||||
sysfsutils-1.3.0-r0
|
||||
sysvinit-2.86-r19
|
||||
task-bootstrap-1.0-r25
|
||||
tinylogin-1.4-r3
|
||||
tslib-maemo-0.0.1-15-r1
|
||||
update-modules-1.0-r3
|
||||
update-rc.d-0.7-r0
|
||||
wireless-tools-28-pre6-r1
|
||||
wpa-supplicant-nossl-0.2.6-r3
|
||||
x11-6.2.1-r2
|
||||
xau-0.1.1-r1
|
||||
xcalibrateext-0.0cvs20050825-r0
|
||||
xcalibrateext-0.0cvs20050826-r0
|
||||
xext-0.0cvs20050825-r1
|
||||
xext-0.0cvs20050826-r1
|
||||
xextensions-1.0.3+cvs20050610-r0
|
||||
xfont-1.4.2-r2
|
||||
xpext-1.0-5-r0
|
||||
xproto-6.6.2-r0
|
||||
xserver-kdrive-omap-6.6.3-r2
|
||||
xsp-1.0.0-8-r0
|
||||
xtrans-0.1-r0
|
||||
zlib-1.2.3-r0
|
|
@ -1,5 +1,4 @@
|
|||
module_raw input
|
||||
module_raw linear_h2200
|
||||
module pthres pmin=1
|
||||
module variance delta=30
|
||||
module dejitter delta=100
|
||||
|
|
|
@ -44,7 +44,6 @@ Cleanup(){
|
|||
rm -f $VTMPNAME > /dev/null 2>&1
|
||||
rm -f $MTMPNAME > /dev/null 2>&1
|
||||
rm $CTRLPATH/* > /dev/null 2>&1
|
||||
rm $DATAPATH/* > /dev/null 2>&1
|
||||
exit $1
|
||||
}
|
||||
trap 'Cleanup 1' 1 15
|
||||
|
@ -82,7 +81,7 @@ fi
|
|||
### Check model ###
|
||||
/sbin/writerominfo
|
||||
MODEL=`cat /proc/deviceinfo/product`
|
||||
if [ "$MODEL" != "SL-C3000" ]
|
||||
if [ "$MODEL" != "SL-C3000" ] && [ "$MODEL" != "SL-C3100" ]
|
||||
then
|
||||
echo 'MODEL:'$MODEL
|
||||
echo 'ERROR:Invalid model!'
|
||||
|
@ -92,6 +91,23 @@ then
|
|||
done
|
||||
fi
|
||||
|
||||
### Check that we have a valid tar
|
||||
for TARNAME in gnu-tar GNU-TAR
|
||||
do
|
||||
if [ -e $DATAPATH/$TARNAME ]
|
||||
then
|
||||
TARBIN=$DATAPATH/$TARNAME
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ! -e $TARBIN ]; then
|
||||
echo 'Please place a valid copy of tar as "gnu-tar" on your card'
|
||||
echo 'Please reset'
|
||||
while true
|
||||
do
|
||||
done
|
||||
fi
|
||||
|
||||
mkdir -p $TMPPATH > /dev/null 2>&1
|
||||
|
||||
cd $DATAPATH/
|
||||
|
@ -243,13 +259,17 @@ do
|
|||
|
||||
cd /hdd1
|
||||
echo 'Now extracting...'
|
||||
gzip -dc $DATAPATH/$TARGETFILE | tar xf -
|
||||
gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
|
||||
if [ "$?" != "0" ]; then
|
||||
echo "Error!"
|
||||
exit "$?"
|
||||
fi
|
||||
|
||||
echo 'Success!'
|
||||
|
||||
#This can be useful for debugging
|
||||
#/bin/sh -i
|
||||
|
||||
# remount as RO
|
||||
cd /
|
||||
umount /hdd1
|
||||
|
|
|
@ -3,7 +3,8 @@ DEPENDS = "encdec-updater-native"
|
|||
LICENSE = "zaurus-updater"
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI = "file://updater.sh"
|
||||
SRC_URI = "file://updater.sh \
|
||||
file://gnu-tar.gz"
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_compile() {
|
||||
|
@ -13,6 +14,14 @@ do_compile() {
|
|||
do_deploy() {
|
||||
install -d ${DEPLOY_DIR}/images/
|
||||
install -m 0755 updater.sh ${DEPLOY_DIR}/images/updater.sh.${MACHINE}
|
||||
|
||||
case ${MACHINE} in
|
||||
spitz | borzoi )
|
||||
install -m 0755 gnu-tar ${DEPLOY_DIR}/images/gnu-tar
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
addtask deploy before do_build after do_compile
|
||||
|
|
Loading…
Reference in New Issue