summaryrefslogtreecommitdiff
path: root/packages/meta
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meta')
-rw-r--r--packages/meta/foonas-packages.bb4
-rw-r--r--packages/meta/meta-toolchain-openmoko.bb5
-rw-r--r--packages/meta/meta-toolchain.bb26
-rw-r--r--packages/meta/openprotium-packages.bb4
-rw-r--r--packages/meta/slugos-native-packages.bb4
-rw-r--r--packages/meta/slugos-native.bb7
-rw-r--r--packages/meta/slugos-packages.bb29
-rw-r--r--packages/meta/unslung-binary-kernel-packages.bb4
-rw-r--r--packages/meta/unslung-packages.bb4
9 files changed, 60 insertions, 27 deletions
diff --git a/packages/meta/foonas-packages.bb b/packages/meta/foonas-packages.bb
index edadb63a1c..2bd8437f13 100644
--- a/packages/meta/foonas-packages.bb
+++ b/packages/meta/foonas-packages.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Packages that are compatible with FooNAS"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
CONFLICTS = "db3"
PROVIDES += "${FOONAS_IMAGENAME}-packages"
@@ -8,6 +8,8 @@ EXCLUDE_FROM_WORLD = "1"
INHIBIT_DEFAULT_DEPS = "1"
ALLOW_EMPTY = "1"
+inherit meta
+
FOONAS_PACKAGES = "\
adns \
alsa-lib \
diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb
new file mode 100644
index 0000000000..4e29180d28
--- /dev/null
+++ b/packages/meta/meta-toolchain-openmoko.bb
@@ -0,0 +1,5 @@
+TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
+RDEPENDS = "${TOOLCHAIN_TARGET_TASK}"
+
+require meta-toolchain.bb
+
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index a734005819..58a5fb622b 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -100,6 +100,9 @@ do_populate_sdk() {
done
done
+ # add missing link to libgcc_s.so.1
+ # libgcc-dev should be responsible for that, but it's not getting built
+ ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so
# remove unwanted executables
rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
@@ -108,17 +111,20 @@ do_populate_sdk() {
rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
# fix pkgconfig data files
- cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
- for f in *.pc ; do
- sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
- done
- for f in *.pc ; do
- sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
- done
-
- mkdir -p ${SDK_DEPLOY}
+ if [ -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig ]; then
+ cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
+ for f in *.pc ; do
+ sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
+ done
+ for f in *.pc ; do
+ sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
+ done
+ fi
+
+ # package it up
+ mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-toolchain.tar.bz2 .
+ fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
}
do_populate_sdk[nostamp] = "1"
diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index 9a1d928a77..afff86639a 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "Packages that are compatible with the Openprotium on the iomega Storcenter"
HOMEPAGE = "http://www.openprotium.org"
LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
CONFLICTS = "db3"
PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages"
@@ -13,6 +13,8 @@ EXCLUDE_FROM_WORLD = "1"
INHIBIT_DEFAULT_DEPS = "1"
ALLOW_EMPTY = "1"
+inherit meta
+
# The list of packages to build for the slugos DISTRO.
# KEEP IN ALPHABETICAL ORDER
# Do *not* simply comment out a line. That will break. Instead
diff --git a/packages/meta/slugos-native-packages.bb b/packages/meta/slugos-native-packages.bb
index 4505c9979c..1e60e8c8af 100644
--- a/packages/meta/slugos-native-packages.bb
+++ b/packages/meta/slugos-native-packages.bb
@@ -1,13 +1,15 @@
# Only list packages which will not build 'cross' in here.
DESCRIPTION = "Packages that are to be compiled natively for the SlugOS firmware"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
INHIBIT_DEFAULT_DEPS = "1"
EXCLUDE_FROM_WORLD = "1"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
+inherit meta
+
SLUGOS_NATIVE_PACKAGES = "\
apache \
php-native \
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index 281310a2dd..9dae7e8df3 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,13 +5,18 @@
#
DESCRIPTION = "Packages that are required for the SlugOS native build environment"
LICENSE = "MIT"
-PR = "r5"
+PR = "r7"
INHIBIT_DEFAULT_DEPS = "1"
EXCLUDE_FROM_WORLD = "1"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
+inherit meta
+
+do_package_write_ipk() {
+}
+
# Run-time only (RDEPENDS) stuff - no package explicitly provides
# these targets.
SLUGOS_NATIVE_RT_prepend_linux = "\
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 6b34fc187a..7960be85eb 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r36"
+PR = "r40"
CONFLICTS = "db3"
COMPATIBLE_MACHINE = "nslu2"
@@ -49,6 +49,9 @@ SLUGOS_PACKAGES = "\
coreutils \
cron \
ctorrent \
+ ctrlproxy \
+ cups \
+ curl \
cvs \
cyrus-imapd \
cyrus-sasl \
@@ -79,6 +82,7 @@ SLUGOS_PACKAGES = "\
gdbm \
glib-2.0 \
gnu-config \
+ gphoto2 \
grep \
groff \
gspcav1 \
@@ -114,6 +118,7 @@ SLUGOS_PACKAGES = "\
libxml2 \
linphone \
litestream \
+ logrotate \
lrzsz \
lsof \
lvm2 \
@@ -144,7 +149,6 @@ SLUGOS_PACKAGES = "\
net-tools \
netcat \
netpbm \
- nfs-utils \
nmap \
ntfs-3g \
ntp \
@@ -173,6 +177,7 @@ SLUGOS_PACKAGES = "\
rng-tools \
rsync \
samba \
+ sane-backends \
screen \
sed \
setpwc \
@@ -186,7 +191,6 @@ SLUGOS_PACKAGES = "\
sudo \
sysfsutils \
tar \
- task-mokogateway-everything \
thttpd \
tiff \
timezones \
@@ -207,7 +211,9 @@ SLUGOS_PACKAGES = "\
wireless-tools \
wireshark \
wpa-supplicant \
- wview-sim wview-vpro wview-wxt510 \
+ wview-sim wview-sim-mysql \
+ wview-vpro wview-vpro-mysql \
+ wview-wxt510 wview-wxt510-mysql \
xinetd \
yeaphone \
yp-tools ypbind ypserv \
@@ -219,23 +225,19 @@ SLUGOS_PACKAGES = "\
# Packages currently broken on all platforms
SLUGOS_BROKEN_PACKAGES = "\
bwmon \
- ctrlproxy \
dsniff \
fetchmail \
- libgphoto2 gphoto2 sane-backends \\
lirc-modules lirc \
- logrotate \
madfu \
+ portmap nfs-utils \
openldap \
pvrusb2-mci \
pwc \
qc-usb-messenger \
syslog-ng \
+ openocd task-mokogateway-everything \
task-native-sdk \
- unionfs-modules \
- unionfs-utils \
- wview-sim-mysql wview-vpro-mysql \
- wview-wxt510-mysql \
+ unionfs-modules unionfs-utils \
zd1211 \
"
@@ -250,3 +252,8 @@ DEPENDS = "\
${SLUGOS_EXTRA_PACKAGES} \
package-index \
"
+
+inherit meta
+
+do_package_write_ipk() {
+}
diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb
index 30fb513627..eb95b847fd 100644
--- a/packages/meta/unslung-binary-kernel-packages.bb
+++ b/packages/meta/unslung-binary-kernel-packages.bb
@@ -1,11 +1,13 @@
DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
COMPATIBLE_MACHINE = "nslu2"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
+inherit meta
+
UNSLUNG_PACKAGES = "\
"
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 707787224e..ca194979e7 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,11 +1,13 @@
DESCRIPTION = "Packages that are compatible with the Unslung firmware"
LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
COMPATIBLE_MACHINE = "nslu2"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
+inherit meta
+
UNSLUNG_PACKAGES = "\
"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 20:42:07 +0000