diff options
Diffstat (limited to 'packages')
70 files changed, 206 insertions, 468 deletions
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index 43c25eb1ba..d829590188 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -1,13 +1,9 @@ #Angstrom bootmanager image -LICENSE = "MIT" -PR = "r0" DEPENDS = "task-angstrom" -RDEPENDS = "angstrom-base-depends angstrom-bootmanager" +IMAGE_INSTALL = "angstrom-base-depends angstrom-bootmanager" export IMAGE_BASENAME = "bootmanager-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" inherit image diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb index b662109a3c..1684716187 100644 --- a/packages/angstrom/angstrom-console-image.bb +++ b/packages/angstrom/angstrom-console-image.bb @@ -1,6 +1,4 @@ #Angstrom bootstrap image -LICENSE = "MIT" -PR = "r8" ANGSTROM_EXTRA_INSTALL ?= "" @@ -8,14 +6,13 @@ DEPENDS = "task-base-extended \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ " -RDEPENDS = "task-base-extended \ +IMAGE_INSTALL = "task-base-extended \ ${ANGSTROM_EXTRA_INSTALL} \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ " export IMAGE_BASENAME = "console-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/angstrom/angstrom-gateway-image.bb b/packages/angstrom/angstrom-gateway-image.bb index aeca221d3d..ee9d1d97fc 100644 --- a/packages/angstrom/angstrom-gateway-image.bb +++ b/packages/angstrom/angstrom-gateway-image.bb @@ -1,12 +1,10 @@ #Angstrom gateway image #gives you a gateway with SMB, ssh and dnsmasqs -LICENSE = "MIT" -PR = "r0" ANGSTROM_EXTRA_INSTALL ?= "" DISTRO_SSH_DAEMON ?= "dropbear" -RDEPENDS = "task-boot \ +IMAGE_INSTALL = "task-boot \ ${DISTRO_SSH_DAEMON} \ iptables \ samba swat \ @@ -16,8 +14,7 @@ RDEPENDS = "task-boot \ " export IMAGE_BASENAME = "gateway-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb index 624274de37..a8c59f2075 100644 --- a/packages/angstrom/angstrom-mokogateway-image.bb +++ b/packages/angstrom/angstrom-mokogateway-image.bb @@ -1,20 +1,17 @@ #Angstrom moko gateway image # tries to be a companion for openmoko based phones -LICENSE = "MIT" -PR = "r2" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = " \ +IMAGE_INSTALL = " \ task-boot \ task-base-bluetooth \ bluez-utils \ blueprobe \ " export IMAGE_BASENAME = "mokogateway-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/angstrom/angstrom-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb index 6d9e7b296c..59ef3b95ba 100644 --- a/packages/angstrom/angstrom-x11-gpe-image.bb +++ b/packages/angstrom/angstrom-x11-gpe-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image, with apps and kernel modules included -LICENSE = "MIT" -PR = "r0" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-gpe-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -28,8 +26,6 @@ RDEPENDS = "\ ${ANGSTROM_EXTRA_INSTALL}" -export PACKAGE_INSTALL = "${RDEPENDS}" - #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index 83f00cce66..4446c52a8d 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image -LICENSE = "MIT" -PR = "r11" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -24,9 +22,6 @@ RDEPENDS = "\ angstrom-gpe-task-settings \ ${ANGSTROM_EXTRA_INSTALL}" - -export PACKAGE_INSTALL = "${RDEPENDS}" - #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' diff --git a/packages/angstrom/angstrom-x11-office-image.bb b/packages/angstrom/angstrom-x11-office-image.bb index 8cb6e7a839..e2c6167604 100644 --- a/packages/angstrom/angstrom-x11-office-image.bb +++ b/packages/angstrom/angstrom-x11-office-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image, with apps and kernel modules included -LICENSE = "MIT" -PR = "r1" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-office-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -32,9 +30,6 @@ RDEPENDS = "\ gphoto2 \ ${ANGSTROM_EXTRA_INSTALL}" - -export PACKAGE_INSTALL = "${RDEPENDS}" - #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' diff --git a/packages/angstrom/angstrom-x11-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb index 0f6782e007..1b40227347 100644 --- a/packages/angstrom/angstrom-x11-pimlico-image.bb +++ b/packages/angstrom/angstrom-x11-pimlico-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image, with apps and kernel modules included -LICENSE = "MIT" -PR = "r0" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-pimlico-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -28,8 +26,6 @@ RDEPENDS = "\ ${ANGSTROM_EXTRA_INSTALL}" -export PACKAGE_INSTALL = "${RDEPENDS}" - #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' diff --git a/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb index 7d3bb6c09c..a045d9bc9c 100644 --- a/packages/binutils/binutils-cross-sdk_2.17.50.0.5.bb +++ b/packages/binutils/binutils-cross-sdk_2.17.50.0.12.bb @@ -3,8 +3,9 @@ require binutils_${PV}.bb inherit sdk DEPENDS += "flex-native bison-native" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" -EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ +EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \ --program-prefix=${TARGET_PREFIX}" +PR = "r2" do_stage() { : diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb index e6907deb1b..a8e9a67a96 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" require gcc_${PV}.bb -PR = "r0" +PR = "r1" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb index 7233f79504..2308f2f9eb 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.0.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" require gcc_${PV}.bb -PR = "r0" +PR = "r1" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb index e3050d3926..51470c7214 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.1.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -PR = "r0" +PR = "r1" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.1.2.bb b/packages/gcc/gcc-cross-sdk_4.1.2.bb index 5bfb454452..238f5c2fd0 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,38 +1,13 @@ -PR = "r3" +PR = "r4" inherit sdk FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" -DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" -PACKAGES = "${PN}" +DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" require gcc_${PV}.bb require gcc4-build-sdk.inc require gcc-package-sdk.inc -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2 \ - file://100-uclibc-conf.patch;patch=1 \ - file://110-arm-eabi.patch;patch=1 \ - file://200-uclibc-locale.patch;patch=1 \ - file://300-libstdc++-pic.patch;patch=1 \ - file://301-missing-execinfo_h.patch;patch=1 \ - file://302-c99-snprintf.patch;patch=1 \ - file://303-c99-complex-ugly-hack.patch;patch=1 \ - file://304-index_macro.patch;patch=1 \ - file://602-sdk-libstdc++-includes.patch;patch=1 \ - file://740-sh-pr24836.patch;patch=1 \ - file://800-arm-bigendian.patch;patch=1 \ - file://arm-nolibfloat.patch;patch=1 \ - file://arm-softfloat.patch;patch=1 \ - file://gcc41-configure.in.patch;patch=1 \ - file://arm-thumb.patch;patch=1 \ - file://arm-thumb-cache.patch;patch=1 \ - file://ldflags.patch;patch=1 \ - file://unbreak-armv4t.patch;patch=1 \ - file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ - " - -SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " - - +EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc index 1e5f2aaa5d..a910a8dc4d 100644 --- a/packages/gcc/gcc-package-sdk.inc +++ b/packages/gcc/gcc-package-sdk.inc @@ -6,7 +6,6 @@ HAS_GFORTRAN ?= "no" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" - python do_package() { if bb.data.getVar('DEBIAN_NAMES', d, 1): bb.data.setVar('PKG_libgcc', 'libgcc1', d) @@ -16,32 +15,24 @@ python do_package() { do_install () { oe_runmake 'DESTDIR=${D}' install - # Move libgcc_s into /lib - mkdir -p ${D}${base_libdir} - if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then - # Already in the right location - : - elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then - mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} - else - mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} + # Manually run the target stripper since we won't get it run by + # the packaging. + if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then + ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libstdc++.so.* + ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libg2c.so.* || true + ${TARGET_PREFIX}strip ${D}${prefix}/${TARGET_SYS}/lib/libgcc_s.so.* fi +} - # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr - mkdir -p ${D}${libdir} - mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${libdir} - if [ "${HAS_G2C}" = "yes" ]; then - mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${libdir} - fi - if [ "${HAS_GFORTRAN}" = "yes" ]; then - mv -f ${D}${prefix}/*/lib/libgfortran*.so.* ${D}${libdir} - fi +FILES_libgcc = "${prefix}/${TARGET_SYS}/lib/libgcc*.so.*" +FILES_libgcc-dev = "${prefix}/${TARGET_SYS}/lib/libgcc*.so" - # Manually run the target stripper since we won't get it run by - # the packaging. - if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then - ${TARGET_PREFIX}strip ${D}${libdir}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}${libdir}/libg2c.so.* || true - ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* - fi -} +FILES_libstdc++ = "${prefix}/${TARGET_SYS}/lib/libstdc++.so.*" +FILES_libstdc++-dev = "${includedir}/c++/${BINV} \ + ${prefix}/${TARGET_SYS}/lib/libstdc++.so \ + ${prefix}/${TARGET_SYS}/lib/libstdc++.a \ + ${prefix}/${TARGET_SYS}/lib/libsupc++.a" + +FILES_libmudflap = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so.*" +FILES_libmudflap-dev = "${prefix}/${TARGET_SYS}/lib/libmudflap*.so \ + ${prefix}/${TARGET_SYS}/lib/libmudflap*.a" diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc index b75e8a57c9..77d326b3ee 100644 --- a/packages/gcc/gcc4-build-sdk.inc +++ b/packages/gcc/gcc4-build-sdk.inc @@ -1,19 +1,17 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' - -STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" -STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib" +SYSROOT = "${WORKDIR}/sysroot" +EXTRA_OECONF += "--with-sysroot=${SYSROOT}" do_configure () { + # Work around Hardcoded path assumptions in gcc + mkdir -p ${SYSROOT}/usr/ + ln -s ${STAGING_DIR}/${TARGET_SYS}/include ${SYSROOT}/usr/include + ln -s ${STAGING_DIR}/${TARGET_SYS}/lib ${SYSROOT}/usr/lib (cd ${S} && gnu-configize) || die "failure running gnu-configize" (cd ${S}/libstdc++-v3 && autoreconf) oe_runconf - mkdir -p gcc - ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}as gcc/as - ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}ld gcc/ld - ln -sf ${STAGING_TARGET_INCDIR}/* ${S}/include - ln -sf ${STAGING_TARGET_LIBDIR}/crt*.o gcc/ } do_compile () { @@ -23,5 +21,5 @@ do_compile () { export LD_FOR_TARGET="${TARGET_SYS}-ld" export NM_FOR_TARGET="${TARGET_SYS}-nm" export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}" - oe_runmake CFLAGS_FOR_TARGET="-I${STAGING_TARGET_INCDIR}" + oe_runmake } diff --git a/packages/gdb/files/sim-install-6.6.patch b/packages/gdb/files/sim-install-6.6.patch new file mode 100644 index 0000000000..a39ceab01f --- /dev/null +++ b/packages/gdb/files/sim-install-6.6.patch @@ -0,0 +1,12 @@ +--- gdb-6.1/sim/common/Makefile.in~ 2004-01-15 21:25:06.000000000 +0000 ++++ gdb-6.1/sim/common/Makefile.in 2004-07-22 17:07:46.237809032 +0100 +@@ -34,7 +34,7 @@ + + datadir = @datadir@ + mandir = @mandir@ +-man1dir = $(mandir)/man1 ++man1dir = $(DESTDIR)$(mandir)/man1 + infodir = @infodir@ + includedir = @includedir@ + + diff --git a/packages/gdb/gdb-common.inc b/packages/gdb/gdb-common.inc new file mode 100644 index 0000000000..0c236925dc --- /dev/null +++ b/packages/gdb/gdb-common.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "gdb - GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +LICENSE="GPL" +SECTION = "devel" +PRIORITY = "optional" + +inherit autotools + +SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" + +export CC_FOR_BUILD = "${BUILD_CC}" +export CXX_FOR_BUILD = "${BUILD_CXX}" +export CPP_FOR_BUILD = "${BUILD_CPP}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" + +S = "${WORKDIR}/gdb-${PV}" +B = "${WORKDIR}/build-${TARGET_SYS}" + diff --git a/packages/gdb/gdb-cross-sdk_6.6.bb b/packages/gdb/gdb-cross-sdk_6.6.bb new file mode 100644 index 0000000000..b96348959f --- /dev/null +++ b/packages/gdb/gdb-cross-sdk_6.6.bb @@ -0,0 +1,7 @@ +require gdb-cross.inc + +inherit sdk + +do_stage() { + : +} diff --git a/packages/gdb/gdb-cross.inc b/packages/gdb/gdb-cross.inc index 33ca380464..480cce4931 100644 --- a/packages/gdb/gdb-cross.inc +++ b/packages/gdb/gdb-cross.inc @@ -1,25 +1,18 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "ncurses-native" - -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" - -S = "${WORKDIR}/gdb-${PV}" - -inherit autotools sdk +require gdb-common.inc -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" - -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" +DEPENDS = "ncurses-native" EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils' LDFLAGS='${BUILD_LDFLAGS}'" EXTRA_OECONF = "--with-curses --with-readline" + +do_configure () { +# override this function to avoid the autoconf/automake/aclocal/autoheader +# calls for now + (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + oe_runconf +} + +do_stage () { + oe_runmake install +} diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 5419872bc9..5b27e09959 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -1,19 +1,8 @@ require gdb-cross.inc -PR = "r1" +inherit cross + +PR = "r3" SRC_URI += "file://sim-install-makefile.patch;patch=1 \ file://sim-install-makefile-common.patch;patch=1" - -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - gnu-configize - oe_runconf -} - -do_stage() { - oe_runmake 'DESTDIR=${CROSS_DIR}' install - cp -pPR ${CROSS_DIR}${prefix}/* ${CROSS_DIR} - rm -rf ${CROSS_DIR}${prefix} -} diff --git a/packages/gdb/gdb-cross_6.4.bb b/packages/gdb/gdb-cross_6.4.bb index 2f93e6b28e..e4946b0fe1 100644 --- a/packages/gdb/gdb-cross_6.4.bb +++ b/packages/gdb/gdb-cross_6.4.bb @@ -1,14 +1,5 @@ require gdb-cross.inc -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - gnu-configize - oe_runconf -} +inherit cross -do_stage() { - oe_runmake 'DESTDIR=${CROSS_DIR}' install - cp -pPR ${CROSS_DIR}${prefix}/* ${CROSS_DIR} - rm -rf ${CROSS_DIR}${prefix} -} +PR = "r1"
\ No newline at end of file diff --git a/packages/gdb/gdb-cross_6.6.bb b/packages/gdb/gdb-cross_6.6.bb index f32ee32a5d..c6992e4b6a 100644 --- a/packages/gdb/gdb-cross_6.6.bb +++ b/packages/gdb/gdb-cross_6.6.bb @@ -1,16 +1,7 @@ require gdb-cross.inc -PR = "r1" +SRC_URI += "file://sim-install-6.6.patch;patch=1" -SRC_URI += "file://sim-install-makefile.patch;patch=1" +inherit cross -do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now - gnu-configize - oe_runconf -} - -do_stage() { - : -} +PR = "r1"
\ No newline at end of file diff --git a/packages/gdb/gdb.inc b/packages/gdb/gdb.inc index 7eeda45081..d3b9d864e7 100644 --- a/packages/gdb/gdb.inc +++ b/packages/gdb/gdb.inc @@ -1,41 +1,31 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb-common.inc DEPENDS = "ncurses readline" -PACKAGES =+ 'gdbserver ' -FILES_gdbserver = '${bindir}/gdbserver' +PACKAGES =+ "gdbserver" +FILES_gdbserver = "${bindir}/gdbserver" -inherit autotools gettext +RRECOMMENDS_gdb_append_linux = " glibc-thread-db " +RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " -SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.bz2 \ +inherit gettext + +SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \ + file://gdbserver-cflags-last.diff;patch=1;pnum=0" #FIXME file://uclibc.patch;patch=1 \ - file://kill_arm_map_symbols.patch;patch=1 \ - file://gdbserver-cflags-last.diff;patch=1;pnum=0" -LDFLAGS_append = " -s" -export CC_FOR_BUILD = "${BUILD_CC}" -export CXX_FOR_BUILD = "${BUILD_CXX}" -export CPP_FOR_BUILD = "${BUILD_CPP}" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CXXFLAGS_FOR_BUILD = "${BUILD_CXXFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" -export CFLAGS_append=" -L${STAGING_LIBDIR}" EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'" EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ --with-curses --disable-multilib --with-readline --disable-sim \ --program-prefix=''" -S = "${WORKDIR}/gdb-${PV}" -B = "${WORKDIR}/build-${TARGET_SYS}" +LDFLAGS_append = " -s" +export CFLAGS_append=" -L${STAGING_LIBDIR}" do_configure () { -# override this function to avoid the autoconf/automake/aclocal/autoheader -# calls for now + # override this function to avoid the autoconf/automake/aclocal/autoheader + # calls for now (cd ${S} && gnu-configize) || die "failure in running gnu-configize" CPPFLAGS="" oe_runconf } @@ -46,3 +36,5 @@ do_install () { install -d ${D}${bindir} install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir} } + + diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb index e5b055299a..a558775ff4 100644 --- a/packages/gdb/gdb_6.3.bb +++ b/packages/gdb/gdb_6.3.bb @@ -1,4 +1,3 @@ require gdb.inc -RDEPENDS_openmn = "libthread-db1" -PR = "r2" +PR = "r3" diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb index e5d2b2af60..de6bcf34ba 100644 --- a/packages/gdb/gdb_6.4.bb +++ b/packages/gdb/gdb_6.4.bb @@ -1,3 +1,3 @@ require gdb.inc -RDEPENDS_openmn = "libthread-db1" +PR = "r1"
\ No newline at end of file diff --git a/packages/gdb/gdb_6.6.bb b/packages/gdb/gdb_6.6.bb index 3650b927da..a558775ff4 100644 --- a/packages/gdb/gdb_6.6.bb +++ b/packages/gdb/gdb_6.6.bb @@ -1,7 +1,3 @@ require gdb.inc -PR = "r2" - -#only append it for glib, not for uclibc -RRECOMMENDS_gdb_append_linux = " glibc-thread-db " -RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db " +PR = "r3" diff --git a/packages/images/angstrom-minimal-image.bb b/packages/images/angstrom-minimal-image.bb index e10954838c..4b3a4cd835 100644 --- a/packages/images/angstrom-minimal-image.bb +++ b/packages/images/angstrom-minimal-image.bb @@ -1,21 +1,17 @@ #Angstrom minimalist image #gives you a small images with ssh access -LICENSE = "MIT" -PR = "r3" ANGSTROM_EXTRA_INSTALL ?= "" DISTRO_SSH_DAEMON ?= "dropbear" -IMAGE_LINGUAS = " " -RDEPENDS = "task-boot \ +IMAGE_INSTALL = "task-boot \ util-linux-mount util-linux-umount \ ${DISTRO_SSH_DAEMON} \ angstrom-version \ " export IMAGE_BASENAME = "minimalist-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb index dea254eaa5..fafd734229 100644 --- a/packages/images/bootstrap-image-bootchart.bb +++ b/packages/images/bootstrap-image-bootchart.bb @@ -1,10 +1,7 @@ -export IMAGE_BASENAME = "bootstrap-image-bootchart" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" - DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart" -RDEPENDS = "acct" + +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" inherit image -LICENSE = "MIT" diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb index f25ad222aa..64577c4048 100644 --- a/packages/images/bootstrap-image.bb +++ b/packages/images/bootstrap-image.bb @@ -1,9 +1,7 @@ -export IMAGE_BASENAME = "bootstrap-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER}" - DEPENDS = "${MACHINE_TASK_PROVIDER}" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER}" + inherit image -LICENSE = "MIT" diff --git a/packages/images/devimage-image.bb b/packages/images/devimage-image.bb index e8177433be..6a3e60c5e3 100644 --- a/packages/images/devimage-image.bb +++ b/packages/images/devimage-image.bb @@ -2,19 +2,15 @@ # It includes all useful "kernel userspace" utilities, but # only shell and dropbear are loaded by default. # Allows to login via serial and real console or SSH -LICENSE = "MIT" -PR = "r2.2" DEVIMAGE_EXTRA_RDEPENDS ?= "" -RDEPENDS = "devimage busybox dropbear udev \ +IMAGE_INSTALL = "devimage busybox dropbear udev \ module-init-tools pcmciautils \ wireless-tools wpa-supplicant \ irda-utils acx-firmware \ ${DEVIMAGE_EXTRA_RDEPENDS}" export IMAGE_BASENAME = "devimage" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb index c4636b12aa..687c3093fa 100644 --- a/packages/images/dvb-image.bb +++ b/packages/images/dvb-image.bb @@ -1,11 +1,7 @@ -export IMAGE_BASENAME = "dvb-image" - -IMAGE_LINGUAS = "" - +DEPENDS = "${DVB_PACKAGES}" DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb" -export PACKAGE_INSTALL = "${DVB_PACKAGES}" -DEPENDS = "${DVB_PACKAGES}" +IMAGE_INSTALL = "${DVB_PACKAGES}" +IMAGE_LINGUAS = "" inherit image -LICENSE = "MIT" diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb index c713437361..3ee3932c1e 100644 --- a/packages/images/e-image-core.bb +++ b/packages/images/e-image-core.bb @@ -1,9 +1,4 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager" -LICENSE = "MIT" -PR = "r1" - -export IMAGE_BASENAME = "e-image-core" -export IMAGE_LINGUAS = "" DEPENDS = "${MACHINE_TASK_PROVIDER} \ xserver-kdrive \ @@ -16,6 +11,7 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" PREFERRED_PROVIDER_libx11 = "libx11" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb index acd45cd5ae..600b01d37b 100644 --- a/packages/images/e-image.bb +++ b/packages/images/e-image.bb @@ -1,9 +1,10 @@ require e-image-core.bb DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -PR = "r6" -export IMAGE_BASENAME = "e-image" -export PACKAGE_INSTALL += "task-e-x11-core \ +DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gpe-apps task-gpe-connectivity task-gpe-games \ + figment xhost gpe-soundserver gpe-confd xauth" + +IMAGE_INSTALL += "task-e-x11-core \ ask-gpe-pim \ task-gpe-settings \ task-gpe-apps \ @@ -23,8 +24,3 @@ export PACKAGE_INSTALL += "task-e-x11-core \ gdk-pixbuf-loader-pnm \ gdk-pixbuf-loader-xbm \ gdk-pixbuf-loader-xpm" - -DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gpe-apps task-gpe-connectivity task-gpe-games \ - figment xhost gpe-soundserver gpe-confd xauth" - -RDEPENDS = "${PACKAGE_INSTALL}" diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb index 21078790b7..8b566af6ec 100644 --- a/packages/images/essential-image.bb +++ b/packages/images/essential-image.bb @@ -5,24 +5,11 @@ # Filename: essential-image.bb # Date: 23-Apr-06 -DESCRIPTION = "<description>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -###################################################################################### - -PV = "0.0.1" -PR = "r0" - -###################################################################################### - -inherit image - -###################################################################################### - DEPENDS = "task-essential-to-boot" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "task-essential-to-boot" -###################################################################################### +inherit image -export IMAGE_BASENAME = "essential-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "task-essential-to-boot" diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb index f82f1833dc..b74dec5e35 100644 --- a/packages/images/essential-machine-image.bb +++ b/packages/images/essential-machine-image.bb @@ -8,29 +8,16 @@ DESCRIPTION = "<description>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -###################################################################################### - -PV = "0.0.1" -PR = "r0" - -###################################################################################### - -inherit image - -###################################################################################### - DEPENDS = "task-essential-to-boot task-essential-parts" -###################################################################################### - MACHINE_TASKS_akita = "task-essential-to-boot \ task-essential-pcmcia task-essential-userspace \ task-essential-usbhost task-essential-usbclient \ task-essential-sound task-essential-irda \ task-essential-sd" -###################################################################################### - +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASKS}" export IMAGE_BASENAME = "essential-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASKS}" + +inherit image
\ No newline at end of file diff --git a/packages/images/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb index d092d3c44a..d9ed7fcedb 100644 --- a/packages/images/gpe-image-blank-user.bb +++ b/packages/images/gpe-image-blank-user.bb @@ -1,8 +1,3 @@ require gpe-image.bb - -PR = "r5" - -export IMAGE_BASENAME = "gpe-image-blank-user" - ROOTFS_POSTPROCESS_COMMAND += "adduser -D user" diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb index aa851cf68f..8cbe8a8571 100644 --- a/packages/images/gpe-image.bb +++ b/packages/images/gpe-image.bb @@ -1,8 +1,3 @@ - -PR = "r22" - -export IMAGE_BASENAME = "gpe-image" - GPE_EXTRA_THEMES = "gpe-theme-industrial" GPE_EXTRA_INSTALL_none = "" @@ -31,9 +26,7 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \ task-gpe-games \ virtual/xserver" -RDEPENDS = "${PACKAGE_INSTALL}" - -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ task-gpe-base \ task-gpe-pim \ @@ -45,4 +38,3 @@ export PACKAGE_INSTALL = "\ #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image -LICENSE = "MIT" diff --git a/packages/images/gpephone-image-vm.bb b/packages/images/gpephone-image-vm.bb index a058361f27..1a9d48d22a 100644 --- a/packages/images/gpephone-image-vm.bb +++ b/packages/images/gpephone-image-vm.bb @@ -1,7 +1,3 @@ -PR = "r0" - -export IMAGE_BASENAME = "gpephone-image-vm" - GPE_EXTRA_THEMES = "" GPE_EXTRA_INSTALL_none = "" @@ -21,9 +17,8 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" -RDEPENDS = "${PACKAGE_INSTALL}" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpephone-task-base \ gpephone-task-pim \ @@ -37,6 +32,3 @@ export PACKAGE_INSTALL = "\ inherit image ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; " - - -LICENSE = "MIT" diff --git a/packages/images/gpephone-image.bb b/packages/images/gpephone-image.bb index 21496cae55..bfe9238e3e 100644 --- a/packages/images/gpephone-image.bb +++ b/packages/images/gpephone-image.bb @@ -1,7 +1,3 @@ -PR = "r1" - -export IMAGE_BASENAME = "gpephone-image" - GPE_EXTRA_THEMES = "" GPE_EXTRA_INSTALL_none = "" @@ -21,9 +17,8 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone virtual/xserver" -RDEPENDS = "${PACKAGE_INSTALL}" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpephone-task-base \ gpephone-task-pim \ diff --git a/packages/images/helloworld-image.bb b/packages/images/helloworld-image.bb index a1caf54cc5..cebfc33acd 100644 --- a/packages/images/helloworld-image.bb +++ b/packages/images/helloworld-image.bb @@ -1,13 +1,7 @@ # Hello world image # Contains *only* a statically linked hello world init program -LICENSE = "MIT" -PR = "r0" -RDEPENDS = "helloworld" - -export IMAGE_BASENAME = "helloworld-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = ${RDEPENDS} +IMAGE_INSTALL = "helloworld" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/initramfs-image.bb b/packages/images/initramfs-image.bb index 95e3f84082..3103b9f765 100644 --- a/packages/images/initramfs-image.bb +++ b/packages/images/initramfs-image.bb @@ -1,13 +1,7 @@ # Sample initramfs image -LICENSE = "MIT" -PR = "r2" -RDEPENDS = "initramfs-module-block initramfs-module-loop initramfs-module-nfs" - -export IMAGE_BASENAME = "initramfs-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_INSTALL = "initramfs-module-block initramfs-module-loop initramfs-module-nfs" +IMAGE_LINGUAS = "" # Remove any kernel-image that the kernel-module-* packages may have pulled in. PACKAGE_REMOVE = "kernel-image-* update-modules" diff --git a/packages/images/initramfs-minimal-image.bb b/packages/images/initramfs-minimal-image.bb index 1b60405e74..1aa928b2a9 100644 --- a/packages/images/initramfs-minimal-image.bb +++ b/packages/images/initramfs-minimal-image.bb @@ -1,15 +1,12 @@ # Sample initramfs image -LICENSE = "MIT" -PR = "r0" -#RDEPENDS = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" -RDEPENDS = "initramfs-nfsboot busybox-static kernel-module-uinput" +#IMAGE_INSTALL = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" +IMAGE_INSTALL = "initramfs-nfsboot busybox-static kernel-module-uinput" export IMAGE_BASENAME = "initramfs-image" -export IMAGE_LINGUAS = "" +IMAGE_LINGUAS = "" -PACKAGE_INSTALL = "${RDEPENDS}" -# Install only ${PACKAGE_INSTALL}, not even deps +# Install only ${IMAGE_INSTALL}, not even deps PACKAGE_INSTALL_NO_DEPS = "1" inherit image diff --git a/packages/images/jlime-opie.bb b/packages/images/jlime-opie.bb index a6f8b7989a..7d98f98a32 100644 --- a/packages/images/jlime-opie.bb +++ b/packages/images/jlime-opie.bb @@ -1,15 +1,10 @@ -export IMAGE_BASENAME = "jlime-opie" -export IMAGE_LINGUAS = "" - -LICENSE = "MIT" -PR = "r21" +IMAGE_LINGUAS = "" DEPENDS = "task-bootstrap task-opie" -RDEPENDS = "${INSTALL_PACKAGES}" -extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles konqueror-embedded",d)}' +extra_stuff = '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles konqueror-embedded",d)}' -INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \ +IMAGE_INSTALL = "task-bootstrap task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ @@ -17,8 +12,6 @@ INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \ task-opie-bluetooth task-opie-irda \ ${extra_stuff}" -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" - # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb index f8f5cb5c9d..c0498bb910 100644 --- a/packages/images/maemo-image.bb +++ b/packages/images/maemo-image.bb @@ -2,10 +2,6 @@ # Meta package for maemo based system image # -PR = "r2" - -export IMAGE_BASENAME = "maemo-image" - GUI_MACHINE_CLASS ?= "none" MAEMO_EXTRA_DEPENDS = "scap dosfstools" @@ -17,9 +13,8 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \ meta-maemo \ ${MAEMO_EXTRA_DEPENDS}" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ maemo-task-apps ${MAEMO_EXTRA_INSTALL} \ ${XSERVER}" inherit image -LICENSE = "MIT" diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb index 49e6b5ae2b..8ba6779fdc 100644 --- a/packages/images/mythfront-image.bb +++ b/packages/images/mythfront-image.bb @@ -1,13 +1,10 @@ -export IMAGE_BASENAME = "mythfront-image" - IMAGE_ROOTFS_SIZE_ext2 = "85000" IMAGE_ROOTFS_SIZE_ext2.gz = "85000" IMAGE_LINGUAS = "" MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront" -export PACKAGE_INSTALL = "${MYTHFRONT_PACKAGES}" DEPENDS = "${MYTHFRONT_PACKAGES}" +IMAGE_INSTALL = "${MYTHFRONT_PACKAGES}" inherit image -LICENSE = "MIT" diff --git a/packages/images/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb index 7cfad432a3..312d3b144e 100644 --- a/packages/images/nslu2-linksys-image.bb +++ b/packages/images/nslu2-linksys-image.bb @@ -1,14 +1,11 @@ IMAGE_LINGUAS = "" USE_DEVFS = "1" -IMAGE_BASENAME = "nslu2-linksys" - -PACKAGE_INSTALL = "nslu2-linksys-ramdisk" - -DEPENDS = "nslu2-linksys-kernel ${PACKAGE_INSTALL}" +DEPENDS = "nslu2-linksys-kernel" +export IMAGE_BASENAME = "nslu2-linksys" +IMAGE_INSTALL = "nslu2-linksys-ramdisk" NSLU2_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-nslu2.txt')}" EXTRA_IMAGECMD_ext2.gz = "-f ${NSLU2_DEVICE_TABLE}" inherit image -LICENSE = "MIT" diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index 8cd71194b4..b4913097be 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -1,6 +1,5 @@ inherit image inherit nylon-image -LICENSE = "MIT" export IMAGE_BASENAME = "nylon-base" @@ -12,7 +11,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \ timezones tinylogin udev" DEPENDS += "virtual/kernel less nano" -RDEPENDS = "kernel less nano elvis-tiny \ +IMAGE_INSTALL = "kernel less nano elvis-tiny \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" ## kernel 2.4 ## @@ -22,11 +21,8 @@ RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils RDEPENDS_append_mtx-3 = " module-init-tools udev" RDEPENDS_append_mtx-3a = " module-init-tools" -export PACKAGE_INSTALL = "${RDEPENDS}" - IMAGE_LINGUAS = "" # we dont need the kernel in the image ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/*Image*" # needed?? the above line is the same as in classes/nylon-image.bbclass - diff --git a/packages/images/nylon-image-extended.bb b/packages/images/nylon-image-extended.bb index 9b92dfdbb7..7a4e5b6c88 100644 --- a/packages/images/nylon-image-extended.bb +++ b/packages/images/nylon-image-extended.bb @@ -75,10 +75,10 @@ KERNEL_MODULES = " \ DEPENDS += "${NYLON_EXTENDED_DEPENDS}" -RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} \ +IMAGE_INSTALL += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} \ ${NYLON_EXTENDED_RDEPENDS} elvis-tools" -RDEPENDS_append_mtx-1 = "\ +IMAGE_INSTALL_append_mtx-1 = "\ kernel-module-au1x00-bi \ kernel-module-network-fd \ kernel-module-usbdcore" diff --git a/packages/images/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb index a07ae82ab0..e943a98fc0 100644 --- a/packages/images/nylon-image-extra.bb +++ b/packages/images/nylon-image-extra.bb @@ -2,7 +2,7 @@ require nylon-image-standard.bb export IMAGE_BASENAME = "nylon-extra" -RDEPENDS = "\ +IMAGE_INSTALL = "\ kismet \ netperf \ nylon-statistics \ diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb index c0ed998449..f011cb171c 100644 --- a/packages/images/nylon-image-mini.bb +++ b/packages/images/nylon-image-mini.bb @@ -1,7 +1,6 @@ export IMAGE_BASENAME = "nylon-mini" inherit image -LICENSE = "MIT" NYLON_BASE = "base-files base-passwd busybox \ dropbear \ @@ -11,9 +10,5 @@ NYLON_BASE = "base-files base-passwd busybox \ netbase \ wireless-tools" -RDEPENDS += "kernel \ - ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" - -export PACKAGE_INSTALL = "${RDEPENDS}" - +IMAGE_INSTALL += "kernel ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index ca5f987dfe..5f79402c99 100644 --- a/packages/images/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb @@ -16,5 +16,5 @@ NYLON_STANDARD = "\ DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" -RDEPENDS += "hostap-modules-pci ntpdate less nano elvis-tiny \ +IMAGE_INSTALL += "hostap-modules-pci ntpdate less nano elvis-tiny \ ${NYLON_STANDARD}" diff --git a/packages/images/openmoko-devel-image.bb b/packages/images/openmoko-devel-image.bb index 9c72533f8d..4aec237977 100644 --- a/packages/images/openmoko-devel-image.bb +++ b/packages/images/openmoko-devel-image.bb @@ -1,5 +1,3 @@ require openmoko-image.bb -export PACKAGE_INSTALL += "\ - task-openmoko-debug \ -" +IMAGE_INSTALL += "task-openmoko-debug"
\ No newline at end of file diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 0dfd2166f0..1e8b36318c 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -2,10 +2,9 @@ # OpenMoko Image Recipe #------------------------------------------------------ -export IMAGE_BASENAME = "${PN}" -export IMAGE_LINGUAS = "" +IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ task-openmoko-linux \ task-openmoko-net \ @@ -21,10 +20,7 @@ DEPENDS = "\ task-openmoko \ " -RDEPENDS = "${PACKAGE_INSTALL}" inherit image -LICENSE = MIT - ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' diff --git a/packages/images/openmoko-sdk-image.bb b/packages/images/openmoko-sdk-image.bb index 53586166eb..85958085ae 100644 --- a/packages/images/openmoko-sdk-image.bb +++ b/packages/images/openmoko-sdk-image.bb @@ -1,5 +1,3 @@ require openmoko-devel-image.bb -export PACKAGE_INSTALL += "\ - task-openmoko-native-sdk \ -" +IMAGE_INSTALL += "task-openmoko-native-sdk" diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb index 25d38cf1c3..818fd0b186 100644 --- a/packages/images/openprotium-image.bb +++ b/packages/images/openprotium-image.bb @@ -1,7 +1,5 @@ DESCRIPTION = "OpenProtium image" HOMEPAGE = "http://www.openprotium.com" -LICENSE = "MIT" -PR = "r0" DEPENDS = "${MACHINE_TASK_PROVIDER}" EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x10000 -D ${SLUGOS_DEVICE_TABLE}" @@ -79,7 +77,7 @@ SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole \ OPENPROTIUM_KERNEL = "kernel-module-dummy \ kernel-module-af-packet " -RDEPENDS = " \ +IMAGE_INSTALL = " \ kernel base-files base-passwd netbase \ busybox initscripts-openprotium openprotium-init \ update-modules sysvinit tinylogin \ @@ -96,8 +94,6 @@ RDEPENDS = " \ ${OPENPROTIUM_KERNEL} " # ${SLUGOS_EXTRA_RDEPENDS}" -PACKAGE_INSTALL = "${RDEPENDS}" - inherit image storcenter_pack_image() { diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb index 9c0ed1cacc..06bcdad7e8 100644 --- a/packages/images/opie-image-16mb.bb +++ b/packages/images/opie-image-16mb.bb @@ -1,13 +1,8 @@ -export IMAGE_BASENAME = "opie-image-16mb" -export IMAGE_LINGUAS = "" - -LICENSE = "MIT" -PR = "r1" +IMAGE_LINGUAS = "" DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb" -RDEPENDS = "${INSTALL_PACKAGES}" -INSTALL_PACKAGES = "task-boot \ +IMAGE_INSTALL = "task-boot \ ipkg ipkg-collateral \ dropbear \ task-opie-16mb-base \ @@ -18,8 +13,6 @@ INSTALL_PACKAGES = "task-boot \ task-opie-16mb-pim \ task-opie-irda" -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" - # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index cd8d7df654..1f1130204a 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -1,21 +1,14 @@ -export IMAGE_BASENAME = "opie-image" -export IMAGE_LINGUAS = "" - -LICENSE = "MIT" -PR = "r22" +IMAGE_LINGUAS = "" DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie" -RDEPENDS = "${INSTALL_PACKAGES}" -INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \ +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ task-opie-extra-settings \ task-opie-bluetooth task-opie-irda " -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" - # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb index 477d924c2c..a8cb28bf27 100644 --- a/packages/images/opie-kdepim-image.bb +++ b/packages/images/opie-kdepim-image.bb @@ -1,10 +1,7 @@ require opie-image.bb DEPENDS += "kdepimpi" -PR = "r1" export IMAGE_BASENAME = "opie-kdepim-image" -INSTALL_PACKAGES += "kopi kapi kammu kopi-applet" - -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" +IMAGE_INSTALL += "kopi kapi kammu kopi-applet" diff --git a/packages/images/ossie-image.bb b/packages/images/ossie-image.bb index 7f7cfbd2e0..aedbecbefd 100644 --- a/packages/images/ossie-image.bb +++ b/packages/images/ossie-image.bb @@ -1,9 +1,8 @@ -export IMAGE_BASENAME = "ossie-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" - DEPENDS = "${MACHINE_TASK_PROVIDER} task-ossie" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" + OSSIE_URI = "http://192.168.1.81/feed" FEED_URIS += " \ @@ -13,7 +12,4 @@ FEED_URIS += " \ debug##${OSSIE_URI}/unstable/feed/${TARGET_ARCH}/debug \ ${MACHINE}##${OSSIE_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}" - inherit image - -LICENSE = "MIT" diff --git a/packages/images/pivotboot-image.bb b/packages/images/pivotboot-image.bb index 529e4cdb83..0aa7fdc575 100644 --- a/packages/images/pivotboot-image.bb +++ b/packages/images/pivotboot-image.bb @@ -1,10 +1,6 @@ -export IMAGE_BASENAME = "pivotboot-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "task-pivotboot" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "task-pivotboot" DEPENDS = "task-pivotboot" -PR = "r1" inherit image - -LICENSE = "MIT" diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb index d6a0b4b881..9101d88e9c 100644 --- a/packages/images/sdl-image.bb +++ b/packages/images/sdl-image.bb @@ -1,9 +1,5 @@ -LICENSE = "MIT" - -export IMAGE_BASENAME = "sdl-image" - DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" inherit image diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb index a56991b902..6249afa8cc 100644 --- a/packages/images/sectest-gpe-image.bb +++ b/packages/images/sectest-gpe-image.bb @@ -1,8 +1,3 @@ -LICENSE = "MIT" -PR = "r6" - -export IMAGE_BASENAME = "sectest-gpe-image" - GPE_EXTRA_THEMES = "\ gtk-theme-industrial \ gtk-industrial-engine \ @@ -19,9 +14,8 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe" -RDEPENDS = "${PACKAGE_INSTALL}" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpe-task-base \ gpe-task-pim \ diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index be746009b6..9f6a2aaa4f 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -5,11 +5,9 @@ # DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" -LICENSE = "MIT" -PR = "r46" DEPENDS = "task-slugos" -PACKAGE_INSTALL = "task-slugos" +IMAGE_INSTALL = "task-slugos" COMPATIBLE_MACHINE = "nslu2" diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb index a0e68c9bb8..56677f5dda 100644 --- a/packages/images/twin-image.bb +++ b/packages/images/twin-image.bb @@ -1,5 +1,3 @@ -export IMAGE_BASENAME="twin-image" - DEPENDS = '${MACHINE_TASK_PROVIDER} \ twin \ orpheus \ @@ -7,12 +5,12 @@ DEPENDS = '${MACHINE_TASK_PROVIDER} \ vim \ mutt' -export PACKAGE_INSTALL = '${MACHINE_TASK_PROVIDER} \ - twin \ - orpheus \ - nano \ - vim \ - mutt' +IMAGE_INSTALL = '\ + ${MACHINE_TASK_PROVIDER} \ + twin \ + orpheus \ + nano \ + vim \ + mutt' inherit image -LICENSE = "MIT" diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb index 43afa3059d..9255c8c08a 100644 --- a/packages/images/uml-image.bb +++ b/packages/images/uml-image.bb @@ -1,12 +1,10 @@ DESCRIPTION = "A rootfs for User-Mode-Linux" -export IMAGE_BASENAME = "uml-image" - OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2" OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar" DEPENDS = "${MACHINE_TASK_PROVIDER}" -export PACKAGE_INSTALL = "${DEPENDS}" +IMAGE_INSTALL = "${DEPENDS}" inherit image -LICENSE = "MIT" + diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index a24271a9d6..c6d4e73718 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,5 +1,3 @@ -LICENSE = "MIT" -PR = "r26" COMPATIBLE_MACHINE = "nslu2" IMAGE_BASENAME = "unslung" @@ -11,11 +9,7 @@ USE_DEVFS = "1" DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" -RDEPENDS = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg libipkg \ - ${UNSLUNG_EXTRA_RDEPENDS}" - -PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \ +IMAGE_INSTALL = "kernel update-modules unslung-rootfs \ libc6-unslung slingbox ipkg libipkg \ kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb index d5d48233a7..70c183c897 100644 --- a/packages/images/xfce-image.bb +++ b/packages/images/xfce-image.bb @@ -10,8 +10,7 @@ X_RDEPENDS = "${XSERVER}" XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base" XFCE_RDEPENDS = "${XFCE_DEPENDS}" -export PACKAGE_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" +IMAGE_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" DEPENDS = "${X_DEPENDS} ${XFCE_DEPENDS}" inherit image -LICENSE = "MIT" diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb index 3b4576e5bb..726fbf7421 100644 --- a/packages/images/xterminal-image.bb +++ b/packages/images/xterminal-image.bb @@ -4,8 +4,7 @@ IMAGE_LINGUAS = "" XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal" -export PACKAGE_INSTALL = "${XTERMINAL_PACKAGES}" +IMAGE_INSTALL = "${XTERMINAL_PACKAGES}" DEPENDS = "${XTERMINAL_PACKAGES}" inherit image -LICENSE = "MIT" diff --git a/packages/jards/jards_1.0.bb b/packages/jards/jards_1.0.bb index c536a2546b..c0504ae88c 100644 --- a/packages/jards/jards_1.0.bb +++ b/packages/jards/jards_1.0.bb @@ -23,8 +23,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/jards_gakusei.cvs.sourceforge.net__2007 inherit opie OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" -OE_QMAKE_CXXFLAFS += " -L${STAGING_DIR}/pkgdata" -CXXFLAFS += " -L${STAGING_DIR}/pkgdata" S = "${WORKDIR}/${PN}/" export OE_QMAKE_LINK="${CXX}" diff --git a/packages/nonworking/angstrom/angstrom-e-image.bb b/packages/nonworking/angstrom/angstrom-e-image.bb index 6db89788ce..b7fdd8e50a 100644 --- a/packages/nonworking/angstrom/angstrom-e-image.bb +++ b/packages/nonworking/angstrom/angstrom-e-image.bb @@ -1,7 +1,4 @@ #Angstrom e image -LICENSE = "MIT" -PR = "r1" - PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" @@ -19,7 +16,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "e-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-e-base-depends \ @@ -27,9 +24,6 @@ RDEPENDS = "\ angstrom-gpe-task-settings \ ${ANGSTROM_EXTRA_INSTALL}" - -export PACKAGE_INSTALL = "${RDEPENDS}" - #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' |