diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2009-10-01 00:02:47 +0200 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@yahoo.com> | 2009-10-01 00:02:47 +0200 |
| commit | 4015d9e7ebadbf8bf86fe74059898ac802bb8b2d (patch) | |
| tree | dc920c867d60f85a7ec29615924f434f13a155b3 | |
| parent | 35e01a136bfc8910e119d9c67561b9ac39f63f16 (diff) | |
| parent | c9b04d64e0e66d23a25baecdfa19b20458508092 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
80 files changed, 3221 insertions, 3119 deletions
diff --git a/recipes/apt/apt-package.inc b/recipes/apt/apt-package.inc index 2b4f6d54a8..350bebd7f6 100644 --- a/recipes/apt/apt-package.inc +++ b/recipes/apt/apt-package.inc @@ -99,4 +99,11 @@ do_install () { install -d ${D}${localstatedir}/cache/apt/archives/partial install -d ${D}${docdir}/apt/examples install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/ + + install -d ${D}${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_apt +} + +pkg_postinst_${PN} () { + /etc/init.d/populate-volatile.sh update } diff --git a/recipes/apt/apt.inc b/recipes/apt/apt.inc index 4a4de1788a..2e1524a376 100644 --- a/recipes/apt/apt.inc +++ b/recipes/apt/apt.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg." LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://volatiles " S = "${WORKDIR}/apt-${PV}" diff --git a/recipes/apt/apt_0.7.14.bb b/recipes/apt/apt_0.7.14.bb index 251ed6416d..f64fa0019a 100644 --- a/recipes/apt/apt_0.7.14.bb +++ b/recipes/apt/apt_0.7.14.bb @@ -3,10 +3,9 @@ RDEPENDS = "dpkg" require apt.inc -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ - file://no-ko-translation.patch;patch=1 \ - file://use-host.patch;patch=1 " -PR = "r2" +SRC_URI += "file://no-ko-translation.patch;patch=1 \ + file://use-host.patch;patch=1 " +PR = "r3" SRC_URI += "file://nodoc.patch;patch=1" diff --git a/recipes/apt/apt_0.7.19.bb b/recipes/apt/apt_0.7.19.bb index 251ed6416d..f64fa0019a 100644 --- a/recipes/apt/apt_0.7.19.bb +++ b/recipes/apt/apt_0.7.19.bb @@ -3,10 +3,9 @@ RDEPENDS = "dpkg" require apt.inc -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ - file://no-ko-translation.patch;patch=1 \ - file://use-host.patch;patch=1 " -PR = "r2" +SRC_URI += "file://no-ko-translation.patch;patch=1 \ + file://use-host.patch;patch=1 " +PR = "r3" SRC_URI += "file://nodoc.patch;patch=1" diff --git a/recipes/apt/apt_0.7.20.2.bb b/recipes/apt/apt_0.7.20.2.bb index 88047cccce..d696ca2cf5 100644 --- a/recipes/apt/apt_0.7.20.2.bb +++ b/recipes/apt/apt_0.7.20.2.bb @@ -3,10 +3,10 @@ RDEPENDS = "dpkg" require apt.inc -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ - file://no-doxygen.patch;patch=1 \ - file://no-ko-translation.patch;patch=1 \ - file://use-host.patch;patch=1 " +SRC_URI += "file://no-doxygen.patch;patch=1 \ + file://no-ko-translation.patch;patch=1 \ + file://use-host.patch;patch=1 " +PR = "r1" require apt-package.inc diff --git a/recipes/apt/files/volatiles b/recipes/apt/files/volatiles new file mode 100644 index 0000000000..96f7e872e1 --- /dev/null +++ b/recipes/apt/files/volatiles @@ -0,0 +1,4 @@ +d root root 0755 /var/cache/apt none +d root root 0755 /var/cache/apt/archives none +d root root 0755 /var/cache/apt/archives/partial none +d root root 0755 /var/log/apt none diff --git a/recipes/dpkg/dpkg.inc b/recipes/dpkg/dpkg.inc index eb5778fa3b..b15a6365b4 100644 --- a/recipes/dpkg/dpkg.inc +++ b/recipes/dpkg/dpkg.inc @@ -19,17 +19,14 @@ inherit autotools gettext DPKG_INIT_POSITION = "98" DPKG_INIT_POSITION_slugos = "41" -pkg_postinst_dpkg () { -#!/bin/sh -if [ "x$D" != "x" ]; then - install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d +do_install_prepend () { + install -d ${D}${sysconfdir}/rcS.d # this happens at S98 where our good 'ole packages script used to run printf "#!/bin/sh - dpkg --configure -a - rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure -\n" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure - chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure -fi +dpkg --configure -a +rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure +" > ${D}${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure + chmod 0755 ${D}${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure } do_configure () { diff --git a/recipes/dpkg/dpkg_1.13.22.bb b/recipes/dpkg/dpkg_1.13.22.bb index e4e7a3b279..896346e286 100644 --- a/recipes/dpkg/dpkg_1.13.22.bb +++ b/recipes/dpkg/dpkg_1.13.22.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r5" +PR = "r6" DEPENDS += "zlib bzip2" SRC_URI += "file://noman.patch;patch=1" diff --git a/recipes/dpkg/dpkg_1.13.25.bb b/recipes/dpkg/dpkg_1.13.25.bb index 8a2c8abae0..f98cabf46e 100644 --- a/recipes/dpkg/dpkg_1.13.25.bb +++ b/recipes/dpkg/dpkg_1.13.25.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r1" +PR = "r2" DEPENDS += "zlib bzip2" SRC_URI += "file://noman.patch;patch=1" diff --git a/recipes/dpkg/dpkg_1.14.19.bb b/recipes/dpkg/dpkg_1.14.19.bb index 0377ce10f1..65d830995a 100644 --- a/recipes/dpkg/dpkg_1.14.19.bb +++ b/recipes/dpkg/dpkg_1.14.19.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r1" +PR = "r2" DEPENDS += "zlib bzip2" #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" SRC_URI += "file://noman.patch;patch=1" diff --git a/recipes/dpkg/dpkg_1.14.23.bb b/recipes/dpkg/dpkg_1.14.23.bb index 0377ce10f1..65d830995a 100644 --- a/recipes/dpkg/dpkg_1.14.23.bb +++ b/recipes/dpkg/dpkg_1.14.23.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r1" +PR = "r2" DEPENDS += "zlib bzip2" #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" SRC_URI += "file://noman.patch;patch=1" diff --git a/recipes/dpkg/dpkg_1.14.25.bb b/recipes/dpkg/dpkg_1.14.25.bb index dac14f96b6..0377ce10f1 100644 --- a/recipes/dpkg/dpkg_1.14.25.bb +++ b/recipes/dpkg/dpkg_1.14.25.bb @@ -1,4 +1,5 @@ require dpkg.inc +PR = "r1" DEPENDS += "zlib bzip2" #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" SRC_URI += "file://noman.patch;patch=1" diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc index 4638ddcdf1..3249c095b5 100644 --- a/recipes/gcc/gcc-4.2.4.inc +++ b/recipes/gcc/gcc-4.2.4.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv3" DEPENDS = "mpfr gmp" -INC_PR = "r8" +INC_PR = "r9" SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ @@ -41,23 +41,32 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ " SRC_URI_append_ep93xx = " \ - file://arm-crunch-saveregs.patch;patch=1 \ - file://arm-crunch-20000320.patch;patch=1 \ - file://arm-crunch-compare.patch;patch=1 \ - file://arm-crunch-compare-unordered.patch;patch=1 \ - file://arm-crunch-compare-geu.patch;patch=1 \ - file://arm-crunch-eabi-ieee754.patch;patch=1 \ - file://arm-crunch-eabi-ieee754-div.patch;patch=1 \ - file://arm-crunch-64bit-disable0.patch;patch=1 \ - file://arm-crunch-offset.patch;patch=1 \ - file://arm-crunch-fp_consts.patch;patch=1 \ - file://arm-crunch-neg2.patch;patch=1 \ - file://arm-crunch-predicates3.patch;patch=1 \ - file://arm-crunch-cfcvtds-disable.patch;patch=1 \ - file://arm-crunch-floatsi-disable.patch;patch=1 \ - file://arm-crunch-truncsi-disable.patch;patch=1 \ - file://arm-crunch-cfcvt64-disable.patch;patch=1 \ - file://arm-crunch-cirrus-bugfixes.patch;patch=1 \ + file://ep93xx/arm-crunch-readme.patch;patch=1 \ + file://ep93xx/arm-crunch-saveregs.patch;patch=1 \ + file://ep93xx/arm-crunch-scratch.patch;patch=1 \ + file://ep93xx/arm-crunch-eabi-ieee754-endian-littleword-littlebyte.patch;patch=1 \ + file://ep93xx/arm-crunch-eabi-mvf0-scratch-ieee754.patch;patch=1 \ + file://ep93xx/arm-crunch-20000320.patch;patch=1 \ + file://ep93xx/arm-crunch-disable-cmpdi.patch;patch=1 \ + file://ep93xx/arm-crunch-fix-64bit-const-offsets.patch;patch=1 \ + file://ep93xx/arm-crunch-fp_consts.patch;patch=1 \ + file://ep93xx/arm-crunch-neg-enable.patch;patch=1 \ + file://ep93xx/arm-crunch-neg-protect.patch;patch=1 \ + file://ep93xx/arm-crunch-repair-truncxfsi.patch;patch=1 \ + file://ep93xx/arm-crunch-floatsi-no-scratch.patch;patch=1 \ + file://ep93xx/arm-crunch-movsf-movdf-Uy.patch;patch=1 \ + file://ep93xx/arm-crunch-drop-thumb2.patch;patch=1 \ + file://ep93xx/arm-crunch-arm_dbx_register_number.patch;patch=1 \ + file://ep93xx/arm-crunch-pipeline.patch;patch=1 \ + file://ep93xx/arm-crunch-ccmav-mode.patch;patch=1 \ + file://ep93xx/arm-crunch-cfcpy-with-cfsh64.patch;patch=1 \ + file://ep93xx/arm-crunch-mieee.patch;patch=1 \ + file://ep93xx/arm-size-bugfix.patch;patch=1 \ + file://ep93xx/arm-prologue_use-length.patch;patch=1 \ + file://ep93xx/arm-crunch-cftruncd32-attr.patch;patch=1 \ + file://ep93xx/arm-crunch-fix-cirrus-reorg7.patch;patch=1 \ + file://ep93xx/arm-crunch-cirrus-di-flag.patch;patch=1 \ + file://ep93xx/arm-crunch-disable-floatsi.patch;patch=1 \ " PACKAGE_ARCH_ep93xx = "${MACHINE_ARCH}" diff --git a/recipes/gcc/gcc-4.2.4/arm-crunch-32bit-disable.patch b/recipes/gcc/gcc-4.2.4/arm-crunch-32bit-disable.patch deleted file mode 100644 index 88eaee322d..0000000000 --- a/recipes/gcc/gcc-4.2.4/arm-crunch-32bit-disable.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- gcc-4.1.2/gcc/config/arm/cirrus.md-integer 2007-06-15 09:01:37.000000000 +1000 -+++ gcc-4.1.2/gcc/config/arm/cirrus.md 2007-06-15 09:04:45.000000000 +1000 -@@ -149,7 +149,7 @@ - (match_operand:SI 1 "cirrus_fp_register" "0") - (mult:SI (match_operand:SI 2 "cirrus_fp_register" "v") - (match_operand:SI 3 "cirrus_fp_register" "v"))))] -- "0 && TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK" -+ "0 && TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK && 0" - "cfmsc32%?\\t%V0, %V2, %V3" - [(set_attr "type" "mav_farith") - (set_attr "cirrus" "normal")] -@@ -305,7 +305,7 @@ - [(set (match_operand:SF 0 "cirrus_fp_register" "=v") - (float:SF (match_operand:SI 1 "s_register_operand" "r"))) - (clobber (match_scratch:DF 2 "=v"))] -- "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK" -+ "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK && 0" - "cfmv64lr%?\\t%Z2, %1\;cfcvt32s%?\\t%V0, %Y2" - [(set_attr "length" "8") - (set_attr "cirrus" "move")] -@@ -315,7 +315,7 @@ - [(set (match_operand:DF 0 "cirrus_fp_register" "=v") - (float:DF (match_operand:SI 1 "s_register_operand" "r"))) - (clobber (match_scratch:DF 2 "=v"))] -- "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK" -+ "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK && 0" - "cfmv64lr%?\\t%Z2, %1\;cfcvt32d%?\\t%V0, %Y2" - [(set_attr "length" "8") - (set_attr "cirrus" "move")] -@@ -339,7 +339,7 @@ - [(set (match_operand:SI 0 "s_register_operand" "=r") - (fix:SI (fix:SF (match_operand:SF 1 "cirrus_fp_register" "v")))) - (clobber (match_scratch:DF 2 "=v"))] -- "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK" -+ "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK && 0" - "cftruncs32%?\\t%Y2, %V1\;cfmvr64l%?\\t%0, %Z2" - [(set_attr "length" "8") - (set_attr "cirrus" "normal")] -@@ -349,7 +349,7 @@ - [(set (match_operand:SI 0 "s_register_operand" "=r") - (fix:SI (fix:DF (match_operand:DF 1 "cirrus_fp_register" "v")))) - (clobber (match_scratch:DF 2 "=v"))] -- "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK" -+ "TARGET_ARM && TARGET_HARD_FLOAT && TARGET_MAVERICK && 0" - "cftruncd32%?\\t%Y2, %V1\;cfmvr64l%?\\t%0, %Z2" - [(set_attr "length" "8") - (set_attr "cirrus" "normal")] ---- gcc-4.1.2/gcc/config/arm/arm.md-trunc 2007-06-15 10:56:13.000000000 +1000 -+++ gcc-4.1.2/gcc/config/arm/arm.md 2007-06-15 11:01:22.000000000 +1000 -@@ -3130,7 +3130,7 @@ - (float:SF (match_operand:SI 1 "s_register_operand" "")))] - "TARGET_ARM && TARGET_HARD_FLOAT" - " -- if (TARGET_MAVERICK) -+ if (TARGET_MAVERICK && 0) - { - emit_insn (gen_cirrus_floatsisf2 (operands[0], operands[1])); - DONE; -@@ -3142,7 +3142,7 @@ - (float:DF (match_operand:SI 1 "s_register_operand" "")))] - "TARGET_ARM && TARGET_HARD_FLOAT" - " -- if (TARGET_MAVERICK) -+ if (TARGET_MAVERICK && 0) - { - emit_insn (gen_cirrus_floatsidf2 (operands[0], operands[1])); - DONE; |
