diff options
Diffstat (limited to 'packages')
84 files changed, 1522 insertions, 234 deletions
diff --git a/packages/e17/e-iconbar_20050926.bb b/packages/e17/e-iconbar_20060101.bb index ad9f004a8b..7bfd2d0c7e 100644 --- a/packages/e17/e-iconbar_20050926.bb +++ b/packages/e17/e-iconbar_20060101.bb @@ -3,10 +3,9 @@ DEPENDS = "edb eet evas-x11 ecore-x11 edje esmart-x11 imlib2-x11" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/iconbar" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/iconbar;date=${PV}" S = "${WORKDIR}/iconbar" inherit autotools diff --git a/packages/e17/e-modules_20050926.bb b/packages/e17/e-modules_20060101.bb index f6699b887b..3a50083130 100644 --- a/packages/e17/e-modules_20050926.bb +++ b/packages/e17/e-modules_20060101.bb @@ -3,12 +3,11 @@ DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r1" inherit autotools -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_modules" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e_modules;date=${PV}" S = "${WORKDIR}/e_modules" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" diff --git a/packages/e17/e-utils_20051009.bb b/packages/e17/e-utils_20060101.bb index 6f1260f8fe..18cd7a93cf 100644 --- a/packages/e17/e-utils_20051009.bb +++ b/packages/e17/e-utils_20060101.bb @@ -3,12 +3,11 @@ DEPENDS = "virtual/ecore virtual/evas virtual/esmart edje eet ewl engrave virtua LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r1" inherit autotools -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e_utils" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e_utils;date=${PV}" S = "${WORKDIR}/e_utils" FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-wm_0.16.999.018.bb b/packages/e17/e-wm_0.16.999.022.bb index 25915b2872..60d5fe6571 100644 --- a/packages/e17/e-wm_0.16.999.018.bb +++ b/packages/e17/e-wm_0.16.999.022.bb @@ -3,7 +3,6 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r3" SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz \ @@ -11,7 +10,7 @@ SRC_URI = "http://enlightenment.freedesktop.org/files/enlightenment-${PV}.tar.gz file://remove-large-fonts.patch;patch=1 \ file://disable-splash.patch;patch=1 \ file://Xsession.d/98enlightenment \ - cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e/data/themes;date=20050926" + cvs://anonymous@thinktux.net/root;module=e17/apps/e/data/themes;date=20050926" # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/default_entry.edc?rev=1.1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/focus.png?rev=1.1 \ # http://cvs.sourceforge.net/viewcvs.py/*checkout*/enlightenment/e17/apps/e/data/themes/images/entry.png?rev=1.1 \ diff --git a/packages/e17/e-wm_20050926.bb b/packages/e17/e-wm_20060101.bb index 5fec497c4f..c3179e18d0 100644 --- a/packages/e17/e-wm_20050926.bb +++ b/packages/e17/e-wm_20060101.bb @@ -3,15 +3,11 @@ DEPENDS = "evas-x11 ecore-x11 edje eet embryo e" LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r3" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e;date=${PV} \ file://Xsession.d/98enlightenment \ file://fix-configure.patch;patch=1 \ - file://add-menu-autoscroll-options.patch;patch=1 \ file://remove-large-fonts.patch;patch=1" S = "${WORKDIR}/e" diff --git a/packages/e17/eclair_20050926.bb b/packages/e17/eclair_20060101.bb index 0a4b78d397..7e1d1e5bda 100644 --- a/packages/e17/eclair_20050926.bb +++ b/packages/e17/eclair_20060101.bb @@ -4,10 +4,9 @@ DEPENDS = "evas-x11 ecore-x11 embryo imlib2-x11 edje-native edje libxine-x11 emo LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/eclair" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/eclair;date=${PV}" S = "${WORKDIR}/eclair" inherit autotools diff --git a/packages/e17/engage_20050926.bb b/packages/e17/engage_20060101.bb index 077858d8eb..bd925a969c 100644 --- a/packages/e17/engage_20050926.bb +++ b/packages/e17/engage_20060101.bb @@ -5,7 +5,7 @@ SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r2" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=misc/engage \ +SRC_URI = "cvs://anonymous@thinktux.net/root;module=misc/engage;date=${PV} \ file://no-local-includes.patch;patch=1" S = "${WORKDIR}/engage" diff --git a/packages/e17/entice_20050926.bb b/packages/e17/entice_20060101.bb index 44f668de1e..05023f7fa2 100644 --- a/packages/e17/entice_20050926.bb +++ b/packages/e17/entice_20060101.bb @@ -5,10 +5,9 @@ DEPENDS = "edb evas-x11 ecore-x11 edje epsilon esmart-x11" LICENSE = "MIT" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/entice;date=${PV}" S = "${WORKDIR}/entice" inherit autotools diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch index c909201882..83ed3acf84 100644 --- a/packages/e17/entrance/config-db.patch +++ b/packages/e17/entrance/config-db.patch @@ -1,52 +1,43 @@ -diff -Nur entrance~/data/config/build_config.sh.in entrance/data/config/build_config.sh.in ---- entrance~/data/config/build_config.sh.in 2005-09-29 14:58:41.000000000 -0700 -+++ entrance/data/config/build_config.sh.in 2005-09-29 15:01:04.000000000 -0700 -@@ -3,7 +3,7 @@ - rm -f $DB +--- entrance/data/config/build_config.sh.in.~1.18.~ 2006-01-11 18:46:48.000000000 -0800 ++++ entrance/data/config/build_config.sh.in 2006-01-11 21:52:54.000000000 -0800 +@@ -18,29 +18,14 @@ + #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/" + #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/" + ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to" +-ecore_config -c $DB -k /entrance/greeting/after -s "" +-ecore_config -c $DB -k /entrance/session/count -i 7 +-ecore_config -c $DB -k /entrance/session/0/session -s "default" ++ecore_config -c $DB -k /entrance/greeting/after -s " e17/OE" ++ecore_config -c $DB -k /entrance/session/count -i 2 ++ecore_config -c $DB -k /entrance/session/0/session -s "/etc/X11/Sessions/Enlightenment" + ecore_config -c $DB -k /entrance/session/0/title -s "Default" + ecore_config -c $DB -k /entrance/session/0/icon -s "default.png" + ecore_config -c $DB -k /entrance/session/1/icon -s "enlightenment.png" + ecore_config -c $DB -k /entrance/session/1/title -s "E17" +-ecore_config -c $DB -k /entrance/session/1/session -s "@prefix@/bin/enlightenment" +-ecore_config -c $DB -k /entrance/session/2/session -s "kde" +-ecore_config -c $DB -k /entrance/session/2/title -s "KDE" +-ecore_config -c $DB -k /entrance/session/2/icon -s "kde.png" +-ecore_config -c $DB -k /entrance/session/3/session -s "gnome" +-ecore_config -c $DB -k /entrance/session/3/title -s "Gnome" +-ecore_config -c $DB -k /entrance/session/3/icon -s "gnome.png" +-ecore_config -c $DB -k /entrance/session/4/session -s "Enlightenment" +-ecore_config -c $DB -k /entrance/session/4/title -s "E16" +-ecore_config -c $DB -k /entrance/session/4/icon -s "enlightenment.png" +-ecore_config -c $DB -k /entrance/session/5/session -s "xfce" +-ecore_config -c $DB -k /entrance/session/5/title -s "XFce" +-ecore_config -c $DB -k /entrance/session/5/icon -s "xfce.png" +-ecore_config -c $DB -k /entrance/session/6/session -s "failsafe" +-ecore_config -c $DB -k /entrance/session/6/title -s "Failsafe" +-ecore_config -c $DB -k /entrance/session/6/icon -s "failsafe.png" ++ecore_config -c $DB -k /entrance/session/1/session -s "/etc/X11/Sessions/Enlightenment" + ecore_config -c $DB -k /entrance/system/reboot -i 1 + ecore_config -c $DB -k /entrance/system/halt -i 1 + ecore_config -c $DB -k /entrance/user/remember -i 1 +@@ -50,5 +35,5 @@ + ecore_config -c $DB -k /entrance/presel/mode -i 1 - # set auth to 1 for pam, 2 for shadow --ecore_config $DB set /entrance/auth int @auth_mode@ -+ecore_config $DB set /entrance/auth int 0 - - # uncomment the below to enable experimental OpenGL hardware acceleration - #ecore_config $DB set /entrance/engine int 1 -@@ -18,32 +18,17 @@ - #ecore_config $DB set /entrance/fonts/0/str str "/usr/share/fonts/truetype/" - #ecore_config $DB set /entrance/fonts/1/str str "/usr/X11R6/lib/X11/fonts/Truetype/" - ecore_config $DB set /entrance/greeting/before str "Welcome to" --ecore_config $DB set /entrance/greeting/after str "" --ecore_config $DB set /entrance/session/count int 8 --ecore_config $DB set /entrance/session/0/session str "default" -+ecore_config $DB set /entrance/greeting/after str " e17/OE" -+ecore_config $DB set /entrance/session/count int 3 -+ecore_config $DB set /entrance/session/0/session str "/etc/X11/Sessions/Enlightenment" - ecore_config $DB set /entrance/session/0/title str "Default" - ecore_config $DB set /entrance/session/0/icon str "default.png" - ecore_config $DB set /entrance/session/1/icon str "enlightenment.png" - ecore_config $DB set /entrance/session/1/title str "Enlightenment" --ecore_config $DB set /entrance/session/1/session str "Enlightenment" --ecore_config $DB set /entrance/session/2/session str "kde" --ecore_config $DB set /entrance/session/2/title str "KDE" --ecore_config $DB set /entrance/session/2/icon str "kde.png" --ecore_config $DB set /entrance/session/3/session str "gnome" --ecore_config $DB set /entrance/session/3/title str "Gnome" --ecore_config $DB set /entrance/session/3/icon str "gnome.png" --ecore_config $DB set /entrance/session/4/session str "blackbox" --ecore_config $DB set /entrance/session/4/title str "Blackbox" --ecore_config $DB set /entrance/session/4/icon str "blackbox.png" --ecore_config $DB set /entrance/session/5/session str "sawfish" --ecore_config $DB set /entrance/session/5/title str "Sawfish" --ecore_config $DB set /entrance/session/5/icon str "default.png" --ecore_config $DB set /entrance/session/6/session str "xfce" --ecore_config $DB set /entrance/session/6/title str "XFce" --ecore_config $DB set /entrance/session/6/icon str "xfce.png" --ecore_config $DB set /entrance/session/7/session str "failsafe" --ecore_config $DB set /entrance/session/7/title str "Failsafe" --ecore_config $DB set /entrance/session/7/icon str "failsafe.png" -+ecore_config $DB set /entrance/session/1/session str "/etc/X11/Sessions/Enlightenment" -+ecore_config $DB set /entrance/session/2/session str "/etc/X11/Sessions/Failsafe" -+ecore_config $DB set /entrance/session/2/title str "Failsafe" -+ecore_config $DB set /entrance/session/2/icon str "failsafe.png" - ecore_config $DB set /entrance/system/reboot int 1 - ecore_config $DB set /entrance/system/halt int 1 - ecore_config $DB set /entrance/user/remember int 1 + # for Entranced +-ecore_config -c $DB -k /entranced/xserver -s "/usr/X11R6/bin/X -quiet -nolisten tcp" ++ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver" + ecore_config -c $DB -k /entranced/attempts -i 5 diff --git a/packages/e17/entrance_20050926.bb b/packages/e17/entrance_20060101.bb index 9599c9fcac..64fdac9e09 100644 --- a/packages/e17/entrance_20050926.bb +++ b/packages/e17/entrance_20060101.bb @@ -6,11 +6,9 @@ DEPENDS = "edb edb-native evas-x11 ecore-x11 edje esmart-x11 bash keylaunch dete RDEPENDS += "bash keylaunch detect-stylus xserver-common glibc-gconv-iso8859-1" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" -SRCDATE = "${PV}" PR = "r9" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entrance \ - file://Xserver.patch;patch=1 \ +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/entrance;date=${PV} \ file://config-db.patch;patch=1 \ file://allow-missing-xsession.patch;patch=1 \ file://run-Xinit.patch;patch=1 \ @@ -26,7 +24,8 @@ INITSCRIPT_NAME = "entrance" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ - --with-xsession=/etc/X11/Xsession" + --with-xsession=/etc/X11/Xsession \ + --with-auth-mode=0" FILES += "${datadir}" diff --git a/packages/e17/evidence_20050926.bb b/packages/e17/evidence_20060101.bb index f27f8f1076..5c24152b17 100644 --- a/packages/e17/evidence_20050926.bb +++ b/packages/e17/evidence_20060101.bb @@ -6,9 +6,8 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype" RDEPENDS += "examine" PR = "r0" -SRCDATE = "${PV}" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence;date=${PV}" S = "${WORKDIR}/evidence" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \ diff --git a/packages/e17/examine_20050926.bb b/packages/e17/examine_20060101.bb index 3a78a961a4..45ceb65458 100644 --- a/packages/e17/examine_20050926.bb +++ b/packages/e17/examine_20060101.bb @@ -4,9 +4,8 @@ LICENSE = "MIT" SECTION = "e/apps" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" PR = "r0" -SRCDATE = "${PV}" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/examine" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/examine;date=${PV}" S = "${WORKDIR}/examine" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc" diff --git a/packages/efl/e_0.16.999.018.bb b/packages/efl/e_0.16.999.022.bb index 35bb776269..35bb776269 100644 --- a/packages/efl/e_0.16.999.018.bb +++ b/packages/efl/e_0.16.999.022.bb diff --git a/packages/efl/e_20050926.bb b/packages/efl/e_20060101.bb index e9efc5123e..495b647101 100644 --- a/packages/efl/e_20050926.bb +++ b/packages/efl/e_20060101.bb @@ -1,14 +1,11 @@ DESCRIPTION = "Enlightenment Window Mananger Library" DEPENDS = "virtual/evas virtual/ecore edje eet embryo" LICENSE = "MIT" -SRCDATE = "${PV}" PR = "r1" inherit efl -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/e \ +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/apps/e;date=${PV} \ file://fix-configure.patch;patch=1" S = "${WORKDIR}/e" diff --git a/packages/efl/ecore-fb_0.9.9.018.bb b/packages/efl/ecore-fb_0.9.9.022.bb index a5a843aeb4..a5a843aeb4 100644 --- a/packages/efl/ecore-fb_0.9.9.018.bb +++ b/packages/efl/ecore-fb_0.9.9.022.bb diff --git a/packages/efl/ecore-fb_20050907.bb b/packages/efl/ecore-fb_20060101.bb index b60cd7e1fd..4badfa42ec 100644 --- a/packages/efl/ecore-fb_20050907.bb +++ b/packages/efl/ecore-fb_20060101.bb @@ -1,9 +1,7 @@ include ecore.inc PR = "r1" -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore;date=${PV}" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV}" S = "${WORKDIR}/ecore" ### add tslib support diff --git a/packages/efl/ecore-native_0.9.9.018.bb b/packages/efl/ecore-native_0.9.9.022.bb index 299470841c..299470841c 100644 --- a/packages/efl/ecore-native_0.9.9.018.bb +++ b/packages/efl/ecore-native_0.9.9.022.bb diff --git a/packages/efl/ecore-native_20060101.bb b/packages/efl/ecore-native_20060101.bb new file mode 100644 index 0000000000..285fa99a3a --- /dev/null +++ b/packages/efl/ecore-native_20060101.bb @@ -0,0 +1,33 @@ +include ecore.inc +PR = "r1" + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \ + file://remove-tslib-configure.patch;patch=1" +S = "${WORKDIR}/ecore" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-poll \ + --enable-ecore-dbus \ + --enable-ecore-evas \ + --enable-ecore-evas-fb \ + --disable-ecore-evas-x \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-config \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --disable-ecore-x \ + --disable-curl \ + --without-curl-config \ + --enable-ecore-config \ + --disable-openssl" + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus Ecore_Txt Ecore_Fb Ecore_Con Ecore_Ipc Ecore_Evas Ecore_Config" + +inherit native +# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it +# DEPENDS = "curl-native eet-native evas-native" +DEPENDS = "eet-native evas-native" +PROVIDES = "ecore-native"
\ No newline at end of file diff --git a/packages/efl/ecore-x11_0.9.9.018.bb b/packages/efl/ecore-x11_0.9.9.022.bb index 0927b59e03..0927b59e03 100644 --- a/packages/efl/ecore-x11_0.9.9.018.bb +++ b/packages/efl/ecore-x11_0.9.9.022.bb diff --git a/packages/efl/ecore-x11_20060101.bb b/packages/efl/ecore-x11_20060101.bb new file mode 100644 index 0000000000..cc4fc76de7 --- /dev/null +++ b/packages/efl/ecore-x11_20060101.bb @@ -0,0 +1,29 @@ +include ecore.inc +DEPENDS += "evas-x11" +PR = "r2" + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/ecore;date=${PV} \ + file://evas-x11-include.patch;patch=1 \ + file://remove-tslib-configure.patch;patch=1" +S = "${WORKDIR}/ecore" + +EXTRA_OECONF = "--enable-ecore-fb \ + --enable-ecore-job \ + --enable-ecore-file \ + --enable-ecore-dbus \ + --enable-ecore-evas-fb \ + --enable-ecore-evas-x \ + --disable-ecore-evas-gl \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-txt \ + --enable-ecore-x \ + --enable-ecore-config \ + --disable-openssl \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} " + +parts = "Ecore Ecore_Job Ecore_File Ecore_DBus \ + Ecore_Txt Ecore_Fb Ecore_Con \ + Ecore_Ipc Ecore_Evas Ecore_Config \ + Ecore_X" diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc index ffc9df6b92..59d1af6cb3 100644 --- a/packages/efl/ecore.inc +++ b/packages/efl/ecore.inc @@ -12,7 +12,7 @@ inherit efl SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \ file://configure.patch;patch=1 \ file://fix-tslib-configure.patch;patch=1 \ - cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/ecore/m4;date=20050926" + cvs://anonymous@thinktux.net/root;module=e17/libs/ecore/m4;date=20050926" S = "${WORKDIR}/ecore-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" @@ -24,9 +24,11 @@ headers = "" parts = "<override me>" do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 + if [ -e "${WORKDIR}/m4" ]; then + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 + fi } do_stage_append() { diff --git a/packages/efl/ecore/remove-tslib-configure.patch b/packages/efl/ecore/remove-tslib-configure.patch new file mode 100644 index 0000000000..40ed1c2c33 --- /dev/null +++ b/packages/efl/ecore/remove-tslib-configure.patch @@ -0,0 +1,15 @@ +--- ecore/configure.in.~1.125.~ 2005-11-29 01:13:26.000000000 -0800 ++++ ecore/configure.in 2006-01-12 11:21:42.000000000 -0800 +@@ -101,12 +101,6 @@ + AC_CHECK_FUNCS(gettimeofday) + + tslib_libs="" +-AC_CHECK_HEADER(tslib.h, +- [ +- tslib_libs="-ltslib" +- AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module]) +- ] +-) + AC_SUBST(tslib_libs) + + AC_CHECK_HEADERS(netinet/in.h) diff --git a/packages/efl/edb-native_20060101.bb b/packages/efl/edb-native_20060101.bb new file mode 100644 index 0000000000..d83a3b77c6 --- /dev/null +++ b/packages/efl/edb-native_20060101.bb @@ -0,0 +1,9 @@ +include edb_${PV}.bb +inherit native +DEPENDS = "zlib-native" + +EXTRA_OECONF += "--disable-gtk --disable-ncurses" + +do_stage_append () { + install -m 0755 tools/.libs/edb_ed ${STAGING_BINDIR} +} diff --git a/packages/efl/edb_20060101.bb b/packages/efl/edb_20060101.bb new file mode 100644 index 0000000000..0d0d899037 --- /dev/null +++ b/packages/efl/edb_20060101.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "EDB is a database convenience library wrapped around the \ +Berkeley DB 2.7.7 by Sleepycat Software." +DEPENDS = "zlib ncurses" +LICENSE = "BSD" +PR = "r1" + +inherit efl + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edb;date=${PV}" +S = "${WORKDIR}/edb" + +EXTRA_OECONF += "--disable-gtk" + +libdirectory = "src" + +FILES_${PN}-dev += "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed" +RDEPENDS_${PN}-dev += "ncurses"
\ No newline at end of file diff --git a/packages/efl/edje-native_0.5.0.018.bb b/packages/efl/edje-native_0.5.0.022.bb index 523c38ba46..523c38ba46 100644 --- a/packages/efl/edje-native_0.5.0.018.bb +++ b/packages/efl/edje-native_0.5.0.022.bb diff --git a/packages/efl/edje-native_20060101.bb b/packages/efl/edje-native_20060101.bb new file mode 100644 index 0000000000..523c38ba46 --- /dev/null +++ b/packages/efl/edje-native_20060101.bb @@ -0,0 +1,28 @@ +include edje_${PV}.bb +PR = "r2" + +REAL_TARGET_SYS := ${TARGET_SYS} + +inherit native +DEPENDS = "evas-native ecore-native eet-native embryo-native imlib2-native" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/edje" + +EXTRA_OECONF = "--with-fb-only \ + --with-evas-config=${STAGING_BINDIR}/evas-config-native \ + --with-ecore-config=${STAGING_BINDIR}/ecore-config-native \ + --with-eet-config=${STAGING_BINDIR}/eet-config-native \ + --with-embryo-config=${STAGING_BINDIR}/embryo-config-native \ + --with-imlib2-config=${STAGING_BINDIR}/imlib2-config-native " + +do_configure_prepend() { + sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c +# sed -i 's:/usr/bin/cpp:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-cpp:' ${S}/src/bin/edje_cc_parse.c +# sed -i 's:/usr/bin/gcc:${STAGING_DIR}/cross/bin/${REAL_TARGET_SYS}-gcc:' ${S}/src/bin/edje_cc_parse.c +} + +do_stage_append() { + edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir` + # could also use ${STAGING_DATADIR}/edje/include + install -d $edje_data_dir/include + install -m 0644 data/include/edje.inc $edje_data_dir/include +} diff --git a/packages/efl/edje_0.5.0.018.bb b/packages/efl/edje_0.5.0.022.bb index 3c3a4fdcc7..9315639af2 100644 --- a/packages/efl/edje_0.5.0.018.bb +++ b/packages/efl/edje_0.5.0.022.bb @@ -6,7 +6,7 @@ PR = "r1" inherit efl -SRC_URI += "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/edje/m4;date=20050926" +SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101" LEAD_SONAME = "libedje.so" diff --git a/packages/efl/edje_20060101.bb b/packages/efl/edje_20060101.bb new file mode 100644 index 0000000000..9a23201f80 --- /dev/null +++ b/packages/efl/edje_20060101.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Edje is a complex graphical design & layout library." +# can also install vim data files +DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2" +LICENSE = "MIT" +PR = "r1" + +inherit efl + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/edje;date=${PV}" +S = "${WORKDIR}/edje" + +LEAD_SONAME = "libedje.so" + +FILES_${PN}-dev += "${bindir}" + +RDEPENDS_${PN}-dev += "cpp" + diff --git a/packages/efl/eet-native_0.9.10.018.bb b/packages/efl/eet-native_0.9.10.022.bb index fa20c9fb30..fa20c9fb30 100644 --- a/packages/efl/eet-native_0.9.10.018.bb +++ b/packages/efl/eet-native_0.9.10.022.bb diff --git a/packages/efl/eet-native_20060101.bb b/packages/efl/eet-native_20060101.bb new file mode 100644 index 0000000000..fa20c9fb30 --- /dev/null +++ b/packages/efl/eet-native_20060101.bb @@ -0,0 +1,7 @@ +include eet_${PV}.bb +inherit native +DEPENDS = "zlib-native jpeg-native" + +do_stage_append() { + install -m 0755 src/bin/.libs/eet ${STAGING_BINDIR} +} diff --git a/packages/efl/eet_0.9.10.018.bb b/packages/efl/eet_0.9.10.022.bb index c0f89b1064..c0f89b1064 100644 --- a/packages/efl/eet_0.9.10.018.bb +++ b/packages/efl/eet_0.9.10.022.bb diff --git a/packages/efl/eet_20060101.bb b/packages/efl/eet_20060101.bb new file mode 100644 index 0000000000..70dde944fa --- /dev/null +++ b/packages/efl/eet_20060101.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "EET is a tiny library designed to write an \ +arbitary set of chunks of data to a file and optionally compress \ +each chunk (very much like a zip file) and allow fast \ +random-access reading of the file later on." +DEPENDS = "zlib jpeg" +LICENSE = "BSD" +PR = "r1" + +inherit efl + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/eet;date=${PV}" +S = "${WORKDIR}/eet" diff --git a/packages/efl/embryo-native_0.9.1.018.bb b/packages/efl/embryo-native_0.9.1.022.bb index a33adb7bd2..a33adb7bd2 100644 --- a/packages/efl/embryo-native_0.9.1.018.bb +++ b/packages/efl/embryo-native_0.9.1.022.bb diff --git a/packages/efl/embryo-native_20060101.bb b/packages/efl/embryo-native_20060101.bb new file mode 100644 index 0000000000..a33adb7bd2 --- /dev/null +++ b/packages/efl/embryo-native_20060101.bb @@ -0,0 +1,7 @@ +include embryo_${PV}.bb +inherit native + +do_stage_append() { + install -d ${STAGING_DATADIR}/embryo/include + install -m 0644 include/default.inc ${STAGING_DATADIR}/embryo/include +}
\ No newline at end of file diff --git a/packages/efl/embryo_0.9.1.018.bb b/packages/efl/embryo_0.9.1.022.bb index 1802da1bca..1802da1bca 100644 --- a/packages/efl/embryo_0.9.1.018.bb +++ b/packages/efl/embryo_0.9.1.022.bb diff --git a/packages/efl/embryo_20060101.bb b/packages/efl/embryo_20060101.bb new file mode 100644 index 0000000000..58ff67869b --- /dev/null +++ b/packages/efl/embryo_20060101.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Embryo implements a C like scripting language used in various parts \ +of the Enlightenment project, namely Edje. Embryo's scripting language is based on \ +CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \ +Embryo allows scripting capabilities in places that otherwise wouldn't support \ +basic programming structures such as in Edje EDCs." +LICENSE = "MIT" +PR = "r1" + +inherit efl + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/embryo;date=${PV}" +S = "${WORKDIR}/embryo" diff --git a/packages/efl/emotion_20060101.bb b/packages/efl/emotion_20060101.bb new file mode 100644 index 0000000000..e450cf1d3a --- /dev/null +++ b/packages/efl/emotion_20060101.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Emotion is a multimedia library based on libxine" +LICENSE = "MIT" +DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine" +RDEPENDS += "libemotion-themes libemotion-plugins" +PR = "r2" + +#FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11 + +inherit efl + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/emotion;date=${PV}" +S = "${WORKDIR}/emotion" + +PACKAGES += "emotion-plugins" +FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so" + +do_compile_prepend() { + find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' +}
\ No newline at end of file diff --git a/packages/efl/engrave_20050926.bb b/packages/efl/engrave_20060101.bb index 8ee284fb19..e3b64a82d3 100644 --- a/packages/efl/engrave_20050926.bb +++ b/packages/efl/engrave_20060101.bb @@ -5,7 +5,7 @@ DEPENDS = "virtual/evas virtual/ecore" inherit efl -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/engrave" +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/engrave;date=${PV}" S = "${WORKDIR}/engrave" do_stage_append() { diff --git a/packages/efl/epeg_20060101.bb b/packages/efl/epeg_20060101.bb new file mode 100644 index 0000000000..36ababb26f --- /dev/null +++ b/packages/efl/epeg_20060101.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Epeg is a small library for handling thumbnails." +LICENSE = "MIT" +DEPENDS = "jpeg" + +inherit efl + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/epeg;date=${PV}" +S = "${WORKDIR}/epeg" diff --git a/packages/efl/esmart-fb_20060101.bb b/packages/efl/esmart-fb_20060101.bb new file mode 100644 index 0000000000..06360528a2 --- /dev/null +++ b/packages/efl/esmart-fb_20060101.bb @@ -0,0 +1,21 @@ +include esmart.inc +PR = "r0" + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}" +S = "${WORKDIR}/esmart" + +SRC_URI += "file://disable-x-only-features.patch;patch=1" + +myheaders = "esmart_container/Esmart_Container.h \ + esmart_draggies/Esmart_Draggies.h \ + esmart_file_dialog/Esmart_File_Dialog.h \ + esmart_text_entry/Esmart_Text_Entry.h \ + esmart_textarea/Esmart_Textarea.h \ + esmart_thumb/Esmart_Thumb.h" + +mylibraries = "esmart_container \ + esmart_draggies \ + esmart_file_dialog \ + esmart_text_entry \ + esmart_textarea \ + esmart_thumb" diff --git a/packages/efl/esmart-x11_20060101.bb b/packages/efl/esmart-x11_20060101.bb new file mode 100644 index 0000000000..88684e6851 --- /dev/null +++ b/packages/efl/esmart-x11_20060101.bb @@ -0,0 +1,27 @@ +include esmart.inc +PR = "r2" + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/esmart;date=${PV}" +SRC_URI += "file://ecore-fix.patch;patch=1 \ + file://include-stdio.patch;patch=1" +S = "${WORKDIR}/esmart" + +myheaders = "esmart_container/Esmart_Container.h \ + esmart_draggies/Esmart_Draggies.h \ + esmart_file_dialog/Esmart_File_Dialog.h \ + esmart_text_entry/Esmart_Text_Entry.h \ + esmart_textarea/Esmart_Textarea.h \ + esmart_thumb/Esmart_Thumb.h \ + esmart_trans_x11/Esmart_Trans_X11.h" + +mylibraries = "esmart_container \ + esmart_draggies \ + esmart_file_dialog \ + esmart_text_entry \ + esmart_textarea \ + esmart_thumb \ + esmart_trans_x11" + +do_compile_prepend() { + find ${S} -type f -name "*.[ch]" | xargs sed -i 's:NULL:0:g' +}
\ No newline at end of file diff --git a/packages/efl/etox_20060101.bb b/packages/efl/etox_20060101.bb new file mode 100644 index 0000000000..d460479c4f --- /dev/null +++ b/packages/efl/etox_20060101.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Etox is a type setting and text layout library based on Evas. \ +Etox helps you when it comes to displaying, moving, resizing, layering, \ +clipping, aligning and coloring fonts in different styles, and more." +DEPENDS = "edb virtual/evas virtual/ecore" +LICENSE = "MIT" +PR = "r1" + +inherit efl + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/etox;date=${PV}" +S = "${WORKDIR}/etox" + +libdirectory = "src" diff --git a/packages/efl/evas-fb_0.9.9.019.bb b/packages/efl/evas-fb_0.9.9.022.bb index b0c9d5bdb6..b0c9d5bdb6 100644 --- a/packages/efl/evas-fb_0.9.9.019.bb +++ b/packages/efl/evas-fb_0.9.9.022.bb diff --git a/packages/efl/evas-fb_20050907.bb b/packages/efl/evas-fb_20060101.bb index de783a7aeb..525aad5edf 100644 --- a/packages/efl/evas-fb_20050907.bb +++ b/packages/efl/evas-fb_20060101.bb @@ -4,7 +4,7 @@ PR = "r0" DEFAULT_PREFERENCE = "-1" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas;date=${PV} \ +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV} \ file://pkg.m4" S = "${WORKDIR}/evas" diff --git a/packages/efl/evas-native_0.9.9.019.bb b/packages/efl/evas-native_0.9.9.022.bb index 60bf7f6ae5..60bf7f6ae5 100644 --- a/packages/efl/evas-native_0.9.9.019.bb +++ b/packages/efl/evas-native_0.9.9.022.bb diff --git a/packages/efl/evas-native_20060101.bb b/packages/efl/evas-native_20060101.bb new file mode 100644 index 0000000000..6482571932 --- /dev/null +++ b/packages/efl/evas-native_20060101.bb @@ -0,0 +1,4 @@ +include evas-fb_${PV}.bb +inherit native +DEPENDS = "freetype-native libpng-native jpeg-native eet-native" +PROVIDES = "evas-native" diff --git a/packages/efl/evas-x11_0.9.9.019.bb b/packages/efl/evas-x11_0.9.9.022.bb index 75a080a26c..75a080a26c 100644 --- a/packages/efl/evas-x11_0.9.9.019.bb +++ b/packages/efl/evas-x11_0.9.9.022.bb diff --git a/packages/efl/evas-x11_20060101.bb b/packages/efl/evas-x11_20060101.bb new file mode 100644 index 0000000000..d32565dd3b --- /dev/null +++ b/packages/efl/evas-x11_20060101.bb @@ -0,0 +1,55 @@ +include evas.inc +DEPENDS += "x11 xext freetype" +PR = "r3" + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/evas;date=${PV}" +S = "${WORKDIR}/evas" + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-fb \ + --disable-directfb \ + --disable-buffer \ + --disable-software-qtopia \ + --enable-software-x11 \ + --disable-gl-x11 \ + --enable-image-loader-eet \ + --enable-image-loader-edb \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-small-dither-mask \ + --enable-cpu-c \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --disable-convert-16-rgb-555 \ + --disable-convert-16-rgb-444 \ + --disable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --disable-convert-24-rgb-888 \ + --disable-convert-24-bgr-888 \ + --disable-convert-32-rgb-8888 \ + --disable-convert-32-rgbx-8888 \ + --disable-convert-32-bgr-8888 \ + --disable-convert-32-bgrx-8888 \ + --disable-convert-32-rgb-rot-0 \ + --disable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-270" + +headers = "Evas_Engine_Software_X11.h \ + Evas_Engine_XRender_X11.h \ + Evas_Engine_Buffer.h \ + Evas_Engine_FB.h \ + Evas.h" + diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc index 14d5cd3e32..3f25fd5767 100644 --- a/packages/efl/evas.inc +++ b/packages/efl/evas.inc @@ -13,17 +13,20 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix( SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \ file://fix-configure.patch;patch=1 \ - cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/evas/m4;date=20050926" + cvs://anonymous@thinktux.net/root;module=e17/libs/evas/m4;date=20050926" S = "${WORKDIR}/evas-${PV}" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas" EXTRA_OECONF = "<override me>" + do_configure_prepend() { - install -d "${S}/m4" - install "${WORKDIR}/m4/"*.m4 "${S}/m4" - aclocal -I m4 + if [ -e "${WORKDIR}/m4" ]; then + install -d "${S}/m4" + install "${WORKDIR}/m4/"*.m4 "${S}/m4" + aclocal -I m4 + fi } do_configure () { @@ -32,6 +35,7 @@ do_configure () { #find ${S} -name Makefile | xargs sed -i 's:--tag=CC:-lfreetype --tag=CC:' } + headers = "<override me>" libraries = "libevas" diff --git a/packages/efl/imlib2-fb_1.2.1.006.bb b/packages/efl/imlib2-fb_1.2.1.009.bb index 09fecdaf8b..09fecdaf8b 100644 --- a/packages/efl/imlib2-fb_1.2.1.006.bb +++ b/packages/efl/imlib2-fb_1.2.1.009.bb diff --git a/packages/efl/imlib2-fb_20060101.bb b/packages/efl/imlib2-fb_20060101.bb new file mode 100644 index 0000000000..88f988e8a0 --- /dev/null +++ b/packages/efl/imlib2-fb_20060101.bb @@ -0,0 +1,8 @@ +include imlib2.inc + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}" +S = "${WORKDIR}/imlib2" + +EXTRA_OECONF = "--without-x \ + --disable-mmx" + diff --git a/packages/efl/imlib2-native_1.2.1.006.bb b/packages/efl/imlib2-native_1.2.1.009.bb index 6f8ebe477a..6f8ebe477a 100644 --- a/packages/efl/imlib2-native_1.2.1.006.bb +++ b/packages/efl/imlib2-native_1.2.1.009.bb diff --git a/packages/efl/imlib2-native_20060101.bb b/packages/efl/imlib2-native_20060101.bb new file mode 100644 index 0000000000..11c2fa4b89 --- /dev/null +++ b/packages/efl/imlib2-native_20060101.bb @@ -0,0 +1,11 @@ +include imlib2.inc + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}" +S = "${WORKDIR}/imlib2" + +inherit native +PROVIDES = "imlib2-native" +DEPENDS = "freetype-native libpng-native jpeg-native" + +EXTRA_OECONF = "--disable-mmx \ + --without-x" diff --git a/packages/efl/imlib2-x11_1.2.1.006.bb b/packages/efl/imlib2-x11_1.2.1.009.bb index 165321355c..165321355c 100644 --- a/packages/efl/imlib2-x11_1.2.1.006.bb +++ b/packages/efl/imlib2-x11_1.2.1.009.bb diff --git a/packages/efl/imlib2-x11_20060101.bb b/packages/efl/imlib2-x11_20060101.bb new file mode 100644 index 0000000000..1fab5cb292 --- /dev/null +++ b/packages/efl/imlib2-x11_20060101.bb @@ -0,0 +1,11 @@ +include imlib2.inc + +SRC_URI = "cvs://anonymous@thinktux.net/root;module=e17/libs/imlib2;date=${PV}" +S = "${WORKDIR}/imlib2" + +DEPENDS += "x11 xext" + +EXTRA_OECONF = "--disable-mmx \ + --with-x \ + --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR}" diff --git a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch new file mode 100644 index 0000000000..c195aad639 --- /dev/null +++ b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch @@ -0,0 +1,16 @@ +--- trunk/backends/xml-backend.c~ 2006-01-18 09:57:39.000000000 -0800 ++++ trunk/backends/xml-backend.c 2006-01-19 11:38:37.000000000 -0800 +@@ -115,6 +115,13 @@ + + typedef struct _XMLSource XMLSource; + ++extern GConfLock* ++gconf_get_lock (const gchar *lock_directory, ++ GError **err); ++extern gboolean ++gconf_release_lock (GConfLock *lock, ++ GError **err); ++ + /* XMLSource **/ + + struct _XMLSource { diff --git a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch new file mode 100644 index 0000000000..312a356c84 --- /dev/null +++ b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch @@ -0,0 +1,11 @@ +--- trunk/backends/Makefile~ 2006-01-19 09:52:22.000000000 -0800 ++++ trunk/backends/Makefile 2006-01-19 13:13:23.000000000 -0800 +@@ -84,7 +84,7 @@ + xml_test_OBJECTS = $(am_xml_test_OBJECTS) + xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \ +- $(top_builddir)/backends/libgconfbackend-oldxml.la ++ libgconfbackend-oldxml.la + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index dcd5209989..d6b79494be 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -12,6 +12,8 @@ PR = "r0" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ file://gconf-dbus-update.patch;patch=1;pnum=0 \ + file://xml-backend-locks-compile-fix.patch;patch=1 \ + file://xml-backend-oldxml-Makefile.patch \ file://69gconfd-dbus" inherit pkgconfig autotools @@ -25,6 +27,11 @@ EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SY HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" +do_compile_prepend() { + cd ${S} + patch -p1 < ../xml-backend-oldxml-Makefile.patch +} + do_stage() { oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/gconf/2/gconf/ diff --git a/packages/gtk-webcore/files/setHandle_segfault-fix.patch b/packages/gtk-webcore/files/setHandle_segfault-fix.patch new file mode 100644 index 0000000000..9ebdfeebe5 --- /dev/null +++ b/packages/gtk-webcore/files/setHandle_segfault-fix.patch @@ -0,0 +1,16 @@ +--- NRCore/kwiq/KWQResourceLoader.cpp.orig 2006-01-21 00:13:32.000000000 +0200 ++++ NRCore/kwiq/KWQResourceLoader.cpp 2006-01-20 23:52:59.000000000 +0200 +@@ -56,8 +56,11 @@ + void KWQResourceLoader::setHandle(WebCoreResourceHandle* handle) + { + ASSERT(!_handle); +- handle->retain(); +- _handle = handle; ++ if (handle) ++ { ++ handle->retain(); ++ _handle = handle; ++ } + } + + void KWQResourceLoader::receivedResponse(KWIQResponse* response) diff --git a/packages/gtk-webcore/osb-nrcore_20050430.bb b/packages/gtk-webcore/osb-nrcore_20050430.bb index 758058d355..2f5f2f6046 100644 --- a/packages/gtk-webcore/osb-nrcore_20050430.bb +++ b/packages/gtk-webcore/osb-nrcore_20050430.bb @@ -7,10 +7,13 @@ SECTION = "gpe" FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}" PV = "0.5.0+cvs${FIXEDSRCDATE}" +PR = "r1" DEPENDS = "glib-2.0 gtk+ pango osb-jscore" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE}" +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \ + file://KWIQ-mimetype-segfault.patch;patch=1 \ + file://setHandle_segfault-fix.patch;patch=1" S = "${WORKDIR}/NRCore" LEAD_SONAME = "libnrcore.so" diff --git a/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map b/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map new file mode 100644 index 0000000000..4cd8325bb0 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/collie/keymap-2.4.map @@ -0,0 +1,114 @@ +keymaps 0-1,4-5 +alt_is_meta +keycode 1 = a +keycode 2 = b +keycode 3 = c +keycode 4 = d +keycode 5 = e +keycode 6 = f +keycode 7 = g +keycode 8 = h +keycode 9 = i +keycode 10 = j +keycode 11 = k +keycode 12 = l +keycode 13 = m +keycode 14 = n +keycode 15 = o +keycode 16 = p +keycode 17 = q +keycode 18 = r +keycode 19 = s +keycode 20 = t +keycode 21 = u +keycode 22 = v +keycode 23 = w +keycode 24 = x +keycode 25 = y +keycode 26 = z +keycode 27 = Shift +keycode 28 = Return +keycode 29 = F2 +keycode 30 = +keycode 31 = BackSpace +keycode 32 = bar +keycode 33 = +keycode 34 = Escape +keycode 35 = Left + control keycode 35 = Decr_Console +keycode 36 = Up +keycode 37 = Down +keycode 38 = Right + control keycode 38 = Incr_Console +keycode 39 = Return +keycode 40 = +keycode 41 = one +keycode 42 = two +keycode 43 = three +keycode 44 = four +keycode 45 = five +keycode 46 = six +keycode 47 = seven +keycode 48 = eight +keycode 49 = nine +keycode 50 = zero +keycode 51 = +adiaeresis +keycode 52 = +udiaeresis +keycode 53 = +odiaeresis +keycode 54 = +Adiaeresis +keycode 55 = +Udiaeresis +keycode 56 = +Odiaeresis +keycode 57 = +ssharp +keycode 58 = minus +keycode 59 = plus +keycode 60 = Shift_Lock +keycode 61 = at +keycode 62 = question +keycode 63 = comma +keycode 64 = period +keycode 65 = Tab +keycode 66 = F5 +keycode 67 = F6 +keycode 68 = F7 +keycode 69 = slash +keycode 70 = apostrophe +keycode 71 = semicolon +keycode 72 = quotedbl +keycode 73 = colon +keycode 74 = numbersign +keycode 75 = dollar +keycode 76 = percent +keycode 77 = underscore +keycode 78 = ampersand +keycode 79 = asterisk +keycode 80 = parenleft +keycode 81 = Delete +keycode 82 = F10 +keycode 83 = equal +keycode 84 = parenright +keycode 85 = asciitilde +keycode 86 = less +keycode 87 = greater +keycode 88 = Control +keycode 89 = Alt +keycode 90 = +keycode 91 = space + control keycode 91 = nul +keycode 92 = space + control keycode 92 = nul +keycode 93 = +keycode 94 = exclam +keycode 95 = +keycode 96 = +keycode 97 = +keycode 98 = +keycode 99 = +keycode 100 = +keycode 101 = +keycode 102 = +keycode 103 = Shift +keycode 104 = Control +keycode 105 = Control +keycode 106 = Alt +keycode 107 = Alt +keycode 108 = AltGr diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 18017d1e90..06140bec39 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -6,7 +6,7 @@ DEPENDS = "makedevs" DEPENDS_openzaurus = "makedevs virtual/kernel" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r63" +PR = "r64" SRC_URI = "file://halt \ file://ramdisk \ diff --git a/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch b/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch index 1845dd3089..471967fc68 100644 --- a/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch +++ b/packages/ixp425-eth/ixp400-eth-1.5/mac-address.patch @@ -109,7 +109,7 @@ + /* fix dev_max_count to maclist_count - the actual number of + * available MACs + */ -+ if (dev_max_count <= 0) ++ if (dev_max_count <= 0 || (dev_max_count > maclist_count() && maclist_count() > 0)) + dev_max_count = maclist_count(); + if (dev_max_count <= 0) + dev_max_count = 1; diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index c14580248f..8833b850ec 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -4,6 +4,10 @@ MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm" LICENSE = "GPL" +PR = "r7" + +DEPENDS = "ixp4xx-csr" +RDEPENDS = "ixp4xx-csr" SRC_URI = "ftp://aiedownload.intel.com/df-support/9519/eng/GPL_ixp400LinuxEthernetDriverPatch-1_5.zip" SRC_URI += "file://2.6.14.patch;patch=1" @@ -20,11 +24,6 @@ SRC_URI += "file://debug.patch;patch=1" SRC_URI += "file://Makefile.patch;patch=1" SRC_URI += "file://modprobe.conf" -PR = "r6" - -DEPENDS = "ixp4xx-csr" -RDEPENDS = "ixp4xx-csr" - S = "${WORKDIR}" COMPATIBLE_HOST = "^arm.*-linux.*" diff --git a/packages/keymap-locales/files/collie/.mtn2git_empty b/packages/keymap-locales/files/collie/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/keymap-locales/files/collie/.mtn2git_empty diff --git a/packages/keymap-locales/files/collie/keymap-extension-2.4-de.map b/packages/keymap-locales/files/collie/keymap-extension-2.4-de.map new file mode 100644 index 0000000000..4ee89bbce1 --- /dev/null +++ b/packages/keymap-locales/files/collie/keymap-extension-2.4-de.map @@ -0,0 +1,10 @@ +# German keymappings +shift altgr keycode 63 = +Adiaeresis +shift altgr keycode 13 = +Odiaeresis +shift altgr keycode 12 = +Udiaeresis +altgr keycode 63 = +adiaeresis +altgr keycode 13 = +odiaeresis +altgr keycode 12 = +udiaeresis +altgr keycode 15 = ssharp + +keycode 103 = AltGr
\ No newline at end of file diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb index 89cb5aa580..7f279ed6cb 100644 --- a/packages/keymap-locales/keymap-locales.bb +++ b/packages/keymap-locales/keymap-locales.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "file://*.map" diff --git a/packages/synergy/synergy_1.2.4.bb b/packages/synergy/synergy_1.2.7.bb index 0bd27f5e06..0bd27f5e06 100644 --- a/packages/synergy/synergy_1.2.4.bb +++ b/packages/synergy/synergy_1.2.7.bb diff --git a/packages/uclibc/uclibc-cvs/arm/uClibc.config b/packages/uclibc/uclibc-cvs/arm/uClibc.config index a20c9a8b63..fbbffe5a8f 100644 --- a/packages/uclibc/uclibc-cvs/arm/uClibc.config +++ b/packages/uclibc/uclibc-cvs/arm/uClibc.config @@ -8,6 +8,7 @@ TARGET_arm=y # TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_i960 is not set # TARGET_m68k is not set @@ -17,16 +18,18 @@ TARGET_arm=y # TARGET_nios2 is not set # TARGET_powerpc is not set # TARGET_sh is not set +# TARGET_sh64 is not set # TARGET_sparc is not set # TARGET_v850 is not set +# TARGET_x86_64 is not set # # Target Architecture Features and Options # -HAVE_ELF=y -ARCH_SUPPORTS_LITTLE_ENDIAN=y TARGET_ARCH="arm" ARCH_SUPPORTS_BIG_ENDIAN=y +ARCH_SUPPORTS_LITTLE_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y # CONFIG_GENERIC_ARM is not set # CONFIG_ARM610 is not set # CONFIG_ARM710 is not set @@ -34,6 +37,7 @@ ARCH_SUPPORTS_BIG_ENDIAN=y # CONFIG_ARM920T is not set # CONFIG_ARM922T is not set # CONFIG_ARM926T is not set +# CONFIG_ARM1136JF_S is not set # CONFIG_ARM_SA110 is not set CONFIG_ARM_SA1100=y # CONFIG_ARM_XSCALE is not set @@ -42,12 +46,10 @@ ARCH_LITTLE_ENDIAN=y # ARCH_HAS_NO_MMU is not set ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y -# HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y +UCLIBC_HAS_FPU=y DO_C99_MATH=y -WARNINGS="-Wall" +# UCLIBC_HAS_FENV is not set KERNEL_SOURCE="<path/to/kernel/sources>" -C_SYMBOL_PREFIX="" HAVE_DOT_CONFIG=y # @@ -56,25 +58,30 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set -BUILD_UCLIBC_LDSO=y +HAVE_SHARED=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" +UCLIBC_STATIC_LDCONFIG=y +LDSO_RUNPATH=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -89,6 +96,8 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set # # String and Stdio Support @@ -101,13 +110,8 @@ UCLIBC_HAS_CTYPE_SIGNED=y UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_LOCALE=y -UCLIBC_PREGENERATED_LOCALE_DATA=y -UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y -UCLIBC_HAS_XLOCALE=y +# UCLIBC_HAS_LOCALE is not set UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y -UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y @@ -121,6 +125,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_256=y UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -138,6 +143,9 @@ UCLIBC_HAS_GNU_GETOPT=y # Big and Tall # UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y @@ -145,20 +153,30 @@ UCLIBC_HAS_GLOB=y # # Library Installation Options # -SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="//usr" # -# uClibc security related options +# Security options # -# UCLIBC_SECURITY is not set +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y # # uClibc development/debugging options # +CROSS_COMPILER_PREFIX="" # DODEBUG is not set +# DODEBUG_PT is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/armeb/.mtn2git_empty b/packages/uclibc/uclibc-cvs/armeb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/armeb/.mtn2git_empty diff --git a/packages/uclibc/uclibc-cvs/armeb/uClibc.config b/packages/uclibc/uclibc-cvs/armeb/uClibc.config new file mode 100644 index 0000000000..5f9fe16afb --- /dev/null +++ b/packages/uclibc/uclibc-cvs/armeb/uClibc.config @@ -0,0 +1,182 @@ +# +# Automatically generated make config: don't edit +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +ARCH_SUPPORTS_BIG_ENDIAN=y +ARCH_SUPPORTS_LITTLE_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_GENERIC_ARM=y +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# ARCH_LITTLE_ENDIAN is not set +ARCH_BIG_ENDIAN=y +# ARCH_HAS_NO_MMU is not set +ARCH_HAS_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +# UCLIBC_HAS_FENV is not set +KERNEL_SOURCE="<path/to/kernel/sources>" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/i386/uClibc.config b/packages/uclibc/uclibc-cvs/i386/uClibc.config index 90d5ce1fd7..bc6e72debf 100644 --- a/packages/uclibc/uclibc-cvs/i386/uClibc.config +++ b/packages/uclibc/uclibc-cvs/i386/uClibc.config @@ -8,6 +8,7 @@ # TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set TARGET_i386=y # TARGET_i960 is not set # TARGET_m68k is not set @@ -17,15 +18,18 @@ TARGET_i386=y # TARGET_nios2 is not set # TARGET_powerpc is not set # TARGET_sh is not set +# TARGET_sh64 is not set # TARGET_sparc is not set # TARGET_v850 is not set +# TARGET_x86_64 is not set # # Target Architecture Features and Options # -HAVE_ELF=y -ARCH_SUPPORTS_LITTLE_ENDIAN=y TARGET_ARCH="i386" +# ARCH_SUPPORTS_BIG_ENDIAN is not set +ARCH_SUPPORTS_LITTLE_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y # CONFIG_GENERIC_386 is not set # CONFIG_386 is not set # CONFIG_486 is not set @@ -48,11 +52,10 @@ ARCH_LITTLE_ENDIAN=y # ARCH_HAS_NO_MMU is not set ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y -HAS_FPU=y +UCLIBC_HAS_FPU=y DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/home/kergoth/code/user/oe/build-colinux/tmp/cross/i686-linux-uclibc/include" -C_SYMBOL_PREFIX="" +# UCLIBC_HAS_FENV is not set +KERNEL_SOURCE="<path/to/kernel/sources>" HAVE_DOT_CONFIG=y # @@ -61,26 +64,30 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set -BUILD_UCLIBC_LDSO=y +HAVE_SHARED=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y -# UCLIBC_STATIC_LDCONFIG is not set # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -95,6 +102,8 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set # # String and Stdio Support @@ -107,13 +116,8 @@ UCLIBC_HAS_CTYPE_SIGNED=y UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_LOCALE=y -UCLIBC_PREGENERATED_LOCALE_DATA=y -# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set -UCLIBC_HAS_XLOCALE=y +# UCLIBC_HAS_LOCALE is not set UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y -UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y @@ -127,6 +131,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_256=y UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -144,6 +149,9 @@ UCLIBC_HAS_GNU_GETOPT=y # Big and Tall # UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y @@ -151,20 +159,30 @@ UCLIBC_HAS_GLOB=y # # Library Installation Options # -SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="//usr" # -# uClibc security related options +# Security options # -# UCLIBC_SECURITY is not set +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y # # uClibc development/debugging options # +CROSS_COMPILER_PREFIX="" # DODEBUG is not set +# DODEBUG_PT is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/i686/uClibc.config b/packages/uclibc/uclibc-cvs/i686/uClibc.config index 90d5ce1fd7..bc6e72debf 100644 --- a/packages/uclibc/uclibc-cvs/i686/uClibc.config +++ b/packages/uclibc/uclibc-cvs/i686/uClibc.config @@ -8,6 +8,7 @@ # TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set TARGET_i386=y # TARGET_i960 is not set # TARGET_m68k is not set @@ -17,15 +18,18 @@ TARGET_i386=y # TARGET_nios2 is not set # TARGET_powerpc is not set # TARGET_sh is not set +# TARGET_sh64 is not set # TARGET_sparc is not set # TARGET_v850 is not set +# TARGET_x86_64 is not set # # Target Architecture Features and Options # -HAVE_ELF=y -ARCH_SUPPORTS_LITTLE_ENDIAN=y TARGET_ARCH="i386" +# ARCH_SUPPORTS_BIG_ENDIAN is not set +ARCH_SUPPORTS_LITTLE_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y # CONFIG_GENERIC_386 is not set # CONFIG_386 is not set # CONFIG_486 is not set @@ -48,11 +52,10 @@ ARCH_LITTLE_ENDIAN=y # ARCH_HAS_NO_MMU is not set ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y -HAS_FPU=y +UCLIBC_HAS_FPU=y DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/home/kergoth/code/user/oe/build-colinux/tmp/cross/i686-linux-uclibc/include" -C_SYMBOL_PREFIX="" +# UCLIBC_HAS_FENV is not set +KERNEL_SOURCE="<path/to/kernel/sources>" HAVE_DOT_CONFIG=y # @@ -61,26 +64,30 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set -BUILD_UCLIBC_LDSO=y +HAVE_SHARED=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y -# UCLIBC_STATIC_LDCONFIG is not set # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -95,6 +102,8 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set # # String and Stdio Support @@ -107,13 +116,8 @@ UCLIBC_HAS_CTYPE_SIGNED=y UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_LOCALE=y -UCLIBC_PREGENERATED_LOCALE_DATA=y -# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set -UCLIBC_HAS_XLOCALE=y +# UCLIBC_HAS_LOCALE is not set UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y -UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y @@ -127,6 +131,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_256=y UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -144,6 +149,9 @@ UCLIBC_HAS_GNU_GETOPT=y # Big and Tall # UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y @@ -151,20 +159,30 @@ UCLIBC_HAS_GLOB=y # # Library Installation Options # -SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="//usr" # -# uClibc security related options +# Security options # -# UCLIBC_SECURITY is not set +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y # # uClibc development/debugging options # +CROSS_COMPILER_PREFIX="" # DODEBUG is not set +# DODEBUG_PT is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/ixp4xx/.mtn2git_empty b/packages/uclibc/uclibc-cvs/ixp4xx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/ixp4xx/.mtn2git_empty diff --git a/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.distro b/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.distro new file mode 100644 index 0000000000..7d54119f39 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.distro @@ -0,0 +1,135 @@ +# Contains only the distro specific parts of the uClibc.config - +# these are appended to the machine config to override the settings. +# Just copy everything from General Library Settings on into this +# file plus the following three floating point config options: +UCLIBC_HAS_FLOATS=y +DO_C99_MATH=y +UCLIBC_HAS_FENV=y +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +UCLIBC_HAS_REENTRANT_RPC=y +# UCLIBC_USE_NETLINK is not set + +# +# String and Stdio Support +# +# UCLIBC_HAS_STRING_GENERIC_OPT is not set +# UCLIBC_HAS_STRING_ARCH_OPT is not set +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +# UCLIBC_HAS_WORDEXP is not set +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="/usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.machine b/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.machine new file mode 100644 index 0000000000..77e53bc1a8 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.machine @@ -0,0 +1,8 @@ +# IXP4XX specific machine overrides. +# +# IXP4XX can be arm or armeb - the ARCH (arm,armeb) decides +# this, IXP4XX is always XScale - this file enfoces this. +# +CONFIG_ARM_XSCALE=y +ARCH_HAS_MMU=y +# UCLIBC_HAS_FPU is not set diff --git a/packages/uclibc/uclibc-cvs/mipsel/uClibc.config b/packages/uclibc/uclibc-cvs/mipsel/uClibc.config index b71ae46456..4389c9b8c2 100644 --- a/packages/uclibc/uclibc-cvs/mipsel/uClibc.config +++ b/packages/uclibc/uclibc-cvs/mipsel/uClibc.config @@ -8,6 +8,7 @@ # TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_i960 is not set # TARGET_m68k is not set @@ -17,17 +18,19 @@ TARGET_mips=y # TARGET_nios2 is not set # TARGET_powerpc is not set # TARGET_sh is not set +# TARGET_sh64 is not set # TARGET_sparc is not set # TARGET_v850 is not set +# TARGET_x86_64 is not set # # Target Architecture Features and Options # -HAVE_ELF=y -ARCH_SUPPORTS_LITTLE_ENDIAN=y TARGET_ARCH="mips" -ARCH_CFLAGS="-mno-split-addresses" ARCH_SUPPORTS_BIG_ENDIAN=y +ARCH_SUPPORTS_LITTLE_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y +ARCH_CFLAGS="-mno-split-addresses" # CONFIG_MIPS_ISA_1 is not set # CONFIG_MIPS_ISA_2 is not set # CONFIG_MIPS_ISA_3 is not set @@ -39,12 +42,10 @@ ARCH_LITTLE_ENDIAN=y # ARCH_HAS_NO_MMU is not set ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y -# HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y +UCLIBC_HAS_FPU=y DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/home/kergoth/code/build-wrt/tmp/cross/mipsel-linux-uclibc/include" -C_SYMBOL_PREFIX="" +# UCLIBC_HAS_FENV is not set +KERNEL_SOURCE="<path/to/kernel/sources>" HAVE_DOT_CONFIG=y # @@ -53,25 +54,30 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set -BUILD_UCLIBC_LDSO=y +HAVE_SHARED=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" +UCLIBC_STATIC_LDCONFIG=y +LDSO_RUNPATH=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -86,6 +92,8 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set # # String and Stdio Support @@ -98,13 +106,8 @@ UCLIBC_HAS_CTYPE_SIGNED=y UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_LOCALE=y -UCLIBC_PREGENERATED_LOCALE_DATA=y -# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set -UCLIBC_HAS_XLOCALE=y +# UCLIBC_HAS_LOCALE is not set UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y -UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y @@ -118,6 +121,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_256=y UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -135,6 +139,9 @@ UCLIBC_HAS_GNU_GETOPT=y # Big and Tall # UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y @@ -142,20 +149,30 @@ UCLIBC_HAS_GLOB=y # # Library Installation Options # -SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="//usr" # -# uClibc security related options +# Security options # -# UCLIBC_SECURITY is not set +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y # # uClibc development/debugging options # +CROSS_COMPILER_PREFIX="" # DODEBUG is not set +# DODEBUG_PT is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/sh3/uClibc.config b/packages/uclibc/uclibc-cvs/sh3/uClibc.config index b557506b9b..1e2710715f 100644 --- a/packages/uclibc/uclibc-cvs/sh3/uClibc.config +++ b/packages/uclibc/uclibc-cvs/sh3/uClibc.config @@ -8,6 +8,7 @@ # TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_i960 is not set # TARGET_m68k is not set @@ -17,31 +18,31 @@ # TARGET_nios2 is not set # TARGET_powerpc is not set TARGET_sh=y +# TARGET_sh64 is not set # TARGET_sparc is not set # TARGET_v850 is not set +# TARGET_x86_64 is not set # # Target Architecture Features and Options # -HAVE_ELF=y -ARCH_SUPPORTS_LITTLE_ENDIAN=y TARGET_ARCH="sh" ARCH_SUPPORTS_BIG_ENDIAN=y -HAVE_DOT_HIDDEN=y +ARCH_SUPPORTS_LITTLE_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_SH2A is not set # CONFIG_SH2 is not set CONFIG_SH3=y # CONFIG_SH4 is not set -# CONFIG_SH5 is not set ARCH_LITTLE_ENDIAN=y # ARCH_BIG_ENDIAN is not set # ARCH_HAS_NO_MMU is not set ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y -HAS_FPU=y +UCLIBC_HAS_FPU=y DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/path/to/kernel/sources" -C_SYMBOL_PREFIX="" +# UCLIBC_HAS_FENV is not set +KERNEL_SOURCE="<path/to/kernel/sources>" HAVE_DOT_CONFIG=y # @@ -50,26 +51,30 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set -BUILD_UCLIBC_LDSO=y +HAVE_SHARED=y FORCE_SHAREABLE_TEXT_SEGMENTS=y LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y -# UCLIBC_STATIC_LDCONFIG is not set # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -84,6 +89,8 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set # # String and Stdio Support @@ -96,13 +103,8 @@ UCLIBC_HAS_CTYPE_SIGNED=y UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_LOCALE=y -UCLIBC_PREGENERATED_LOCALE_DATA=y -# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set -UCLIBC_HAS_XLOCALE=y +# UCLIBC_HAS_LOCALE is not set UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y -UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y @@ -116,6 +118,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_256=y UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -133,6 +136,9 @@ UCLIBC_HAS_GNU_GETOPT=y # Big and Tall # UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y @@ -140,20 +146,29 @@ UCLIBC_HAS_GLOB=y # # Library Installation Options # -SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="//usr" # -# uClibc security related options +# Security options # -# UCLIBC_SECURITY is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y # # uClibc development/debugging options # +CROSS_COMPILER_PREFIX="" # DODEBUG is not set +# DODEBUG_PT is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/sh4/uClibc.config b/packages/uclibc/uclibc-cvs/sh4/uClibc.config index a80f4dcbe1..0b9a3c48b2 100644 --- a/packages/uclibc/uclibc-cvs/sh4/uClibc.config +++ b/packages/uclibc/uclibc-cvs/sh4/uClibc.config @@ -3,10 +3,12 @@ # # TARGET_alpha is not set # TARGET_arm is not set +# TARGET_bfin is not set # TARGET_cris is not set # TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_i960 is not set # TARGET_m68k is not set @@ -16,41 +18,31 @@ # TARGET_nios2 is not set # TARGET_powerpc is not set TARGET_sh=y +# TARGET_sh64 is not set # TARGET_sparc is not set # TARGET_v850 is not set +# TARGET_x86_64 is not set # # Target Architecture Features and Options # -HAVE_ELF=y -ARCH_SUPPORTS_LITTLE_ENDIAN=y TARGET_ARCH="sh" ARCH_SUPPORTS_BIG_ENDIAN=y -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set -HAVE_DOT_HIDDEN=y +ARCH_SUPPORTS_LITTLE_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_SH2A is not set # CONFIG_SH2 is not set # CONFIG_SH3 is not set CONFIG_SH4=y -# CONFIG_SH5 is not set ARCH_LITTLE_ENDIAN=y # ARCH_BIG_ENDIAN is not set # ARCH_HAS_NO_MMU is not set ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y -HAS_FPU=y +UCLIBC_HAS_FPU=y DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/path/to/kernel/sources" -C_SYMBOL_PREFIX="" +# UCLIBC_HAS_FENV is not set +KERNEL_SOURCE="<path/to/kernel/sources>" HAVE_DOT_CONFIG=y # @@ -59,24 +51,30 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set -BUILD_UCLIBC_LDSO=y +HAVE_SHARED=y FORCE_SHAREABLE_TEXT_SEGMENTS=y -# UCLIBC_PIE_SUPPORT is not set LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +UCLIBC_STATIC_LDCONFIG=y +LDSO_RUNPATH=y UCLIBC_CTOR_DTOR=y -# UCLIBC_PROPOLICE is not set # HAS_NO_THREADS is not set UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +UCLIBC_HAS___PROGNAME=y UNIX98PTY_ONLY=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -91,23 +89,22 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set # # String and Stdio Support # +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y UCLIBC_HAS_CTYPE_TABLES=y UCLIBC_HAS_CTYPE_SIGNED=y # UCLIBC_HAS_CTYPE_UNSAFE is not set UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y -UCLIBC_HAS_LOCALE=y -UCLIBC_PREGENERATED_LOCALE_DATA=y -# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set -UCLIBC_HAS_XLOCALE=y +# UCLIBC_HAS_LOCALE is not set UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_DIGIT_GROUPING=y -UCLIBC_HAS_SCANF_LENIENT_DIGIT_GROUPING=y UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y @@ -121,6 +118,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_256=y UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set # UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -132,13 +130,15 @@ UCLIBC_HAS_ERRNO_MESSAGES=y # UCLIBC_HAS_SYS_ERRLIST is not set UCLIBC_HAS_SIGNUM_MESSAGES=y # UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GETTEXT_AWARENESS=y UCLIBC_HAS_GNU_GETOPT=y # # Big and Tall # UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y @@ -146,15 +146,29 @@ UCLIBC_HAS_GLOB=y # # Library Installation Options # -SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +SHARED_LIB_LOADER_PREFIX="/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="//usr" # +# Security options +# +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +UCLIBC_BUILD_NOW=y +UCLIBC_BUILD_NOEXECSTACK=y + +# # uClibc development/debugging options # +CROSS_COMPILER_PREFIX="" # DODEBUG is not set +# DODEBUG_PT is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set +WARNINGS="-Wall" +# DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/packages/uclibc/uclibc-cvs/thumb-asm-swi.patch b/packages/uclibc/uclibc-cvs/thumb-asm-swi.patch new file mode 100644 index 0000000000..d09e40b7a3 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/thumb-asm-swi.patch @@ -0,0 +1,154 @@ +# WARNING: nasty hack. Because sysnum.h produces thumb syscall +# numbers when compiled in thumb mode the arm assembler (which is arm +# even in thumb mode) needs to write the OS syscall base back into +# the swi calls. This is done here just by orring in the correct +# value. This is a hack - it might be better to add a define to +# sysnum.h to force it to output arm (not thumb) values on demand - +# but this hack is fairly safe (rmk would have to change the syscall +# base, this seems unlikely). +# +# The patch also fixes up the .align directives to '2' (i.e. a multiple +# of 4) not '4' (a multiple of 16 - apparently an error since it seems +# to be unnecessary, there is no advantage here in cache line alignment). +diff -u uClibc-0.9.28/libc/sysdeps/linux/arm/orig/__longjmp.S uClibc-0.9.28/libc/sysdeps/linux/arm/__longjmp.S +--- uClibc-0.9.28/libc/sysdeps/linux/arm/orig/__longjmp.S 2005-09-18 18:41:36.870986621 -0700 ++++ uClibc-0.9.28/libc/sysdeps/linux/arm/__longjmp.S 2005-09-18 19:01:26.741860474 -0700 +@@ -25,7 +25,7 @@ + + .global __longjmp + .type __longjmp,%function +-.align 4 ++.align 2 + __longjmp: + mov ip, r0 /* save jmp_buf pointer */ + +diff -u uClibc-0.9.28/libc/sysdeps/linux/arm/orig/bsd-_setjmp.S uClibc-0.9.28/libc/sysdeps/linux/arm/bsd-_setjmp.S +--- uClibc-0.9.28/libc/sysdeps/linux/arm/orig/bsd-_setjmp.S 2005-09-18 18:41:36.870986621 -0700 ++++ uClibc-0.9.28/libc/sysdeps/linux/arm/bsd-_setjmp.S 2005-09-18 19:01:31.982190228 -0700 +@@ -27,7 +27,7 @@ + + .global _setjmp + .type _setjmp,%function +-.align 4 ++.align 2 + _setjmp: + mov r1, #0 + #ifdef __PIC__ +diff -u uClibc-0.9.28/libc/sysdeps/linux/arm/orig/bsd-setjmp.S uClibc-0.9.28/libc/sysdeps/linux/arm/bsd-setjmp.S +--- uClibc-0.9.28/libc/sysdeps/linux/arm/orig/bsd-setjmp.S 2005-09-18 18:41:36.870986621 -0700 ++++ uClibc-0.9.28/libc/sysdeps/linux/arm/bsd-setjmp.S 2005-09-18 19:01:40.166705247 -0700 +@@ -27,7 +27,7 @@ + + .global setjmp + .type setjmp,%function +-.align 4 ++.align 2 + setjmp: + mov r1, #1 + #ifdef __PIC__ +diff -u uClibc/libc/sysdeps/linux/arm/orig/clone.S uClibc/libc/sysdeps/linux/arm/clone.S +--- uClibc/libc/sysdeps/linux/arm/clone.S.orig 2006-01-19 19:36:36.754757577 -0800 ++++ uClibc/libc/sysdeps/linux/arm/clone.S 2006-01-19 19:42:59.885757030 -0800 +@@ -31,7 +31,7 @@ + .text + .global clone + .type clone,%function +-.align 4 ++.align 2 + clone: + @ sanity check args + cmp r0, #0 +@@ -49,7 +49,7 @@ clone: + @ get flags + mov r0, r2 + @ new sp is already in r1 +- swi __NR_clone ++ swi (__NR_clone | 0x900000) + movs a1, a1 + blt __error + #if defined(__THUMB_INTERWORK__) +diff -u uClibc-0.9.28/libc/sysdeps/linux/arm/orig/mmap64.S uClibc-0.9.28/libc/sysdeps/linux/arm/mmap64.S +--- uClibc-0.9.28/libc/sysdeps/linux/arm/orig/mmap64.S 2005-09-18 18:41:36.874986873 -0700 ++++ uClibc-0.9.28/libc/sysdeps/linux/arm/mmap64.S 2005-09-18 19:02:03.692185612 -0700 +@@ -27,7 +27,7 @@ + .text + .global mmap64 + .type mmap64,%function +-.align 4 ++.align 2 + mmap64: + stmfd sp!, {r4, r5, lr} + ldr r5, [sp, $16] +@@ -40,7 +40,7 @@ + movs ip, ip, lsr $12 + bne .Linval @ check for overflow + mov ip, r0 +- swi __NR_mmap2 ++ swi (__NR_mmap2 | 0x900000) + cmn r0, $4096 + ldmccfd sp!, {r4, r5, pc} + cmn r0, $ENOSYS +diff -u uClibc-0.9.28/libc/sysdeps/linux/arm/orig/setjmp.S uClibc-0.9.28/libc/sysdeps/linux/arm/setjmp.S +--- uClibc-0.9.28/libc/sysdeps/linux/arm/orig/setjmp.S 2005-09-18 18:41:36.874986873 -0700 ++++ uClibc-0.9.28/libc/sysdeps/linux/arm/setjmp.S 2005-09-18 19:02:08.956516875 -0700 +@@ -24,7 +24,7 @@ + + .global __sigsetjmp + .type __sigsetjmp,%function +-.align 4 ++.align 2 + __sigsetjmp: + /* Save registers */ + #if defined __UCLIBC_HAS_FLOATS__ && ! defined __UCLIBC_HAS_SOFT_FLOAT__ +diff -u uClibc-0.9.28/libc/sysdeps/linux/arm/orig/sigrestorer.S uClibc-0.9.28/libc/sysdeps/linux/arm/sigrestorer.S +--- uClibc-0.9.28/libc/sysdeps/linux/arm/orig/sigrestorer.S 2005-09-18 18:41:36.874986873 -0700 ++++ uClibc-0.9.28/libc/sysdeps/linux/arm/sigrestorer.S 2005-09-18 19:02:18.041088531 -0700 +@@ -24,17 +24,17 @@ + + .global __default_sa_restorer + .type __default_sa_restorer,%function +-.align 4 ++.align 2 + __default_sa_restorer: +- swi __NR_sigreturn ++ swi (__NR_sigreturn | 0x900000) + + + #ifdef __NR_rt_sigreturn + + .global __default_rt_sa_restorer + .type __default_rt_sa_restorer,%function +-.align 4 ++.align 2 + __default_rt_sa_restorer: +- swi __NR_rt_sigreturn ++ swi (__NR_rt_sigreturn | 0x900000) + + #endif +diff -u uClibc/libc/sysdeps/linux/arm/orig/vfork.S uClibc/libc/sysdeps/linux/arm/vfork.S +--- uClibc/libc/sysdeps/linux/arm/vfork.S.orig 2006-01-19 19:36:36.754757577 -0800 ++++ uClibc/libc/sysdeps/linux/arm/vfork.S 2006-01-19 19:43:47.709756961 -0800 +@@ -18,12 +18,12 @@ + .text + .global vfork + .type vfork,%function +-.align 4 ++.align 2 + + vfork: + + #ifdef __NR_vfork +- swi __NR_vfork ++ swi (__NR_vfork | 0x900000) + cmn r0, #4096 + #if defined(__THUMB_INTERWORK__) + bxcc lr +@@ -38,7 +38,7 @@ vfork: + #endif + + /* If we don't have vfork, use fork. */ +- swi __NR_fork ++ swi (__NR_fork | 0x900000) + cmn r0, #4096 + + /* Syscall worked. Return to child/parent */ diff --git a/packages/uclibc/uclibc-cvs/thumb-defined-arm-or-thumb.patch b/packages/uclibc/uclibc-cvs/thumb-defined-arm-or-thumb.patch index c31d2f03cd..6b73301bf7 100644 --- a/packages/uclibc/uclibc-cvs/thumb-defined-arm-or-thumb.patch +++ b/packages/uclibc/uclibc-cvs/thumb-defined-arm-or-thumb.patch @@ -2,14 +2,14 @@ # is ARM specific, that code must also be selected for __thumb__ because # __thumb__ is an ARM but __arm__ is not set... # ---- ./ldso/include/dl-string.h.orig 2005-09-07 14:09:19.375564254 -0700 -+++ ./ldso/include/dl-string.h 2005-09-07 14:09:52.045620051 -0700 -@@ -270,7 +270,7 @@ +--- uClibc/ldso/include/dl-string.h.orig 2006-01-19 19:03:42.000000000 -0800 ++++ uClibc/ldso/include/dl-string.h 2006-01-19 19:28:15.141758294 -0800 +@@ -276,7 +276,7 @@ static __always_inline char * _dl_simple /* On some arches constant strings are referenced through the GOT. * This requires that load_addr must already be defined... */ --#if defined(mc68000) || defined(__arm__) || defined(__mips__) \ -+#if defined(mc68000) || defined(__arm__) || defined(__thumb__) || defined(__mips__) \ - || defined(__sh__) || defined(__powerpc__) +-#if defined(mc68000) || defined(__arm__) || defined(__mips__) \ ++#if defined(mc68000) || defined(__arm__) || defined(__thumb__) || defined(__mips__) \ + || defined(__sh__) || defined(__powerpc__) # define CONSTANT_STRING_GOT_FIXUP(X) \ if ((X) < (const char *) load_addr) (X) += load_addr diff --git a/packages/uclibc/uclibc-cvs/thumb-mov-pc-bx.patch b/packages/uclibc/uclibc-cvs/thumb-mov-pc-bx.patch new file mode 100644 index 0000000000..342fbb1aee --- /dev/null +++ b/packages/uclibc/uclibc-cvs/thumb-mov-pc-bx.patch @@ -0,0 +1,178 @@ +# This patch changes all cases where the ARM assembler mov pc,rx +# instructions are used to ensure that the thumb/arm interwork change of +# process more works - in essence mov pc,rx needs to become bx rc. +# +# The ldr pc or ldm rx, {pc} instructions are not changed - this is +# fine on ARM >=v5 but will fail to restore thumb mode on ARM v4T, +# i.e. this code will not provide support for thumb on ARM v4T. +# +# One mov pc is left in resolve.S, this is fixed in a different patch - +# thumb-resolve.patch +# +# The changes are protected by __THUMB_INTERWORK__ - the original +# mov instruction will work on newer architectures and is required on +# arch v4 (not v4t) and earlier - those which did not support thumb - +# so this is safe. See gcc lib1asmfuncs for a more exact test. +# +--- uClibc-0.9.28/.pc/thumb-mov-pc-bx.patch/ldso/ldso/arm/dl-startup.h 2005-08-17 15:49:41.000000000 -0700 ++++ uClibc-0.9.28/ldso/ldso/arm/dl-startup.h 2005-09-16 23:38:34.266546180 -0700 +@@ -4,6 +4,7 @@ + * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org> + */ + ++#if defined(__arm__) + asm( + " .text\n" + " .globl _start\n" +@@ -40,7 +41,11 @@ + " ldr r0, .L_FINI_PROC\n" + " ldr r0, [sl, r0]\n" + " @ jump to the user_s entry point\n" ++#if defined(__THUMB_INTERWORK__) ++ " bx r6\n" ++#else + " mov pc, r6\n" ++#endif + ".L_GET_GOT:\n" + " .word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4\n" + ".L_SKIP_ARGS:\n" +@@ -51,6 +56,70 @@ + " .size _start,.-_start\n" + ".previous\n" + ); ++#else ++asm( ++ " .text\n" ++ " .arm\n" ++ " .globl _start\n" ++ " .type _start,%function\n" ++ "_start:\n" ++ " @ dumb: can't persuade the linker to make the start address\n" ++ " @ odd, so use an arm function and change to thumb (_dl_start\n" ++ " @ is thumb)\n" ++ " adr r0, __dl_thumb_start+1\n" ++ " bx r0\n" ++ "\n\n" ++ " .thumb\n" ++ " .globl __dl_thumb_start\n" ++ " .thumb_func\n" ++ " .type __dl_thumb_start,%function\n" ++ "__dl_thumb_start:\n" ++ " @ at start time, all the args are on the stack\n" ++ " mov r0, sp\n" ++ " bl _dl_start\n" ++ " @ returns user entry point in r0\n" ++ " mov r6, r0\n" ++ " @ we are PIC code, so get global offset table\n" ++ " ldr r7, .L_GET_GOT\n" ++ ".L_GOT_GOT:\n" ++ " add r7, pc\n" ++ " @ See if we were run as a command with the executable file\n" ++ " @ name as an extra leading argument.\n" ++ " ldr r4, .L_SKIP_ARGS\n" ++ " ldr r4, [r7, r4]\n" ++ " @ get the original arg count\n" ++ " ldr r1, [sp]\n" ++ " @ subtract _dl_skip_args from it\n" ++ " sub r1, r1, r4\n" ++ " @ adjust the stack pointer to skip them\n" ++ " lsl r4, r4, #2\n" ++ " add sp, r4\n" ++ " @ get the argv address\n" ++ " add r2, sp, #4\n" ++ " @ store the new argc in the new stack location\n" ++ " str r1, [sp]\n" ++ " @ compute envp\n" ++ " lsl r3, r1, #2\n" ++ " add r3, r3, r2\n" ++ " add r3, #4\n" ++ "\n\n" ++ " @ load the finalizer function\n" ++ " ldr r0, .L_FINI_PROC\n" ++ " ldr r0, [r7, r0]\n" ++ " @ jump to the user_s entry point\n" ++ " bx r6\n" ++ "\n\n" ++ ".L_GET_GOT:\n" ++ " .word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4\n" ++ ".L_SKIP_ARGS:\n" ++ " .word _dl_skip_args(GOTOFF)\n" ++ ".L_FINI_PROC:\n" ++ " .word _dl_fini(GOT)\n" ++ "\n\n" ++ " .size _start,.-_start\n" ++ ".previous\n" ++); ++#endif + + + /* Get a pointer to the argv array. On many platforms this can be just +--- uClibc/.pc/thumb-mov-pc-bx.patch/ldso/ldso/arm/dl-sysdep.h 2006-01-19 19:03:40.000000000 -0800 ++++ uClibc/ldso/ldso/arm/dl-sysdep.h 2006-01-20 01:25:26.026727661 -0800 +@@ -85,7 +85,25 @@ elf_machine_load_address (void) + extern void __dl_start asm ("_dl_start"); + Elf32_Addr got_addr = (Elf32_Addr) &__dl_start; + Elf32_Addr pcrel_addr; ++#if !defined __thumb__ + asm ("adr %0, _dl_start" : "=r" (pcrel_addr)); ++#else ++ int tmp; ++ /* The above adr will not work on thumb because it ++ * is negative. The only safe way is to temporarily ++ * swap to arm. ++ */ ++ asm( ".align 2\n" ++ " bx pc\n" ++ " nop \n" ++ " .arm \n" ++ " adr %0, _dl_start\n" ++ " .align 2\n" ++ " orr %1, pc, #1\n" ++ " bx %1\n" ++ " .force_thumb\n" ++ : "=r" (pcrel_addr), "=&r" (tmp)); ++#endif + return pcrel_addr - got_addr; + } + +--- uClibc/libc/sysdeps/linux/arm/clone.S.orig 2006-01-19 19:03:55.000000000 -0800 ++++ uClibc/libc/sysdeps/linux/arm/clone.S 2006-01-19 19:30:30.969758100 -0800 +@@ -52,7 +52,11 @@ clone: + swi __NR_clone + movs a1, a1 + blt __error +- movne pc, lr ++#if defined(__THUMB_INTERWORK__) ++ bxne lr ++#else ++ movne pc, lr ++#endif + + @ pick the function arg and call address off the stack and execute + ldr r0, [sp, #4] +--- uClibc/libc/sysdeps/linux/arm/vfork.S.orig 2006-01-19 19:03:55.000000000 -0800 ++++ uClibc/libc/sysdeps/linux/arm/vfork.S 2006-01-19 19:33:09.533757874 -0800 +@@ -25,7 +25,11 @@ vfork: + #ifdef __NR_vfork + swi __NR_vfork + cmn r0, #4096 ++#if defined(__THUMB_INTERWORK__) ++ bxcc lr ++#else + movcc pc, lr ++#endif + + /* Check if vfork even exists. */ + ldr r1, =-ENOSYS +@@ -38,7 +42,11 @@ vfork: + cmn r0, #4096 + + /* Syscall worked. Return to child/parent */ ++#if defined(__THUMB_INTERWORK__) ++ bxcc lr ++#else + movcc pc, lr ++#endif + + __error: + b __syscall_error diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 910e633ccc..e48c6d734d 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -78,6 +78,7 @@ configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \ s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \ s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \ s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \ + s,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX="/lib",; \ s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \ ${@["s,.*UCLIBC_HAS_LOCALE.*,# UCLIBC_HAS_LOCALE is not set,;", ""][bb.data.getVar("USE_NLS", d, 1) == "yes"]}' CFLAGS := "${@oe_filter_out('-I\S+', '${CFLAGS}', d)}" diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 473cd48be2..951bc9b1ef 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,6 +8,7 @@ # UCLIBC_BASE ?= "0.9.28" PV = "${UCLIBC_BASE}+svn${SRCDATE}" +PR = "r1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. @@ -38,10 +39,21 @@ UCLIBC_PATCHES += " file://thumb-defined-arm-or-thumb.patch;patch=1" # # Thumb interworking support UCLIBC_PATCHES += " file://thumb-mov-pc-bx.patch;patch=1" -UCLIBC_PATCHES += " file://thumb-resolve.patch;patch=1" +UCLIBC_PATCHES += " file://thumb-swi-r7.patch;patch=1" +UCLIBC_PATCHES += " file://thumb-sysnum-h.patch;patch=1" +UCLIBC_PATCHES += " file://thumb-asm-swi.patch;patch=1" +UCLIBC_PATCHES += " file://thumb-call-via-rx.patch;patch=1" +# +# This is a core change and is controversial, maybe even wrong +# on some architectures +THUMB_INTERWORK_RESOLVE_PATCH = "" +THUMB_INTERWORK_RESOLVE_PATCH_thumb-interwork = " file://thumb-resolve.patch;patch=1" +UCLIBC_PATCHES += " ${THUMB_INTERWORK_RESOLVE_PATCH}" # Set this for non-head patches (the above list should match the # requirements of the SVN head). -UCLIBC_SVN_PATCHES ?= "${UCLIBC_PATCHES}" +#FIXME: not working with these patches +#UCLIBC_SVN_PATCHES ?= "${UCLIBC_PATCHES}" +UCLIBC_SVN_PATCHES ?= "" SRC_URI += "${UCLIBC_SVN_PATCHES}" |