diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-01-17 13:16:53 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-01-17 13:16:53 +0000 |
commit | d97abd932d4f40ddeed057702023e06bb35b3f93 (patch) | |
tree | 9e9608df030600d8bd7fcfc5c0d07f08a5d5d7fc /packages/meta | |
parent | 8c4f6b4c2f44cf59e3c44d99e5e2cf1295ef4579 (diff) | |
parent | 76ab1a69b0c0ff15a7a3a56e86185a344c934543 (diff) |
merge of '6fd18ecf067a5c1f73730a2278a171f906b7f7c5'
and 'f7f0ddcdaf7ca93df00d48a93db3f02c7baaba31'
Diffstat (limited to 'packages/meta')
-rw-r--r-- | packages/meta/meta-toolchain-gpe-sbox.bb | 1 | ||||
-rw-r--r-- | packages/meta/meta-toolchain-gpe.bb | 1 | ||||
-rw-r--r-- | packages/meta/meta-toolchain-openmoko.bb | 7 | ||||
-rw-r--r-- | packages/meta/meta-toolchain-sbox.bb | 2 | ||||
-rw-r--r-- | packages/meta/meta-toolchain.bb | 15 | ||||
-rw-r--r-- | packages/meta/openprotium-packages.bb | 20 | ||||
-rw-r--r-- | packages/meta/slugos-packages.bb | 17 |
7 files changed, 46 insertions, 17 deletions
diff --git a/packages/meta/meta-toolchain-gpe-sbox.bb b/packages/meta/meta-toolchain-gpe-sbox.bb index d32087b964..74ba03825f 100644 --- a/packages/meta/meta-toolchain-gpe-sbox.bb +++ b/packages/meta/meta-toolchain-gpe-sbox.bb @@ -9,3 +9,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb +SDK_SUFFIX = "toolchain-gpe-sbox"
\ No newline at end of file diff --git a/packages/meta/meta-toolchain-gpe.bb b/packages/meta/meta-toolchain-gpe.bb index f79ff31bb7..cad03d71a6 100644 --- a/packages/meta/meta-toolchain-gpe.bb +++ b/packages/meta/meta-toolchain-gpe.bb @@ -7,3 +7,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb +SDK_SUFFIX = "toolchain-gpe"
\ No newline at end of file diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb index 90eff20259..b7e5626f61 100644 --- a/packages/meta/meta-toolchain-openmoko.bb +++ b/packages/meta/meta-toolchain-openmoko.bb @@ -1,4 +1,7 @@ -TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk" +PR = "r1" -require meta-toolchain.bb +TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" +TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" +require meta-toolchain.bb +SDK_SUFFIX = "toolchain-openmoko" diff --git a/packages/meta/meta-toolchain-sbox.bb b/packages/meta/meta-toolchain-sbox.bb index 6e31fd0d69..1283c599c6 100644 --- a/packages/meta/meta-toolchain-sbox.bb +++ b/packages/meta/meta-toolchain-sbox.bb @@ -4,3 +4,5 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb +SDK_SUFFIX = "toolchain-sbox" + diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 91467e5140..923844ef8c 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -1,12 +1,14 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +PR = "r2" inherit sdk meta SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" SDK_DEPLOY = "${TMPDIR}/deploy/sdk" +SDK_SUFFIX = "toolchain" FEED_ARCH ?= "${TARGET_ARCH}" @@ -73,10 +75,17 @@ do_populate_sdk() { for arch in $revipkgarchs; do pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk if [ -e $pkgnames ]; then - echo "Found $pkgnames" + oenote "Found $pkgnames" cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/ orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` - pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + for aarch in $revipkgarchs; do + if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then + pkg_subdir="${aarch}${pkg_subdir_postfix}" + break + fi + done + oenote "Original package in ${pkg_subdir}" mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` @@ -120,7 +129,7 @@ do_populate_sdk() { # package it up mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT} - fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-toolchain.tar.bz2 . + fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}.tar.bz2 . } do_populate_sdk[nostamp] = "1" diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb index 3df2f5e3b2..7d66ee5d61 100644 --- a/packages/meta/openprotium-packages.bb +++ b/packages/meta/openprotium-packages.bb @@ -30,13 +30,14 @@ inherit meta # flac \ # gphoto2 \ # gdb \ -# glib-2.0 \ # lirc \ # masqmail \ # wakelan \ # wireless-tools \ # wpa-supplicant \ +# openldap \ # bluez-utils-nodbus \ +# lcdproc \ # libxml2 \ # libdvb \ # madwifi-ng \ @@ -53,7 +54,13 @@ inherit meta # samba \ # sane-backends \ # vsftpd \ +# syslog-ng \ # zd1211 \ +# cdparanoia \ +# litestream \ +# pvrusb2-mci \ +# pwc \ +# fetchmail \ OPENPROTIUM_PACKAGES = "\ alsa-lib \ @@ -70,7 +77,6 @@ OPENPROTIUM_PACKAGES = "\ bridge-utils \ bzip2 \ ccxstream \ - cdparanoia \ cdstatus \ coreutils \ cron \ @@ -85,7 +91,6 @@ OPENPROTIUM_PACKAGES = "\ e2fsprogs-libs \ expat \ ez-ipupdate \ - fetchmail \ file \ findutils \ flex \ @@ -94,6 +99,7 @@ OPENPROTIUM_PACKAGES = "\ gawk \ gcc \ gdbm \ + glib-2.0 \ gnu-config \ grep \ gtk-doc \ @@ -105,8 +111,6 @@ OPENPROTIUM_PACKAGES = "\ ircp \ joe \ jpeg \ - lcdproc \ - less \ libao \ libid3tag \ liblockfile \ @@ -119,7 +123,6 @@ OPENPROTIUM_PACKAGES = "\ libupnp \ libusb \ libvorbis \ - litestream \ lrzsz \ lsof \ lvm2 \ @@ -144,7 +147,6 @@ OPENPROTIUM_PACKAGES = "\ nmap \ ntp \ openobex-apps \ - openldap \ openntpd \ openobex \ openssh \ @@ -156,8 +158,6 @@ OPENPROTIUM_PACKAGES = "\ pkgconfig \ ppp \ procps \ - pvrusb2-mci \ - pwc \ quilt \ rng-tools \ rsync \ @@ -169,7 +169,6 @@ OPENPROTIUM_PACKAGES = "\ strace \ streamripper \ sysfsutils \ - syslog-ng \ tar \ thttpd \ tiff \ @@ -178,7 +177,6 @@ OPENPROTIUM_PACKAGES = "\ util-linux \ vim \ vlan \ - watchdog \ wget \ zip \ zlib \ diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 04e4425a3b..667b2b2e69 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -24,7 +24,18 @@ SLUGOS_PACKAGES = "\ apex-env \ apr \ asterisk \ - asterisk-sounds \ + asterisk-core-sounds-en-alaw \ + asterisk-core-sounds-en-g729 \ + asterisk-core-sounds-en-gsm \ + asterisk-core-sounds-en-ulaw \ + asterisk-extra-sounds-en-alaw \ + asterisk-extra-sounds-en-g729 \ + asterisk-extra-sounds-en-gsm \ + asterisk-extra-sounds-en-ulaw \ + asterisk-moh-freeplay-alaw \ + asterisk-moh-freeplay-g729 \ + asterisk-moh-freeplay-gsm \ + asterisk-moh-freeplay-ulaw \ atftp \ audiofile \ aumix \ @@ -137,6 +148,7 @@ SLUGOS_PACKAGES = "\ miau \ microcom \ minicom \ + monit \ motion \ mpd \ mt-daapd \ @@ -148,9 +160,11 @@ SLUGOS_PACKAGES = "\ ncftp \ ncurses \ net-tools \ + netatalk \ netcat \ netpbm \ nfs-utils \ + ngrep \ nmap \ ntfs-3g \ ntp \ @@ -198,6 +212,7 @@ SLUGOS_PACKAGES = "\ thttpd \ tiff \ tzdata \ + unrar \ unzip \ upslug2 \ usbutils \ |