summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/classes/allarch.bbclass15
-rw-r--r--meta/classes/siteinfo.bbclass1
-rw-r--r--meta/recipes-bsp/hostap/hostap-conf_1.0.bb5
-rw-r--r--meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb5
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb5
-rw-r--r--meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb6
-rw-r--r--meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb6
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb5
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb5
-rw-r--r--meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb5
-rw-r--r--meta/recipes-core/update-rc.d/update-rc.d_0.7.bb4
-rw-r--r--meta/recipes-graphics/x11-common/x11-common_0.1.bb5
-rw-r--r--meta/recipes-kernel/update-modules/update-modules_1.0.bb5
13 files changed, 47 insertions, 25 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
new file mode 100644
index 0000000000..b7c37c3dd1
--- /dev/null
+++ b/meta/classes/allarch.bbclass
@@ -0,0 +1,15 @@
1#
2# This class is used for architecture independent recipes/data files (usally scripts)
3#
4
5PACKAGE_ARCH = "all"
6
7# No need for virtual/libc or a cross compiler
8INHIBIT_DEFAULT_DEPS = "1"
9
10# Set these to a common set of values, we shouldn't be using them other that for WORKDIR directory
11# naming anyway
12TARGET_ARCH = "all"
13TARGET_OS = "linux"
14TARGET_CC_ARCH = "none"
15PACKAGE_EXTRA_ARCHS = ""
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 0b59e578fc..6c272a75bc 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -19,6 +19,7 @@ def get_siteinfo_list(d):
19 target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1) 19 target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1)
20 20
21 targetinfo = {\ 21 targetinfo = {\
22 "all-linux": "",\
22 "armeb-linux": "endian-big bit-32 common-glibc arm-common",\ 23 "armeb-linux": "endian-big bit-32 common-glibc arm-common",\
23 "armeb-linux-gnueabi": "endian-big bit-32 common-glibc arm-common armeb-linux",\ 24 "armeb-linux-gnueabi": "endian-big bit-32 common-glibc arm-common armeb-linux",\
24 "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\ 25 "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index de72b769a9..c602e8c640 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
@@ -4,12 +4,13 @@ PRIORITY = "optional"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
6RDEPENDS_${PN} = "update-modules" 6RDEPENDS_${PN} = "update-modules"
7PACKAGE_ARCH = "all" 7PR = "r14"
8PR = "r12"
9 8
10SRC_URI = "file://hostap_cs.modalias \ 9SRC_URI = "file://hostap_cs.modalias \
11 file://COPYING.patch" 10 file://COPYING.patch"
12 11
12inherit allarch
13
13do_compile() { 14do_compile() {
14} 15}
15 16
diff --git a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
index 1c25e02dcc..98d3aed2ca 100644
--- a/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
+++ b/meta/recipes-bsp/orinoco/orinoco-conf_1.0.bb
@@ -4,12 +4,13 @@ PRIORITY = "optional"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
6RDEPENDS_${PN} = "update-modules" 6RDEPENDS_${PN} = "update-modules"
7PACKAGE_ARCH = "all" 7PR = "r7"
8PR = "r6"
9 8
10SRC_URI = "file://orinoco_cs.conf \ 9SRC_URI = "file://orinoco_cs.conf \
11 file://COPYING.patch" 10 file://COPYING.patch"
12 11
12inherit allarch
13
13do_install() { 14do_install() {
14 install -d ${D}${sysconfdir}/modutils 15 install -d ${D}${sysconfdir}/modutils
15 install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ 16 install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index f91875e74e..70a113e8dc 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa
5 5
6COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)" 6COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemumips|qemuppc)"
7 7
8PR = "r20" 8PR = "r21"
9 9
10SRC_URI = "file://distcc.sh \ 10SRC_URI = "file://distcc.sh \
11 file://anjuta-remote-run \ 11 file://anjuta-remote-run \
@@ -33,9 +33,8 @@ do_install() {
33} 33}
34 34
35RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash" 35RDEPENDS_${PN} = "distcc dbus-x11 task-core-nfs-server oprofileui-server rsync bash"
36PACKAGE_ARCH = "all"
37 36
38inherit update-rc.d 37inherit update-rc.d allarch
39 38
40INITSCRIPT_NAME = "qemu-autostart" 39INITSCRIPT_NAME = "qemu-autostart"
41INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ." 40INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ."
diff --git a/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
index 4dfdcb247a..b6b3d7dcfd 100644
--- a/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
+++ b/meta/recipes-connectivity/bluez/bluez-dtl1-workaround_1.0.bb
@@ -3,11 +3,13 @@ LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 3LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
4SECTION = "console" 4SECTION = "console"
5PRIORITY = "optional" 5PRIORITY = "optional"
6PR = "r2" 6PR = "r3"
7 7
8SRC_URI = "file://02dtl1_cs.sh \ 8SRC_URI = "file://02dtl1_cs.sh \
9 file://COPYING.patch" 9 file://COPYING.patch"
10 10
11inherit allarch
12
11do_install() { 13do_install() {
12 install -d ${D}${sysconfdir}/apm/event.d/ 14 install -d ${D}${sysconfdir}/apm/event.d/
13 install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/ 15 install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
@@ -15,5 +17,3 @@ do_install() {
15 17
16#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume 18#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
17FILES_${PN} += "${sysconfdir}/apm/" 19FILES_${PN} += "${sysconfdir}/apm/"
18
19PACKAGE_ARCH = "all"
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 5cdba2ba11..d4ac77e921 100644
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
2DESCRIPTION = "Enables PPP dial-in through a serial connection" 2DESCRIPTION = "Enables PPP dial-in through a serial connection"
3DEPENDS = "ppp" 3DEPENDS = "ppp"
4RDEPENDS_${PN} = "ppp" 4RDEPENDS_${PN} = "ppp"
5PR = "r6" 5PR = "r7"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
10SRC_URI = "file://host-peer \ 10SRC_URI = "file://host-peer \
11 file://ppp-dialin" 11 file://ppp-dialin"
12 12
13inherit allarch
14
13do_install() { 15do_install() {
14 install -d ${D}${sysconfdir}/ppp/peers 16 install -d ${D}${sysconfdir}/ppp/peers
15 install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host 17 install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host
@@ -18,8 +20,6 @@ do_install() {
18 install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir} 20 install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir}
19} 21}
20 22
21PACKAGE_ARCH = "all"
22
23pkg_postinst_${PN} () { 23pkg_postinst_${PN} () {
24if test "x$D" != "x"; then 24if test "x$D" != "x"; then
25 exit 1 25 exit 1
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
index b372fddbba..704c2718a0 100644
--- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
@@ -3,11 +3,12 @@ LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4SRC_URI = "file://init-boot.sh" 4SRC_URI = "file://init-boot.sh"
5 5
6PR = "r0" 6PR = "r1"
7 7
8do_install() { 8do_install() {
9 install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init 9 install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
10} 10}
11 11
12PACKAGE_ARCH = "all" 12inherit allarch
13
13FILES_${PN} += " /init " 14FILES_${PN} += " /init "
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index f6a6a8a4cb..7051cbd32a 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -3,11 +3,12 @@ LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4SRC_URI = "file://init-live.sh" 4SRC_URI = "file://init-live.sh"
5 5
6PR = "r2" 6PR = "r3"
7 7
8do_install() { 8do_install() {
9 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init 9 install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
10} 10}
11 11
12PACKAGE_ARCH = "all" 12inherit allarch
13
13FILES_${PN} += " /init " 14FILES_${PN} += " /init "
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index c599be5c58..fdda71819f 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4SRC_URI = "file://init-install.sh" 4SRC_URI = "file://init-install.sh"
5 5
6PR = "r3" 6PR = "r4"
7 7
8RDEPENDS="grub parted e2fsprogs-mke2fs" 8RDEPENDS="grub parted e2fsprogs-mke2fs"
9 9
@@ -11,7 +11,8 @@ do_install() {
11 install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh 11 install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh
12} 12}
13 13
14PACKAGE_ARCH = "all" 14inherit allarch
15
15FILES_${PN} = " /install.sh " 16FILES_${PN} = " /install.sh "
16 17
17# Alternatives to grub need adding for other arch support 18# Alternatives to grub need adding for other arch support
diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
index 6a43d809ed..38da4233ea 100644
--- a/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/recipes-core/update-rc.d/update-rc.d_0.7.bb
@@ -2,18 +2,18 @@ SUMMARY = "manage symlinks in /etc/rcN.d."
2DESCRIPTION = "update-rc.d is a utilities that allows the management of symlinks to the initscripts in the /etc/rcN.d directory structure." 2DESCRIPTION = "update-rc.d is a utilities that allows the management of symlinks to the initscripts in the /etc/rcN.d directory structure."
3SECTION = "base" 3SECTION = "base"
4PRIORITY = "standard" 4PRIORITY = "standard"
5PACKAGE_ARCH = "all"
6 5
7LICENSE = "GPLv2+" 6LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=148a48321b10eb37c1fa3ee02b940a75" 7LIC_FILES_CHKSUM = "file://update-rc.d;beginline=5;endline=15;md5=148a48321b10eb37c1fa3ee02b940a75"
9 8
10PR = "r3" 9PR = "r4"
11 10
12SRC_URI = "git://github.com/philb/update-rc.d.git;tag=update-rc.d_${PV};protocol=git \ 11SRC_URI = "git://github.com/philb/update-rc.d.git;tag=update-rc.d_${PV};protocol=git \
13 file://add-verbose.patch;striplevel=1" 12 file://add-verbose.patch;striplevel=1"
14 13
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15
16inherit allarch
17 17
18do_compile() { 18do_compile() {
19} 19}
diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 6951cf3771..b6bd61a74c 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,13 +2,15 @@ DESCRIPTION = "Common X11 scripts and configuration files"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4SECTION = "x11" 4SECTION = "x11"
5PR = "r43" 5PR = "r44"
6 6
7SRC_URI = "file://etc \ 7SRC_URI = "file://etc \
8 file://gplv2-license.patch" 8 file://gplv2-license.patch"
9 9
10S = ${WORKDIR} 10S = ${WORKDIR}
11 11
12inherit allarch
13
12do_install() { 14do_install() {
13 cp -R ${S}/etc ${D}/etc 15 cp -R ${S}/etc ${D}/etc
14 chmod -R 755 ${D}/etc 16 chmod -R 755 ${D}/etc
@@ -17,5 +19,4 @@ do_install() {
17} 19}
18 20
19RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" 21RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor"
20PACKAGE_ARCH = "all"
21 22
diff --git a/meta/recipes-kernel/update-modules/update-modules_1.0.bb b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
index 336bca2e9b..1ea97a8530 100644
--- a/meta/recipes-kernel/update-modules/update-modules_1.0.bb
+++ b/meta/recipes-kernel/update-modules/update-modules_1.0.bb
@@ -3,13 +3,14 @@ SECTION = "base"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" 4LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe"
5 5
6PACKAGE_ARCH = "all"
7RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " 6RDEPENDS_${PN} = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} "
8PR = "r9" 7PR = "r10"
9 8
10SRC_URI = "file://update-modules \ 9SRC_URI = "file://update-modules \
11 file://COPYING.GPL" 10 file://COPYING.GPL"
12 11
12inherit allarch
13
13pkg_postinst_${PN} () { 14pkg_postinst_${PN} () {
14if [ "x$D" != "x" ]; then 15if [ "x$D" != "x" ]; then
15 exit 1 16 exit 1
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-18 23:21:30 +0000