[oe-commits] org.oe.dev merge of 'b9087aed5992eb3d85c7c859b89c4236a3d7e178'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Sep 2 00:04:19 UTC 2007
merge of 'b9087aed5992eb3d85c7c859b89c4236a3d7e178'
and 'de0f7d33bace1070e3a1202edc6e122f22d6873c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 46598fbaed38fc3e79d96b6bb061410fbea84c3d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=46598fbaed38fc3e79d96b6bb061410fbea84c3d
Files:
1
packages/tasks/task-sdk-host.bb
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/package_rpm.bbclass
classes/package_tar.bbclass
classes/rootfs_ipk.bbclass
classes/sdk.bbclass
conf/bitbake.conf
packages/angstrom/angstrom-x11-gpe-image.bb
packages/angstrom/angstrom-x11-image.bb
packages/angstrom/angstrom-x11-office-image.bb
packages/angstrom/angstrom-x11-pimlico-image.bb
packages/images/e-image-core.bb
packages/meta/meta-toolchain.bb
packages/netbase/netbase/fic-gta02
packages/netbase/netbase/fic-gta02/interfaces
packages/netbase/netbase_4.21.bb
Diffs:
#
# mt diff -rb9087aed5992eb3d85c7c859b89c4236a3d7e178 -r46598fbaed38fc3e79d96b6bb061410fbea84c3d
#
#
#
# add_file "packages/tasks/task-sdk-host.bb"
# content [d8cf93c8023c6249cd6499a8ca3ffe51abcac72f]
#
# patch "classes/package_deb.bbclass"
# from [e921fa8625c039aae270b843336c64fbd0a5dbf2]
# to [73842f1df6176a56ec4f8018d2d98ca667df785f]
#
# patch "classes/package_ipk.bbclass"
# from [54b39e5efba77c456870382c897602c36e8d5cfc]
# to [5147bb6ee1fb5160d355f56c4d345aba5b4ec236]
#
# patch "classes/package_rpm.bbclass"
# from [555193edec7219ac867536609f6970425ff4522b]
# to [bb81b0ca13339c5590f4287cb163cfd408618bab]
#
# patch "classes/package_tar.bbclass"
# from [10aa1d1ddc7ffe939e5af5cd9118f366d4d4aba3]
# to [3b2206e771dcb118314fab5af6570042df83f633]
#
# patch "classes/rootfs_ipk.bbclass"
# from [1253e5e3c31d91f0a10bebee62020c47fbf32139]
# to [c9bd969ffbc28a671b048b88d67a776b1b7fc57e]
#
# patch "classes/sdk.bbclass"
# from [201b96c39256c1a1221fd02c95ff7cf5b14ee685]
# to [ddb3418b1e5dbb4ae2c0684207c3dfb7d2343ea7]
#
# patch "conf/bitbake.conf"
# from [391e9060470ab898403e7bd7b2526cab82544e29]
# to [d345b97ed205e335f85c0528040d80119f07236d]
#
# patch "packages/angstrom/angstrom-x11-gpe-image.bb"
# from [c8543db52c9f3b3793372a91e5c2d807fe31ca3b]
# to [ab32818d2bb2d3dcd3afc919674ccae2374f8aeb]
#
# patch "packages/angstrom/angstrom-x11-image.bb"
# from [340f91d6bae38bceb8a159ca15f7d303d7188b3e]
# to [b547dd688f1df673379bc757fc7e946cf641e8b5]
#
# patch "packages/angstrom/angstrom-x11-office-image.bb"
# from [396fb20d63dee90a6a41f8ed68f8fc1580bdd778]
# to [c2e04567b6ea8b6ecf0ca75c4f86783ad9a9de19]
#
# patch "packages/angstrom/angstrom-x11-pimlico-image.bb"
# from [42401d25b63f709c0357a47f1c22ab27004ab097]
# to [4ad6e8166469987b0938a0cd742e5c888c402bfc]
#
# patch "packages/images/e-image-core.bb"
# from [2f89f94c9e5bb901017ea12bb634dab6cfdb11c5]
# to [c2511018a72814bd52691e1b02aa5f505d63547d]
#
# patch "packages/meta/meta-toolchain.bb"
# from [48a3aaddce0b598da2095884bd7e92354b5f5213]
# to [f3869892e4ec081f70f4d0a1f766a5286aa9731b]
#
============================================================
--- packages/tasks/task-sdk-host.bb d8cf93c8023c6249cd6499a8ca3ffe51abcac72f
+++ packages/tasks/task-sdk-host.bb d8cf93c8023c6249cd6499a8ca3ffe51abcac72f
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd
+#
+
+DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
+PR = "r1"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+inherit sdk
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+ binutils-cross-sdk \
+ gcc-cross-sdk \
+ gdb-cross-sdk \
+ g++ \
+ cpp \
+ libgcc \
+ libgcc-dev \
+ libstdc++ \
+ libstdc++-dev \
+ "
============================================================
--- classes/package_deb.bbclass e921fa8625c039aae270b843336c64fbd0a5dbf2
+++ classes/package_deb.bbclass 73842f1df6176a56ec4f8018d2d98ca667df785f
@@ -64,9 +64,7 @@ python do_package_deb () {
}
python do_package_deb () {
- import copy # to back up env data
- import sys
- import re
+ import sys, re, fcntl, copy
workdir = bb.data.getVar('WORKDIR', d, 1)
if not workdir:
@@ -99,10 +97,21 @@ python do_package_deb () {
bb.debug(1, "No packages; nothing to do")
return
+ def lockfile(name):
+ lf = open(name, "a+")
+ fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
+ return lf
+
+ def unlockfile(lf):
+ fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
+ lf.close
+
for pkg in packages.split():
localdata = bb.data.createCopy(d)
root = "%s/install/%s" % (workdir, pkg)
+ lf = lockfile(root + ".lock")
+
bb.data.setVar('ROOT', '', localdata)
bb.data.setVar('ROOT_%s' % pkg, root, localdata)
pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
@@ -133,6 +142,7 @@ python do_package_deb () {
if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
from bb import note
note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+ unlockfile(lf)
continue
controldir = os.path.join(root, 'DEBIAN')
bb.mkdirhier(controldir)
@@ -246,5 +256,20 @@ python do_package_deb () {
os.rmdir(controldir)
except OSError:
pass
- del localdata
+
+ unlockfile(lf)
}
+
+python () {
+ import bb
+ if bb.data.getVar('PACKAGES', d, True) != '':
+ bb.data.setVarFlag('do_package_write_deb', 'depends', 'dpkg-native:do_populate_staging fakeroot-native:do_populate_staging', d)
+}
+
+python do_package_write_deb () {
+ bb.build.exec_func("read_subpackage_metadata", d)
+ bb.build.exec_func("do_package_deb", d)
+}
+do_package_write_deb[dirs] = "${D}"
+#addtask package_write_deb before do_package_write after do_package
+
============================================================
--- classes/package_ipk.bbclass 54b39e5efba77c456870382c897602c36e8d5cfc
+++ classes/package_ipk.bbclass 5147bb6ee1fb5160d355f56c4d345aba5b4ec236
@@ -6,6 +6,9 @@ IMAGE_PKGTYPE ?= "ipk"
PACKAGE_WRITE_FUNCS += "do_package_ipk"
IMAGE_PKGTYPE ?= "ipk"
+IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/ipkg.conf"
+IPKGCONF_SDK = "${STAGING_ETCDIR_NATIVE}/ipkg-sdk.conf"
+
python package_ipk_fn () {
from bb import data
bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
@@ -53,7 +56,7 @@ python package_ipk_install () {
ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
if (ret != 0 ):
raise bb.build.FuncFailed
- f=open(os.path.join(tmpdir, "stamps" ,"do_packages"),"w")
+ f=open(os.path.join(tmpdir, "stamps", "do_packages"),"w")
f.close()
ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile))
@@ -62,10 +65,53 @@ python package_ipk_install () {
raise bb.build.FuncFailed
}
+#
+# Update the Packages index files in ${DEPLOY_DIR_IPK}
+#
+package_update_index_ipk () {
+ set -x
+
+ ipkgarchs="${PACKAGE_ARCHS}"
+
+ if [ ! -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+ return
+ fi
+
+ touch ${DEPLOY_DIR_IPK}/Packages
+ ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+
+ for arch in $ipkgarchs; do
+ if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then
+ touch ${DEPLOY_DIR_IPK}/$arch/Packages
+ ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
+ fi
+ done
+}
+
+#
+# Generate an ipkg conf file ${IPKGCONF_TARGET} suitable for use against
+# the target system and an ipkg conf file ${IPKGCONF_SDK} suitable for
+# use against the host system in sdk builds
+#
+package_generate_ipkg_conf () {
+ mkdir -p ${STAGING_ETCDIR_NATIVE}/
+ echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_TARGET}
+ echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_SDK}
+ ipkgarchs="${PACKAGE_ARCHS}"
+ priority=1
+ for arch in $ipkgarchs; do
+ echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
+ echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
+ priority=$(expr $priority + 5)
+ if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+ echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
+ echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK}
+ fi
+ done
+}
+
python do_package_ipk () {
- import copy # to back up env data
- import sys
- import re
+ import sys, re, fcntl, copy
workdir = bb.data.getVar('WORKDIR', d, 1)
if not workdir:
@@ -96,16 +142,27 @@ python do_package_ipk () {
tmpdir = bb.data.getVar('TMPDIR', d, 1)
# Invalidate the packages file
if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK):
- os.unlink(os.path.join(tmpdir, "stamps" ,"do_packages"))
+ os.unlink(os.path.join(tmpdir, "stamps", "do_packages"))
if packages == []:
bb.debug(1, "No packages; nothing to do")
return
+ def lockfile(name):
+ lf = open(name, "a+")
+ fcntl.flock(lf.fileno(), fcntl.LOCK_EX)
+ return lf
+
+ def unlockfile(lf):
+ fcntl.flock(lf.fileno(), fcntl.LOCK_UN)
+ lf.close
+
for pkg in packages.split():
localdata = bb.data.createCopy(d)
root = "%s/install/%s" % (workdir, pkg)
+ lf = lockfile(root + ".lock")
+
bb.data.setVar('ROOT', '', localdata)
bb.data.setVar('ROOT_%s' % pkg, root, localdata)
pkgname = bb.data.getVar('PKG_%s' % pkg, localdata, 1)
@@ -134,6 +191,7 @@ python do_package_ipk () {
if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
from bb import note
note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+ unlockfile(lf)
continue
controldir = os.path.join(root, 'CONTROL')
@@ -154,7 +212,7 @@ python do_package_ipk () {
fields.append(["Priority: %s\n", ['PRIORITY']])
fields.append(["Maintainer: %s\n", ['MAINTAINER']])
fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
- fields.append(["OE: %s\n", ['P']])
+ fields.append(["OE: %s\n", ['PN']])
fields.append(["Homepage: %s\n", ['HOMEPAGE']])
def pullData(l, d):
@@ -241,4 +299,18 @@ python do_package_ipk () {
os.rmdir(controldir)
except OSError:
pass
+ unlockfile(lf)
}
+
+python () {
+ import bb
+ if bb.data.getVar('PACKAGES', d, True) != '':
+ bb.data.setVarFlag('do_package_write_ipk', 'depends', 'ipkg-utils-native:do_populate_staging fakeroot-native:do_populate_staging', d)
+}
+
+python do_package_write_ipk () {
+ bb.build.exec_func("read_subpackage_metadata", d)
+ bb.build.exec_func("do_package_ipk", d)
+}
+do_package_write_ipk[dirs] = "${D}"
+
============================================================
--- classes/package_rpm.bbclass 555193edec7219ac867536609f6970425ff4522b
+++ classes/package_rpm.bbclass bb81b0ca13339c5590f4287cb163cfd408618bab
@@ -54,7 +54,6 @@ python write_specfile() {
except OSError:
raise bb.build.FuncFailed("unable to open spec file for writing.")
-# fd = sys.__stdout__
fd = specfile
for var in out_vartranslate.keys():
if out_vartranslate[var][0] == "%":
@@ -123,7 +122,7 @@ python do_package_rpm () {
bb.data.setVar('OVERRIDES', '%s:%s' % (overrides, pkg), localdata)
bb.data.update_data(localdata)
-# stuff
+
root = bb.data.getVar('ROOT', localdata)
basedir = os.path.dirname(root)
pkgoutdir = outdir
@@ -132,3 +131,17 @@ python do_package_rpm () {
bb.build.exec_func('write_specfile', localdata)
del localdata
}
+
+python () {
+ import bb
+ if bb.data.getVar('PACKAGES', d, True) != '':
+ bb.data.setVarFlag('do_package_write_rpm', 'depends', 'rpm-native:do_populate_staging', d)
+}
+
+
+python do_package_write_rpm () {
+ bb.build.exec_func("read_subpackage_metadata", d)
+ bb.build.exec_func("do_package_rpm", d)
+}
+do_package_write_rpm[dirs] = "${D}"
+#addtask package_write_rpm before do_build after do_package
============================================================
--- classes/package_tar.bbclass 10aa1d1ddc7ffe939e5af5cd9118f366d4d4aba3
+++ classes/package_tar.bbclass 3b2206e771dcb118314fab5af6570042df83f633
@@ -98,3 +98,17 @@ python do_package_tar () {
if ret != 0:
bb.error("Creation of tar %s failed." % tarfn)
}
+
+python () {
+ import bb
+ if bb.data.getVar('PACKAGES', d, True) != '':
+ bb.data.setVarFlag('do_package_write_tar', 'depends', 'tar-native:do_populate_staging', d)
+}
+
+
+python do_package_write_tar () {
+ bb.build.exec_func("read_subpackage_metadata", d)
+ bb.build.exec_func("do_package_tar", d)
+}
+do_package_write_tar[dirs] = "${D}"
+#addtask package_write_tar before do_build after do_package
============================================================
--- classes/rootfs_ipk.bbclass 1253e5e3c31d91f0a10bebee62020c47fbf32139
+++ classes/rootfs_ipk.bbclass c9bd969ffbc28a671b048b88d67a776b1b7fc57e
@@ -8,50 +8,19 @@ do_rootfs[recrdeptask] += "do_package_wr
do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging"
do_rootfs[recrdeptask] += "do_package_write"
-IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
+IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}"
DISTRO_EXTRA_RDEPENDS += " ipkg ipkg-collateral "
PACKAGE_INSTALL_NO_DEPS ?= "0"
-rootfs_ipk_do_indexes () {
- set -x
-
- ipkgarchs="${PACKAGE_ARCHS}"
-
- if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- touch ${DEPLOY_DIR_IPK}/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
- fi
-
- for arch in $ipkgarchs; do
- if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then
- touch ${DEPLOY_DIR_IPK}/$arch/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
- fi
- fi
- done
-}
-
fakeroot rootfs_ipk_do_rootfs () {
set -x
- rootfs_ipk_do_indexes
+ package_update_index_ipk
+ package_generate_ipkg_conf
mkdir -p ${T}
- #Add deploy/ipk as well for backward compat
- echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
- ipkgarchs="${PACKAGE_ARCHS}"
-
- priority=1
- for arch in $ipkgarchs; do
- echo "arch $arch $priority" >> ${T}/ipkg.conf
- priority=$(expr $priority + 5)
- if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
- echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${T}/ipkg.conf
- fi
- done
ipkg-cl ${IPKG_ARGS} update
# Uclibc builds don't provide this stuff...
@@ -71,7 +40,7 @@ fakeroot rootfs_ipk_do_rootfs () {
export OFFLINE_ROOT=${IMAGE_ROOTFS}
export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/
- grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf
+ grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/ipkg/arch.conf
for i in ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.preinst; do
if [ -f $i ] && ! sh $i; then
============================================================
--- classes/sdk.bbclass 201b96c39256c1a1221fd02c95ff7cf5b14ee685
+++ classes/sdk.bbclass ddb3418b1e5dbb4ae2c0684207c3dfb7d2343ea7
@@ -24,23 +24,3 @@ FILES_${PN}-dbg += "${prefix}/bin/.debug
FILES_${PN}-dbg += "${prefix}/bin/.debug \
${prefix}/sbin/.debug \
"
-
-sdk_ipk_do_indexes () {
- set -x
-
- ipkgarchs="${PACKAGE_ARCHS}"
-
- if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- touch ${DEPLOY_DIR_IPK}/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
- fi
-
- for arch in $ipkgarchs; do
- if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then
- touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -p ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -l ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages.filelist -m ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/
- fi
- fi
- done
-}
============================================================
--- conf/bitbake.conf 391e9060470ab898403e7bd7b2526cab82544e29
+++ conf/bitbake.conf d345b97ed205e335f85c0528040d80119f07236d
@@ -171,6 +171,7 @@ STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/
STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
STAGING_LIBDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/lib"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/etc"
STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
============================================================
--- packages/angstrom/angstrom-x11-gpe-image.bb c8543db52c9f3b3793372a91e5c2d807fe31ca3b
+++ packages/angstrom/angstrom-x11-gpe-image.bb ab32818d2bb2d3dcd3afc919674ccae2374f8aeb
@@ -1,11 +1,5 @@
#Angstrom X11 image, with apps and kernel modules included
-PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget"
-PREFERRED_PROVIDER_tslib ?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11"%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rde0f7d33bace1070e3a1202edc6e122f22d6873c -r46598fbaed38fc3e79d96b6bb061410fbea84c3d
#
#
#
# add_dir "packages/netbase/netbase/fic-gta02"
#
# add_file "packages/netbase/netbase/fic-gta02/interfaces"
# content [b119191890448d523db7d93579548ffd89c4a050]
#
# patch "packages/netbase/netbase_4.21.bb"
# from [3fec27517cd3465754989f44477022d59bf7749a]
# to [6f3ca0feab30d1dfc81d97ff3ab8c242e8084886]
#
============================================================
--- packages/netbase/netbase/fic-gta02/interfaces b119191890448d523db7d93579548ffd89c4a050
+++ packages/netbase/netbase/fic-gta02/interfaces b119191890448d523db7d93579548ffd89c4a050
@@ -0,0 +1,28 @@
+# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
+
+# The loopback interface
+auto lo
+iface lo inet loopback
+
+# Wireless interfaces
+iface wlan0 inet dhcp
+wireless_mode managed
+wireless_essid any
+iface atml0 inet dhcp
+
+# Wired or wireless interfaces
+iface eth0 inet dhcp
+iface eth1 inet dhcp
+
+# Ethernet/RNDIS gadget (g_ether)
+# ... or on host side, usbnet and random hwaddr
+auto usb0
+iface usb0 inet static
+ address 192.168.0.202
+ netmask 255.255.255.0
+ network 192.168.0.0
+ gateway 192.168.0.200
+
+# Bluetooth networking
+iface bnep0 inet dhcp
+
============================================================
--- packages/netbase/netbase_4.21.bb 3fec27517cd3465754989f44477022d59bf7749a
+++ packages/netbase/netbase_4.21.bb 6f3ca0feab30d1dfc81d97ff3ab8c242e8084886
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
SECTION = "base"
LICENSE = "GPL"
-PR = "r21"
+PR = "r22"
inherit update-rc.d
@@ -21,20 +21,20 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netba
file://init \
file://hosts \
file://interfaces \
- file://if-pre-up.d \
- file://if-up.d \
- file://if-down.d \
- file://if-post-down.d"
+ file://if-pre-up.d \
+ file://if-up.d \
+ file://if-down.d \
+ file://if-post-down.d"
do_install () {
- install -d ${D}${sysconfdir}/init.d \
- ${D}${sbindir} \
- ${D}${mandir}/man8 \
- ${D}${sysconfdir}/network/if-pre-up.d \
- ${D}${sysconfdir}/network/if-up.d \
- ${D}${sysconfdir}/network/if-down.d \
- ${D}${sysconfdir}/network/if-post-down.d
-
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sbindir}
+ install -d ${D}${mandir}/man8
+ install -d ${D}${sysconfdir}/network/if-pre-up.d
+ install -d ${D}${sysconfdir}/network/if-up.d
+ install -d ${D}${sysconfdir}/network/if-down.d
+ install -d ${D}${sysconfdir}/network/if-post-down.d
+
for dir in if-pre-up.d if-up.d if-down.d if-post-down.d
do
for script in `ls -1 "${WORKDIR}/${dir}"`
More information about the Openembedded-commits
mailing list