From 4921f4cc091572f9704641197609be594cbcdcaf Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Wed, 2 Aug 2006 15:00:51 +0000 Subject: base-files/base-files/jornada720/ : Moved to jornada7xx * moved so its mapped against proper ARCH initscripts/initscripts-1.0/jornada7xx/devices : Changed to better devices * changed /dev/input/ts0 to correct value linux/linux-jlime-jornada*/defconfig : Minor changes * EVDEV support for 7xx * SYSCTL support for 7xx --- .../base-files/jornada720/.mtn2git_empty | 0 packages/base-files/base-files/jornada720/fstab | 6 -- .../base-files/jornada7xx/.mtn2git_empty | 0 packages/base-files/base-files/jornada7xx/fstab | 7 ++ .../initscripts/initscripts-1.0/jornada7xx/devices | 2 +- .../linux-jlime-jornada6xx-2.6.17/defconfig_jlime | 88 ++++++++++++++-------- .../linux-jlime-jornada7xx-2.6.17/defconf_jlime | 19 +++-- 7 files changed, 74 insertions(+), 48 deletions(-) delete mode 100644 packages/base-files/base-files/jornada720/.mtn2git_empty delete mode 100644 packages/base-files/base-files/jornada720/fstab create mode 100644 packages/base-files/base-files/jornada7xx/.mtn2git_empty create mode 100644 packages/base-files/base-files/jornada7xx/fstab diff --git a/packages/base-files/base-files/jornada720/.mtn2git_empty b/packages/base-files/base-files/jornada720/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/base-files/base-files/jornada720/fstab b/packages/base-files/base-files/jornada720/fstab deleted file mode 100644 index 07ccff0fe6..0000000000 --- a/packages/base-files/base-files/jornada720/fstab +++ /dev/null @@ -1,6 +0,0 @@ -/dev/mtdblock1 / jffs2 rw,noatime 1 1 -proc /proc proc defaults 0 0 -/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 -tmpfs /var tmpfs defaults 0 0 -tmpfs /mnt/ram tmpfs defaults 0 0 -devpts /dev/pts devpts defaults 0 0 \ No newline at end of file diff --git a/packages/base-files/base-files/jornada7xx/.mtn2git_empty b/packages/base-files/base-files/jornada7xx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/base-files/base-files/jornada7xx/fstab b/packages/base-files/base-files/jornada7xx/fstab new file mode 100644 index 0000000000..504a1a2f4e --- /dev/null +++ b/packages/base-files/base-files/jornada7xx/fstab @@ -0,0 +1,7 @@ +proc /proc proc defaults 0 0 +/dev/hda2 / ext2 defaults 0 0 +/dev/hda1 /mnt/cf auto defaults,sync,noauto 0 0 +/dev/hda3 none swap sw 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /mnt/ram tmpfs defaults 0 0 +devpts /dev/pts devpts defaults 0 0 \ No newline at end of file diff --git a/packages/initscripts/initscripts-1.0/jornada7xx/devices b/packages/initscripts/initscripts-1.0/jornada7xx/devices index fc96ff62ee..422336a345 100755 --- a/packages/initscripts/initscripts-1.0/jornada7xx/devices +++ b/packages/initscripts/initscripts-1.0/jornada7xx/devices @@ -48,7 +48,7 @@ else if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi cd / mkdir -p dev/input - mknod /dev/input/ts0 c 13 128 + mknod /dev/input/ts0 c 13 65 mknod /dev/ttySC1 c 9 204 mknod /dev/irda0 c 10 204 mkdir -p dev/msys diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime index bd6cd586ac..277a2d92d9 100644 --- a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime +++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17 -# Wed Jul 26 23:35:08 2006 +# Tue Aug 1 11:50:57 2006 # CONFIG_SUPERH=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -359,6 +359,7 @@ CONFIG_IRDA=m # IrDA protocols # # CONFIG_IRLAN is not set +# CONFIG_IRNET is not set # CONFIG_IRCOMM is not set # CONFIG_IRDA_ULTRA is not set @@ -407,9 +408,9 @@ CONFIG_BT=m # CONFIG_BT_HCIBLUECARD is not set # CONFIG_BT_HCIBTUART is not set # CONFIG_BT_HCIVHCI is not set -CONFIG_IEEE80211=m +CONFIG_IEEE80211=y # CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_WEP=y CONFIG_IEEE80211_CRYPT_CCMP=m # CONFIG_IEEE80211_CRYPT_TKIP is not set CONFIG_IEEE80211_SOFTMAC=m @@ -423,7 +424,7 @@ CONFIG_WIRELESS_EXT=y # # Generic Driver Options # -# CONFIG_STANDALONE is not set +CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -522,7 +523,7 @@ CONFIG_IDE_SH=y # Network device support # CONFIG_NETDEVICES=y -# CONFIG_DUMMY is not set +CONFIG_DUMMY=y # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set @@ -535,13 +536,28 @@ CONFIG_NETDEVICES=y # # PHY device support # +# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # -# CONFIG_NET_ETHERNET is not set -CONFIG_MII=m +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_STNIC is not set +CONFIG_NET_VENDOR_3COM=y +# CONFIG_EL1 is not set +# CONFIG_EL2 is not set +# CONFIG_EL16 is not set +# CONFIG_EL3 is not set +# CONFIG_NET_VENDOR_SMC is not set +# CONFIG_SMC91X is not set +# CONFIG_NET_VENDOR_RACAL is not set +# CONFIG_AT1700 is not set +# CONFIG_DEPCA is not set +# CONFIG_HP100 is not set +# CONFIG_NET_ISA is not set # CONFIG_NE2000 is not set +# CONFIG_NET_PCI is not set # # Ethernet (1000 Mbit) @@ -560,40 +576,36 @@ CONFIG_MII=m # Wireless LAN (non-hamradio) # CONFIG_NET_RADIO=y -# CONFIG_NET_WIRELESS_RTNETLINK is not set +CONFIG_NET_WIRELESS_RTNETLINK=y # # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set -CONFIG_ARLAN=m -CONFIG_WAVELAN=m -CONFIG_PCMCIA_WAVELAN=m -CONFIG_PCMCIA_NETWAVE=m +# CONFIG_ARLAN is not set +# CONFIG_WAVELAN is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set # # Wireless 802.11 Frequency Hopping cards support # -CONFIG_PCMCIA_RAYCS=m +# CONFIG_PCMCIA_RAYCS is not set # # Wireless 802.11b ISA/PCI cards support # -CONFIG_HERMES=m -CONFIG_ATMEL=m +CONFIG_HERMES=y +# CONFIG_ATMEL is not set # # Wireless 802.11b Pcmcia/Cardbus cards support # -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_PCMCIA_WL3501=m -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_CS=m +CONFIG_PCMCIA_HERMES=y +# CONFIG_PCMCIA_SPECTRUM is not set +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set CONFIG_NET_WIRELESS=y # @@ -613,8 +625,19 @@ CONFIG_PCMCIA_AXNET=m # Wan interfaces # # CONFIG_WAN is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set +CONFIG_PPP=m +# CONFIG_PPP_MULTILINK is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -646,7 +669,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240 CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=640 CONFIG_INPUT_TSDEV_SCREEN_Y=240 -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -673,10 +696,7 @@ CONFIG_TOUCHSCREEN_HP600=y # # Hardware I/O ports # -CONFIG_SERIO=y -# CONFIG_SERIO_I8042 is not set -# CONFIG_SERIO_SERPORT is not set -# CONFIG_SERIO_RAW is not set +# CONFIG_SERIO is not set # CONFIG_GAMEPORT is not set # @@ -1094,7 +1114,7 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set # CONFIG_CRYPTO_MD5 is not set -# CONFIG_CRYPTO_SHA1 is not set +CONFIG_CRYPTO_SHA1=m # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set @@ -1107,7 +1127,7 @@ CONFIG_CRYPTO_AES=m # CONFIG_CRYPTO_CAST5 is not set # CONFIG_CRYPTO_CAST6 is not set # CONFIG_CRYPTO_TEA is not set -CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_ARC4=y # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_ANUBIS is not set # CONFIG_CRYPTO_DEFLATE is not set @@ -1126,3 +1146,5 @@ CONFIG_CRC_CCITT=m CONFIG_CRC16=m CONFIG_CRC32=y CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_DEFLATE=m diff --git a/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime b/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime index 434c5401c7..80342d2d30 100644 --- a/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime +++ b/packages/linux/linux-jlime-jornada7xx-2.6.17/defconf_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17 -# Sat Jul 22 17:21:24 2006 +# Wed Aug 2 13:43:45 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -28,7 +28,7 @@ CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -# CONFIG_SYSCTL is not set +CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y @@ -520,7 +520,10 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m CONFIG_PPP_MPPE=m # CONFIG_PPPOE is not set -# CONFIG_SLIP is not set +CONFIG_SLIP=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -897,21 +900,21 @@ CONFIG_CRAMFS=y # # Network File Systems # -CONFIG_NFS_FS=m +CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=m +CONFIG_NFSD=y CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set # CONFIG_NFSD_V4 is not set CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m +CONFIG_LOCKD=y CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m +CONFIG_SUNRPC=y # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -- cgit v1.2.3 From c71e702c271582fbce2e7f053161fd63eb50a81b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 15:19:09 +0000 Subject: slugos-packages: added flite --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index f729c7f22b..fc0830d7dc 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r6" +PR = "r7" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -61,6 +61,7 @@ SLUGOS_PACKAGES = "\ findutils \ flac \ flex \ + flite \ ftpd-topfield \ gawk \ gcc \ -- cgit v1.2.3 From a5894e850262e62e8d03579da7a46016a8fe747e Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 16:50:02 +0000 Subject: slugos-packages: added madplay --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index fc0830d7dc..df2b252813 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r7" +PR = "r8" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -101,6 +101,7 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ + madplay \ madwifi-ng \ mailx \ make \ -- cgit v1.2.3 From 26740980c00dae3b17a8272c8bc0c04848b398e6 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 21:35:36 +0000 Subject: linphone: upgraded to 1.3.99 (console), courtesy of Thomas Reitmayr --- packages/linphone/linphone-1.3.99.8/.mtn2git_empty | 0 packages/linphone/linphone-1.3.99.8/conf.patch | 33 ++++++++++++++++++++++ packages/linphone/linphone_1.3.99.8.bb | 27 ++++++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 packages/linphone/linphone-1.3.99.8/.mtn2git_empty create mode 100644 packages/linphone/linphone-1.3.99.8/conf.patch create mode 100644 packages/linphone/linphone_1.3.99.8.bb diff --git a/packages/linphone/linphone-1.3.99.8/.mtn2git_empty b/packages/linphone/linphone-1.3.99.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linphone/linphone-1.3.99.8/conf.patch b/packages/linphone/linphone-1.3.99.8/conf.patch new file mode 100644 index 0000000000..e8fbdf22c8 --- /dev/null +++ b/packages/linphone/linphone-1.3.99.8/conf.patch @@ -0,0 +1,33 @@ +--- a/configure.in ++++ b/configure.in +@@ -30,7 +30,7 @@ + AM_PROG_CC_STDC + AC_HEADER_STDC + dnl localization tools +-ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) ++dnl ifdef([IT_PROG_INTLTOOL],[IT_PROG_INTLTOOL],[AC_PROG_INTLTOOL]) + dnl Initialize libtool + AC_PROG_LIBTOOL + AM_PROG_LIBTOOL +@@ -62,7 +62,7 @@ + gnome_ui=false + fi + +-CFLAGS="$CFLAGS -I\$(prefix)/include" ++dnl CFLAGS="$CFLAGS -I\$(prefix)/include" + + if test "$gnome_ui" = "true" ; then + +--- a/mediastreamer2/configure.ac ++++ b/mediastreamer2/configure.ac +@@ -47,8 +47,8 @@ + [wall_werror=yes] + ) + +-CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include" +-LIBS="$LIBS -L\$(prefix)/lib" ++dnl CFLAGS="-DORTP_INET6 $CFLAGS -I\$(prefix)/include" ++dnl LIBS="$LIBS -L\$(prefix)/lib" + + dnl enable ipv6 support + AC_ARG_ENABLE(ipv6, diff --git a/packages/linphone/linphone_1.3.99.8.bb b/packages/linphone/linphone_1.3.99.8.bb new file mode 100644 index 0000000000..05998f889d --- /dev/null +++ b/packages/linphone/linphone_1.3.99.8.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "SIP-based IP phone (Console edition)" +HOMEPAGE = "http://www.linphone.org/?lang=us" +LICENSE = "GPL-2" +DEPENDS = "libosip2 speex libogg alsa-lib readline" +PR = "r0" + +SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/unstable/source/linphone-${PV}.tar.gz \ + file://conf.patch;patch=1" + +S = "${WORKDIR}/linphone-${PV}" + +FILES_${PN} += "${datadir}/linphonec" + +inherit autotools + +EXTRA_OECONF = "--disable-gnome_ui --disable-gtk-doc --without-ffmpeg \ + --without-sdl --disable-video --enable-alsa \ + --with-osip=${STAGING_DIR}/${HOST_SYS} \ + --with-readline=${STAGING_DIR}/${HOST_SYS} \ + --with-speex=${STAGING_DIR}/${HOST_SYS} \ + --disable-truespeech --disable-manual \ + --disable-glibtest --disable-glib" + +do_install_append() { + rm -f ${D}${datadir}/sounds/linphone/hello*.wav + rm -f ${D}${datadir}/sounds/linphone/rings/oldphone.wav +} -- cgit v1.2.3 From a9b96c7308bcb4bfaf5d1fba983375d54f4b386f Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Fri, 4 Aug 2006 21:37:08 +0000 Subject: slugos-packages.bb: added linphone --- packages/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index df2b252813..3ac59c3719 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux " HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r8" +PR = "r9" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -96,6 +96,7 @@ SLUGOS_PACKAGES = "\ libusb \ libvorbis \ libxml2 \ + linphone \ lirc \ lrzsz \ lsof \ -- cgit v1.2.3 From 724605880f14b284a20d341cc39c7578e1b1c35d Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 4 Aug 2006 21:59:07 +0000 Subject: entice: add explicit esmart RDEPENDS --- packages/e17/entice_20060128.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index ffc07f7661..271bcc0e8f 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -2,10 +2,12 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r1" +PR = "r2" inherit e +RDEPENDS += "esmart-x11" + SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" -- cgit v1.2.3 From e9de7a29dfc59a02a854ee89b8e3b1e897a83792 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Aug 2006 10:28:21 +0000 Subject: python-native 2.4.0 don't modify first shebang line when installing packages via distutils. closes #1271 --- .../python-native-2.4.0/dont-modify-shebang-line.patch | 16 ++++++++++++++++ packages/python/python-native_2.4.0.bb | 10 ++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 packages/python/python-native-2.4.0/dont-modify-shebang-line.patch diff --git a/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch new file mode 100644 index 0000000000..54109afd62 --- /dev/null +++ b/packages/python/python-native-2.4.0/dont-modify-shebang-line.patch @@ -0,0 +1,16 @@ + +# +# Signed off by Michael 'Mickey' Lauer +# + +--- Python-2.4/Lib/distutils/command/build_scripts.py~dont-modify-shebang-line ++++ Python-2.4/Lib/distutils/command/build_scripts.py +@@ -87,7 +87,7 @@ + continue + + match = first_line_re.match(first_line) +- if match: ++ if False: #match: + adjust = 1 + post_interp = match.group(1) or '' + diff --git a/packages/python/python-native_2.4.0.bb b/packages/python/python-native_2.4.0.bb index 00092d1e15..4f5db82569 100644 --- a/packages/python/python-native_2.4.0.bb +++ b/packages/python/python-native_2.4.0.bb @@ -5,13 +5,14 @@ SECTION = "devel/python" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " DEPENDS = "" -PR = "r0" +PR = "r1" EXCLUDE_FROM_WORLD = "1" SRC_URI = "http://www.python.org/ftp/python/2.4/Python-2.4.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" + file://bindir-libdir.patch;patch=1 \ + file://cross-distutils.patch;patch=1 \ + file://dont-modify-shebang-line.patch;patch=1" S = "${WORKDIR}/Python-2.4" inherit autotools native @@ -20,7 +21,8 @@ EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx -- --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' -do_configure () { +do_configure() { + # the autofoo stuff is too old to allow regenerating oe_runconf } -- cgit v1.2.3 From 7f055c4ffb2bddec2da28bbf35069ef28396cd5b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 5 Aug 2006 10:29:04 +0000 Subject: python-native 2.3.3 remove --- packages/python/python-native-2.3.3/.mtn2git_empty | 0 .../python/python-native-2.3.3/bindir-libdir.patch | 18 ---------- .../python-native-2.3.3/cross-distutils.patch | 38 ---------------------- packages/python/python-native_2.3.3.bb | 29 ----------------- 4 files changed, 85 deletions(-) delete mode 100644 packages/python/python-native-2.3.3/.mtn2git_empty delete mode 100644 packages/python/python-native-2.3.3/bindir-libdir.patch delete mode 100644 packages/python/python-native-2.3.3/cross-distutils.patch delete mode 100644 packages/python/python-native_2.3.3.bb diff --git a/packages/python/python-native-2.3.3/.mtn2git_empty b/packages/python/python-native-2.3.3/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/python/python-native-2.3.3/bindir-libdir.patch b/packages/python/python-native-2.3.3/bindir-libdir.patch deleted file mode 100644 index 999bddc449..0000000000 --- a/packages/python/python-native-2.3.3/bindir-libdir.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.1/Makefile.pre.in~bindir-libdir 2003-09-20 12:50:28.000000000 +0200 -+++ Python-2.3.1/Makefile.pre.in 2003-11-02 19:53:17.000000000 +0100 -@@ -78,8 +78,8 @@ - exec_prefix= @exec_prefix@ - - # Expanded directories --BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+BINDIR= @bindir@ -+LIBDIR= @libdir@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include diff --git a/packages/python/python-native-2.3.3/cross-distutils.patch b/packages/python/python-native-2.3.3/cross-distutils.patch deleted file mode 100644 index 76ae883c1d..0000000000 --- a/packages/python/python-native-2.3.3/cross-distutils.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- Python-2.3.3/Lib/distutils/sysconfig.py~cross-distutils 2003-02-10 15:02:33.000000000 +0100 -+++ Python-2.3.3/Lib/distutils/sysconfig.py 2004-03-02 20:15:05.000000000 +0100 -@@ -19,8 +19,8 @@ - from errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) -+EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - # python_build: (Boolean) if true, we're either building Python or - # building an extension with an un-installed Python, so we use -@@ -192,7 +192,8 @@ - else: - # The name of the config.h file changed in 2.2 - config_h = 'pyconfig.h' -- return os.path.join(inc_dir, config_h) -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(inc_dir, config_h).replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def get_makefile_filename(): -@@ -200,7 +201,8 @@ - if python_build: - return os.path.join(os.path.dirname(sys.executable), "Makefile") - lib_dir = get_python_lib(plat_specific=1, standard_lib=1) -- return os.path.join(lib_dir, "config", "Makefile") -+ print "NOTE: sysconfig.get_config_h_filename() altered for OpenEmbedded" -+ return os.path.join(lib_dir, "config", "Makefile").replace( os.getenv("BUILD_SYS"), os.getenv("HOST_SYS") ) - - - def parse_config_h(fp, g=None): diff --git a/packages/python/python-native_2.3.3.bb b/packages/python/python-native_2.3.3.bb deleted file mode 100644 index 8f2e782a7b..0000000000 --- a/packages/python/python-native_2.3.3.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Python Programming Language" -HOMEPAGE = "http://www.python.org" -LICENSE = "PSF" -SECTION = "devel/python" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "" -PR = "r1" - -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \ - file://bindir-libdir.patch;patch=1 \ - file://cross-distutils.patch;patch=1" -S = "${WORKDIR}/Python-${PV}" - -inherit autotools native - -EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --without-cxx --with-signal-module --with-wctype-functions \ - --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}" -EXTRA_OEMAKE = 'BUILD_SYS="" HOST_SYS=""' - -do_configure () { - oe_runconf -} - -do_stage_append() { - # install pgen for later usage with non-native builds - install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/ -} - -- cgit v1.2.3 From f865d07dd9fd79c0e504199c6845e63c735262ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 5 Aug 2006 13:15:40 +0000 Subject: entice: "esmart-x11" doesn't exist in packageland, libesmart0 does --- packages/e17/entice_20060128.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/e17/entice_20060128.bb b/packages/e17/entice_20060128.bb index 271bcc0e8f..48c37c72a2 100644 --- a/packages/e17/entice_20060128.bb +++ b/packages/e17/entice_20060128.bb @@ -2,11 +2,11 @@ DESCRIPTION = "Entice is the E17 picture viewer" # can also depend on GIMP for editing DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" -PR = "r2" +PR = "r3" inherit e -RDEPENDS += "esmart-x11" +RDEPENDS += "libesmart-container-plugins libesmart-thumb0 libesmart-trans-x11-0 libesmart-file-dialog0" SRC_URI = "${E_CVS};module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" -- cgit v1.2.3 From 13955e0d155fdc82909879a27e28ad95de214778 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 5 Aug 2006 13:17:14 +0000 Subject: angstrom 2006.9: fix typo spotted by Philipp Zabel --- conf/distro/angstrom-2006.9.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 020e3f98a3..058f39214e 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -51,7 +51,7 @@ PREFERRED_VERSION_freetype = "2.2.1" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-drive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -- cgit v1.2.3 From d82b6c19757a5f26f82a853d468820585bdd2031 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 5 Aug 2006 13:32:08 +0000 Subject: packages/gcc: Use require instead of include for the 'base' files --- packages/gcc/gcc-cross-initial_3.3.3.bb | 2 +- packages/gcc/gcc-cross-initial_3.3.4.bb | 2 +- packages/gcc/gcc-cross-initial_3.4.3.bb | 2 +- packages/gcc/gcc-cross-initial_3.4.4.bb | 2 +- packages/gcc/gcc-cross-initial_4.0.2.bb | 2 +- packages/gcc/gcc-cross-initial_4.1-20060217.bb | 2 +- packages/gcc/gcc-cross-initial_4.1.0.bb | 2 +- packages/gcc/gcc-cross-initial_4.1.1.bb | 2 +- packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb | 2 +- packages/gcc/gcc-cross-initial_csl-arm-cvs.bb | 2 +- packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb | 2 +- packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb | 2 +- packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb | 2 +- packages/gcc/gcc-cross-sdk_3.3.4.bb | 6 +++--- packages/gcc/gcc-cross-sdk_3.4.3.bb | 6 +++--- packages/gcc/gcc-cross-sdk_3.4.4.bb | 6 +++--- packages/gcc/gcc-cross-sdk_4.1.0.bb | 6 +++--- packages/gcc/gcc-cross_3.3.3.bb | 2 +- packages/gcc/gcc-cross_3.3.4.bb | 8 ++++---- packages/gcc/gcc-cross_3.4.3.bb | 8 ++++---- packages/gcc/gcc-cross_3.4.4.bb | 8 ++++---- packages/gcc/gcc-cross_4.0.0.bb | 8 ++++---- packages/gcc/gcc-cross_4.0.2.bb | 8 ++++---- packages/gcc/gcc-cross_4.1-20060217.bb | 8 ++++---- packages/gcc/gcc-cross_4.1.0.bb | 8 ++++---- packages/gcc/gcc-cross_4.1.1.bb | 8 ++++---- packages/gcc/gcc-cross_4.2-20060513.bb | 8 ++++---- packages/gcc/gcc-cross_csl-arm-2005q3.bb | 8 ++++---- packages/gcc/gcc-cross_csl-arm-cvs.bb | 8 ++++---- packages/gcc/gcc-cross_csl-arm.bb | 8 ++++---- packages/gcc/gcc_3.4.3.bb | 4 ++-- packages/gcc/gcc_3.4.4.bb | 4 ++-- packages/gcc/gcc_4.0.0.bb | 4 ++-- packages/gcc/gcc_4.0.2.bb | 4 ++-- packages/gcc/gcc_4.1-20060217.bb | 4 ++-- packages/gcc/gcc_4.1.0.bb | 4 ++-- packages/gcc/gcc_4.1.1.bb | 4 ++-- packages/gcc/gcc_4.2-20060513.bb | 4 ++-- packages/gcc/gcc_csl-arm-2005q3.bb | 4 ++-- packages/gcc/gcc_csl-arm-cvs.bb | 2 +- packages/gcc/gcc_csl-arm.bb | 4 ++-- 41 files changed, 95 insertions(+), 95 deletions(-) diff --git a/packages/gcc/gcc-cross-initial_3.3.3.bb b/packages/gcc/gcc-cross-initial_3.3.3.bb index e3b365da18..c650e4fe57 100644 --- a/packages/gcc/gcc-cross-initial_3.3.3.bb +++ b/packages/gcc/gcc-cross-initial_3.3.3.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.3.4.bb b/packages/gcc/gcc-cross-initial_3.3.4.bb index e3b365da18..c650e4fe57 100644 --- a/packages/gcc/gcc-cross-initial_3.3.4.bb +++ b/packages/gcc/gcc-cross-initial_3.3.4.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.4.3.bb b/packages/gcc/gcc-cross-initial_3.4.3.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_3.4.3.bb +++ b/packages/gcc/gcc-cross-initial_3.4.3.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_3.4.4.bb b/packages/gcc/gcc-cross-initial_3.4.4.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_3.4.4.bb +++ b/packages/gcc/gcc-cross-initial_3.4.4.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.0.2.bb b/packages/gcc/gcc-cross-initial_4.0.2.bb index 68dafe3f1a..037f3032a6 100644 --- a/packages/gcc/gcc-cross-initial_4.0.2.bb +++ b/packages/gcc/gcc-cross-initial_4.0.2.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1-20060217.bb b/packages/gcc/gcc-cross-initial_4.1-20060217.bb index 68dafe3f1a..037f3032a6 100644 --- a/packages/gcc/gcc-cross-initial_4.1-20060217.bb +++ b/packages/gcc/gcc-cross-initial_4.1-20060217.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1.0.bb b/packages/gcc/gcc-cross-initial_4.1.0.bb index 63308c2cfe..1e23ef9330 100644 --- a/packages/gcc/gcc-cross-initial_4.1.0.bb +++ b/packages/gcc/gcc-cross-initial_4.1.0.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_4.1.1.bb b/packages/gcc/gcc-cross-initial_4.1.1.bb index 63308c2cfe..1e23ef9330 100644 --- a/packages/gcc/gcc-cross-initial_4.1.1.bb +++ b/packages/gcc/gcc-cross-initial_4.1.1.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-2005q3.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb index 48c80864e2..307c6f7d4c 100644 --- a/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross-initial_csl-arm-cvs.bb @@ -1,4 +1,4 @@ -include gcc-cross_${PV}.bb +require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" diff --git a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb index 7db2409093..7f274bee30 100644 --- a/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb +++ b/packages/gcc/gcc-cross-kernel-3.3.3_3.3.3.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb index 7db2409093..7f274bee30 100644 --- a/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb +++ b/packages/gcc/gcc-cross-kernel-3.3.4_3.3.4.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb index 368cbb1e47..03c6ce2b86 100644 --- a/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb +++ b/packages/gcc/gcc-cross-kernel-3.4.4_3.4.4.bb @@ -2,7 +2,7 @@ SECTION = "devel" # cut-down gcc for kernel builds # only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. -include gcc-cross-initial_${PV}.bb +require gcc-cross-initial_${PV}.bb PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" diff --git a/packages/gcc/gcc-cross-sdk_3.3.4.bb b/packages/gcc/gcc-cross-sdk_3.3.4.bb index deb92c9b32..4b2c583fcb 100644 --- a/packages/gcc/gcc-cross-sdk_3.3.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.3.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r3" inherit sdk @@ -12,5 +12,5 @@ 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}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_3.4.3.bb b/packages/gcc/gcc-cross-sdk_3.4.3.bb index 205606331e..e6907deb1b 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.3.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ 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}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_3.4.4.bb b/packages/gcc/gcc-cross-sdk_3.4.4.bb index 205606331e..e6907deb1b 100644 --- a/packages/gcc/gcc-cross-sdk_3.4.4.bb +++ b/packages/gcc/gcc-cross-sdk_3.4.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ 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}" -include gcc3-build-sdk.inc -include gcc-package-sdk.inc +require gcc3-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross-sdk_4.1.0.bb b/packages/gcc/gcc-cross-sdk_4.1.0.bb index 671ee68b36..7233f79504 100644 --- a/packages/gcc/gcc-cross-sdk_4.1.0.bb +++ b/packages/gcc/gcc-cross-sdk_4.1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" LICENSE = "GPL" -include gcc_${PV}.bb +require gcc_${PV}.bb PR = "r0" inherit sdk @@ -12,5 +12,5 @@ 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}" -include gcc4-build-sdk.inc -include gcc-package-sdk.inc +require gcc4-build-sdk.inc +require gcc-package-sdk.inc diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb index 44ba65269e..a24752fe89 100644 --- a/packages/gcc/gcc-cross_3.3.3.bb +++ b/packages/gcc/gcc-cross_3.3.3.bb @@ -1,5 +1,5 @@ SECTION = "devel" -include gcc_${PV}.bb +require gcc_${PV}.bb inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index 597b47fba8..f7a2cded51 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -1,6 +1,6 @@ SECTION = "devel" -include gcc_${PV}.bb -include gcc-paths-cross.inc +require gcc_${PV}.bb +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" @@ -9,5 +9,5 @@ PR="r3" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -include gcc3-build-cross.inc -include gcc-package-cross.inc \ No newline at end of file +require gcc3-build-cross.inc +require gcc-package-cross.inc \ No newline at end of file diff --git a/packages/gcc/gcc-cross_3.4.3.bb b/packages/gcc/gcc-cross_3.4.3.bb index a5d1bda170..b61223b39c 100644 --- a/packages/gcc/gcc-cross_3.4.3.bb +++ b/packages/gcc/gcc-cross_3.4.3.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb index d965e5b399..ef679365e1 100644 --- a/packages/gcc/gcc-cross_3.4.4.bb +++ b/packages/gcc/gcc-cross_3.4.4.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.0.bb b/packages/gcc/gcc-cross_4.0.0.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.0.0.bb +++ b/packages/gcc/gcc-cross_4.0.0.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.0.2.bb b/packages/gcc/gcc-cross_4.0.2.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.0.2.bb +++ b/packages/gcc/gcc-cross_4.0.2.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1-20060217.bb b/packages/gcc/gcc-cross_4.1-20060217.bb index 6e299e8299..d2dc240126 100644 --- a/packages/gcc/gcc-cross_4.1-20060217.bb +++ b/packages/gcc/gcc-cross_4.1-20060217.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,6 +11,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_4.1.0.bb b/packages/gcc/gcc-cross_4.1.0.bb index 4b0b5a1311..4e380c5f66 100644 --- a/packages/gcc/gcc-cross_4.1.0.bb +++ b/packages/gcc/gcc-cross_4.1.0.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_4.1.1.bb b/packages/gcc/gcc-cross_4.1.1.bb index 12053f43d8..4c530175f3 100644 --- a/packages/gcc/gcc-cross_4.1.1.bb +++ b/packages/gcc/gcc-cross_4.1.1.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_4.2-20060513.bb b/packages/gcc/gcc-cross_4.2-20060513.bb index 4b0b5a1311..4e380c5f66 100644 --- a/packages/gcc/gcc-cross_4.2-20060513.bb +++ b/packages/gcc/gcc-cross_4.2-20060513.bb @@ -1,6 +1,6 @@ -include gcc_${PV}.bb +require gcc_${PV}.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* @@ -11,8 +11,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-build-cross.inc +require gcc3-build-cross.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc EXTRA_OECONF += "--with-mpfr=${STAGING_DIR}/${BUILD_SYS}" diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 044383cb84..96eaee7682 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm-2005q3.bb +require gcc_csl-arm-2005q3.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-cross-build.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb index f83de2598d..22fdd3701a 100644 --- a/packages/gcc/gcc-cross_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm-cvs.bb +require gcc_csl-arm-cvs.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-cross-build.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb index 3be3c603a5..6cd825d079 100644 --- a/packages/gcc/gcc-cross_csl-arm.bb +++ b/packages/gcc/gcc-cross_csl-arm.bb @@ -1,6 +1,6 @@ -include gcc_csl-arm.bb +require gcc_csl-arm.bb # path mangling, needed by the cross packaging -include gcc-paths-cross.inc +require gcc-paths-cross.inc inherit cross # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -include gcc3-cross-build.inc +require gcc3-cross-build.inc # cross packaging -include gcc-package-cross.inc +require gcc-package-cross.inc diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb index 1cd108aa34..c7c6d3e8c9 100644 --- a/packages/gcc/gcc_3.4.3.bb +++ b/packages/gcc/gcc_3.4.3.bb @@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton " inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ @@ -25,4 +25,4 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://always-fixincperm.patch;patch=1 \ file://GCOV_PREFIX_STRIP-cross-profile_3.4.patch;patch=1" -include gcc3-build.inc +require gcc3-build.inc diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb index 579678066f..144852f15a 100644 --- a/packages/gcc/gcc_3.4.4.bb +++ b/packages/gcc/gcc_3.4.4.bb @@ -7,7 +7,7 @@ MAINTAINER = "Gerald Britton " inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc34-reverse-compare.patch;patch=1 \ @@ -29,4 +29,4 @@ SRC_URI += "file://gcc34-configure.in.patch;patch=1" SRC_URI += "file://gcc34-thumb-support.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc3-build.inc +require gcc3-build.inc diff --git a/packages/gcc/gcc_4.0.0.bb b/packages/gcc/gcc_4.0.0.bb index af54c17fb8..0c708984c0 100644 --- a/packages/gcc/gcc_4.0.0.bb +++ b/packages/gcc/gcc_4.0.0.bb @@ -7,10 +7,10 @@ MAINTAINER = "Gerald Britton " inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://ldflags.patch;patch=1" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc diff --git a/packages/gcc/gcc_4.0.2.bb b/packages/gcc/gcc_4.0.2.bb index a83a030c8b..b5b85a983f 100644 --- a/packages/gcc/gcc_4.0.2.bb +++ b/packages/gcc/gcc_4.0.2.bb @@ -8,7 +8,7 @@ PR = "r3" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -28,7 +28,7 @@ SRC_URI_append = " file://100-uclibc-conf.patch;patch=1 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" diff --git a/packages/gcc/gcc_4.1-20060217.bb b/packages/gcc/gcc_4.1-20060217.bb index 66880d752b..bcd9e9f235 100644 --- a/packages/gcc/gcc_4.1-20060217.bb +++ b/packages/gcc/gcc_4.1-20060217.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-99999" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-20060217.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -16,4 +16,4 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/4.1-20060217/gcc-4.1-2006 SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc diff --git a/packages/gcc/gcc_4.1.0.bb b/packages/gcc/gcc_4.1.0.bb index 4d44978dab..80a4b89d7c 100644 --- a/packages/gcc/gcc_4.1.0.bb +++ b/packages/gcc/gcc_4.1.0.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -16,7 +16,7 @@ SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.0/gcc-4.1.0.tar.bz2 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" diff --git a/packages/gcc/gcc_4.1.1.bb b/packages/gcc/gcc_4.1.1.bb index f9706649db..17367b67d4 100644 --- a/packages/gcc/gcc_4.1.1.bb +++ b/packages/gcc/gcc_4.1.1.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ @@ -39,7 +39,7 @@ HAS_G2C = "no" JAVA_arm = "" LANGUAGES = "c,c++" -include gcc3-build.inc +require gcc3-build.inc EXTRA_OECONF += " --disable-libssp " diff --git a/packages/gcc/gcc_4.2-20060513.bb b/packages/gcc/gcc_4.2-20060513.bb index 68fa6d8d06..5b68fb254b 100644 --- a/packages/gcc/gcc_4.2-20060513.bb +++ b/packages/gcc/gcc_4.2-20060513.bb @@ -7,7 +7,7 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \ file://arm-nolibfloat.patch;patch=1 \ @@ -16,7 +16,7 @@ SRC_URI = "http://ftp.nluug.nl/languages/gcc/snapshots/${PV}/gcc-${PV}.tar.bz2 \ SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -include gcc4-build.inc +require gcc4-build.inc EXTRA_OECONF += "--disable-libssp" FORTRAN = "" diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb index 02e984358f..d1053dad1d 100644 --- a/packages/gcc/gcc_csl-arm-2005q3.bb +++ b/packages/gcc/gcc_csl-arm-2005q3.bb @@ -10,7 +10,7 @@ FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \ file://gcc_optab_arm.patch;patch=1" @@ -22,6 +22,6 @@ do_unpack2() { addtask unpack2 after do_unpack before do_patch -include gcc3-build.inc +require gcc3-build.inc S = "${WORKDIR}/gcc-2005q3" diff --git a/packages/gcc/gcc_csl-arm-cvs.bb b/packages/gcc/gcc_csl-arm-cvs.bb index bc704d51db..20b18b1085 100644 --- a/packages/gcc/gcc_csl-arm-cvs.bb +++ b/packages/gcc/gcc_csl-arm-cvs.bb @@ -1,4 +1,4 @@ -include gcc_csl-arm.bb +require gcc_csl-arm.bb PV = "3.4.4+csl-arm-${SRCDATE}" BINV = "3.4.4" diff --git a/packages/gcc/gcc_csl-arm.bb b/packages/gcc/gcc_csl-arm.bb index d437ece065..5bf4fb0b99 100644 --- a/packages/gcc/gcc_csl-arm.bb +++ b/packages/gcc/gcc_csl-arm.bb @@ -12,12 +12,12 @@ DEFAULT_PREFERENCE = "-1" inherit autotools gettext -include gcc-package.inc +require gcc-package.inc SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/cvsroot/gcc;method=pserver;tag=csl-arm-branch;module=gcc;date=${SRCDATE} \ file://gcc34-arm-tune.patch;patch=1" -include gcc3-build.inc +require gcc3-build.inc S = "${WORKDIR}/gcc" -- cgit v1.2.3 From e1296c8418c6a4fd58223f25503ec151123665fc Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 5 Aug 2006 13:41:24 +0000 Subject: packages/gcc: require the right files, add a gcc4-build-sdk (review please) The gcc 4.1.x sdk tries to require gcc4-build-sdk.inc which doesn't exist. Copy the gcc3-build-sdk.inc and ask florian to verify it. --- packages/gcc/gcc-cross_csl-arm-2005q3.bb | 2 +- packages/gcc/gcc-cross_csl-arm-cvs.bb | 2 +- packages/gcc/gcc-cross_csl-arm.bb | 2 +- packages/gcc/gcc4-build-sdk.inc | 27 +++++++++++++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 packages/gcc/gcc4-build-sdk.inc diff --git a/packages/gcc/gcc-cross_csl-arm-2005q3.bb b/packages/gcc/gcc-cross_csl-arm-2005q3.bb index 96eaee7682..7ea8a0d166 100644 --- a/packages/gcc/gcc-cross_csl-arm-2005q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2005q3.bb @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -require gcc3-cross-build.inc +require gcc3-build-cross.inc # cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm-cvs.bb b/packages/gcc/gcc-cross_csl-arm-cvs.bb index 22fdd3701a..b894c2a86e 100644 --- a/packages/gcc/gcc-cross_csl-arm-cvs.bb +++ b/packages/gcc/gcc-cross_csl-arm-cvs.bb @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -require gcc3-cross-build.inc +require gcc3-build-cross.inc # cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc-cross_csl-arm.bb b/packages/gcc/gcc-cross_csl-arm.bb index 6cd825d079..95bda6c95e 100644 --- a/packages/gcc/gcc-cross_csl-arm.bb +++ b/packages/gcc/gcc-cross_csl-arm.bb @@ -10,6 +10,6 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" # cross build -require gcc3-cross-build.inc +require gcc3-build-cross.inc # cross packaging require gcc-package-cross.inc diff --git a/packages/gcc/gcc4-build-sdk.inc b/packages/gcc/gcc4-build-sdk.inc new file mode 100644 index 0000000000..e2ec9565a7 --- /dev/null +++ b/packages/gcc/gcc4-build-sdk.inc @@ -0,0 +1,27 @@ +USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' + +SRC_URI += 'file://sdk-libstdc++-includes.patch;patch=1' + +STAGING_TARGET_INCDIR = "${STAGING_DIR}/${TARGET_SYS}/include" +STAGING_TARGET_LIBDIR = "${STAGING_DIR}/${TARGET_SYS}/lib" + +do_configure () { + (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 () { + export CC="${BUILD_CC}" + export AR_FOR_TARGET="${TARGET_SYS}-ar" + export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib" + 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}" +} -- cgit v1.2.3 From 10ec0dfae9ed80e35299b4db88ef89b3319b6dce Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 5 Aug 2006 13:45:24 +0000 Subject: packages/glibc: Use require for the glibc files Use require for the glibc files --- packages/glibc/glibc-initial_2.2.5.bb | 2 +- packages/glibc/glibc-initial_2.3.2+cvs20040726.bb | 2 +- packages/glibc/glibc-initial_2.3.2.bb | 2 +- packages/glibc/glibc-initial_2.4.bb | 2 +- packages/glibc/glibc-initial_cvs.bb | 2 +- packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb | 2 +- packages/glibc/glibc-intermediate_2.4.bb | 2 +- packages/glibc/glibc-intermediate_cvs.bb | 2 +- packages/glibc/glibc_2.2.5.bb | 2 +- packages/glibc/glibc_2.3.2+cvs20040726.bb | 2 +- packages/glibc/glibc_2.3.2.bb | 2 +- packages/glibc/glibc_2.3.3+cvs20041128.bb | 2 +- packages/glibc/glibc_2.3.3+cvs20050221.bb | 2 +- packages/glibc/glibc_2.3.3+cvs20050420.bb | 2 +- packages/glibc/glibc_2.3.3.bb | 2 +- packages/glibc/glibc_2.3.5+cvs20050627.bb | 2 +- packages/glibc/glibc_2.4.bb | 2 +- packages/glibc/glibc_cvs.bb | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/glibc/glibc-initial_2.2.5.bb b/packages/glibc/glibc-initial_2.2.5.bb index 21d91ae20f..882684e9b7 100644 --- a/packages/glibc/glibc-initial_2.2.5.bb +++ b/packages/glibc/glibc-initial_2.2.5.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb index 0bfa49e030..78bdaadd9a 100644 --- a/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc-initial_2.3.2+cvs20040726.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" DEPENDS = "linux-libc-headers" diff --git a/packages/glibc/glibc-initial_2.3.2.bb b/packages/glibc/glibc-initial_2.3.2.bb index 53e7948f72..4433ced868 100644 --- a/packages/glibc/glibc-initial_2.3.2.bb +++ b/packages/glibc/glibc-initial_2.3.2.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" DEPENDS = "linux-libc-headers" diff --git a/packages/glibc/glibc-initial_2.4.bb b/packages/glibc/glibc-initial_2.4.bb index dd2b9b2524..9ba2ac37cc 100644 --- a/packages/glibc/glibc-initial_2.4.bb +++ b/packages/glibc/glibc-initial_2.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEPENDS = "linux-libc-headers" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/packages/glibc/glibc-initial_cvs.bb b/packages/glibc/glibc-initial_cvs.bb index 422e8b7110..70c7e161a4 100644 --- a/packages/glibc/glibc-initial_cvs.bb +++ b/packages/glibc/glibc-initial_cvs.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEPENDS = "linux-libc-headers" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" diff --git a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb index 3d9c6afd7d..bc582bb2cc 100644 --- a/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc-intermediate_2.3.2+cvs20040726.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc-intermediate_2.4.bb b/packages/glibc/glibc-intermediate_2.4.bb index 819cd0950f..01ce8bb9a8 100644 --- a/packages/glibc/glibc-intermediate_2.4.bb +++ b/packages/glibc/glibc-intermediate_2.4.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE = "-1" diff --git a/packages/glibc/glibc-intermediate_cvs.bb b/packages/glibc/glibc-intermediate_cvs.bb index 11e78a5d59..2283037c87 100644 --- a/packages/glibc/glibc-intermediate_cvs.bb +++ b/packages/glibc/glibc-intermediate_cvs.bb @@ -1,5 +1,5 @@ SECTION = "libs" -include glibc_${PV}.bb +require glibc_${PV}.bb DEFAULT_PREFERENCE = "-1" diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index 740d2dc006..22800665b3 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -245,7 +245,7 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass # Unslung distribution specific packages follow ... diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index bec6df2005..4ebce30faf 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -131,4 +131,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 8b01a9e5c3..c1202c853c 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -222,4 +222,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index ca25c2955c..0b67ac2f83 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -158,4 +158,4 @@ do_stage() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${CROSS_DIR}/${TARGET_SYS}/lib/libc.so } -include glibc-package.bbclass +require glibc-package.bbclass diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index b37bfd616f..706caf06ea 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -136