From 471667fb417dcf2fa437393690764c187ca29b7e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 22 Mar 2008 01:26:35 +0000 Subject: tetex: move to nonworking as discussed in bug 2510. Closes 2510, 2607 and 3748. --- packages/nonworking/tetex/.mtn2git_empty | 0 packages/nonworking/tetex/files/.mtn2git_empty | 0 packages/nonworking/tetex/files/configure.patch | 137 ++++++++++++++++++++++++ packages/nonworking/tetex/tetex-native_3.0.bb | 35 ++++++ packages/nonworking/tetex/tetex-texmf_3.0.bb | 75 +++++++++++++ packages/nonworking/tetex/tetex_3.0.bb | 100 +++++++++++++++++ packages/tetex/.mtn2git_empty | 0 packages/tetex/files/.mtn2git_empty | 0 packages/tetex/files/configure.patch | 137 ------------------------ packages/tetex/tetex-native_3.0.bb | 35 ------ packages/tetex/tetex-texmf_3.0.bb | 75 ------------- packages/tetex/tetex_3.0.bb | 100 ----------------- 12 files changed, 347 insertions(+), 347 deletions(-) create mode 100644 packages/nonworking/tetex/.mtn2git_empty create mode 100644 packages/nonworking/tetex/files/.mtn2git_empty create mode 100644 packages/nonworking/tetex/files/configure.patch create mode 100644 packages/nonworking/tetex/tetex-native_3.0.bb create mode 100644 packages/nonworking/tetex/tetex-texmf_3.0.bb create mode 100644 packages/nonworking/tetex/tetex_3.0.bb delete mode 100644 packages/tetex/.mtn2git_empty delete mode 100644 packages/tetex/files/.mtn2git_empty delete mode 100644 packages/tetex/files/configure.patch delete mode 100644 packages/tetex/tetex-native_3.0.bb delete mode 100644 packages/tetex/tetex-texmf_3.0.bb delete mode 100644 packages/tetex/tetex_3.0.bb (limited to 'packages') diff --git a/packages/nonworking/tetex/.mtn2git_empty b/packages/nonworking/tetex/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/tetex/files/.mtn2git_empty b/packages/nonworking/tetex/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/tetex/files/configure.patch b/packages/nonworking/tetex/files/configure.patch new file mode 100644 index 0000000000..7a955917df --- /dev/null +++ b/packages/nonworking/tetex/files/configure.patch @@ -0,0 +1,137 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- tetex-src-3.0/configure~configure.patch ++++ tetex-src-3.0/configure +@@ -3903,10 +3903,6 @@ + if test "$with_system_t1lib" = yes; then + echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 + echo "configure:3906: checking whether installed T1 lib is >= v 5.0.0 " >&5 +- if test "$cross_compiling" = yes; then +- ac_compile_t1lib=1 +- ] +-else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then + ac_compile_t1lib=0 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_compile_t1lib=1 +-fi + rm -fr conftest* + fi + +@@ -3975,7 +3963,6 @@ + LIBT1DEP= + using_system_t1lib=yes + fi +-fi + + + +--- tetex-src-3.0/libs/configure~configure.patch ++++ tetex-src-3.0/libs/configure +@@ -1711,10 +1711,6 @@ + if test "$with_system_t1lib" = yes; then + echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 + echo "configure:1714: checking whether installed T1 lib is >= v 5.0.0 " >&5 +- if test "$cross_compiling" = yes; then +- ac_compile_t1lib=1 +- ] +-else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- ac_compile_t1lib=0 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_compile_t1lib=1 +-fi ++ac_compile_t1lib=0 + rm -fr conftest* + fi + +@@ -1783,7 +1771,6 @@ + LIBT1DEP= + using_system_t1lib=yes + fi +-fi + + + +--- tetex-src-3.0/utils/texinfo/configure~configure.patch ++++ tetex-src-3.0/utils/texinfo/configure +@@ -689,7 +689,7 @@ + # FIXME: To remove some day. + if test "x$host_alias" != x; then + if test "x$build_alias" = x; then +- cross_compiling=maybe ++ cross_compiling=no + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then +--- tetex-src-3.0/texk/dvipng/configure~configure.patch ++++ tetex-src-3.0/texk/dvipng/configure +@@ -2642,10 +2642,7 @@ + if test "$with_system_t1lib" = yes; then + echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 + echo "configure:2645: checking whether installed T1 lib is >= v 5.0.0 " >&5 +- if test "$cross_compiling" = yes; then +- ac_compile_t1lib=1 +- ] +-else ++ac_compile_t1lib=0 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- ac_compile_t1lib=0 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_compile_t1lib=1 ++ac_compile_t1lib=0 + fi + rm -fr conftest* + fi +@@ -2696,7 +2686,6 @@ + echo "$ac_t""no, will compile my own version" 1>&6 + with_system_t1lib=no + fi +- fi + + LDFLAGS=$OLD_LDFLAGS + CPP=$OLD_CPP +@@ -2714,7 +2703,6 @@ + LIBT1DEP= + using_system_t1lib=yes + fi +-fi + + + diff --git a/packages/nonworking/tetex/tetex-native_3.0.bb b/packages/nonworking/tetex/tetex-native_3.0.bb new file mode 100644 index 0000000000..4d683ff3d1 --- /dev/null +++ b/packages/nonworking/tetex/tetex-native_3.0.bb @@ -0,0 +1,35 @@ +require tetex_${PV}.bb +inherit native +DEPENDS = "" +PR = "r2" + +PACKAGES="" +RRECOMMENDS_${PN}="" + +do_configure() { + oe_runconf +} + +BINARIES = "texk/web2c/tangle \ + texk/web2c/ctangle \ + texk/web2c/otangle \ + texk/web2c/tie \ + utils/texinfo/info/makedoc \ + utils/texinfo/makeinfo/makeinfo" + +do_stage() { + for binary in ${BINARIES} + do + install -m 0755 $binary ${STAGING_BINDIR} + done +} + +do_install () { + : +} + + +do_rm_work () { + : +} + diff --git a/packages/nonworking/tetex/tetex-texmf_3.0.bb b/packages/nonworking/tetex/tetex-texmf_3.0.bb new file mode 100644 index 0000000000..80d6f779d8 --- /dev/null +++ b/packages/nonworking/tetex/tetex-texmf_3.0.bb @@ -0,0 +1,75 @@ +DESCRIPTION = "teTeX data" +LICENSE = "GPL" +SECTION = "console/utils" +PR = "r0" + +SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-${PV}.tar.gz" +S = "${WORKDIR}" + +STUFF = "aliases ChangeLog doc dvips LICENSE.texmf makeindex metapost omega \ + scripts texdoctk bibtex context dvipdfm fonts ls-R metafont \ + mft release-tetex-texmf.txt tex web2c " + +do_install() { + install -d ${D}${datadir}/texmf + for i in ${STUFF} + do + cp -pPR $i ${D}${datadir}/texmf + done +} + +ALLOW_EMPTY_${PN} = "1" + +RRECOMMENDS_${PN} = " \ + tetex-texmf-common \ + tetex-texmf-bibtex \ + tetex-texmf-context \ + tetex-texmf-texdoc \ + tetex-texmf-dvipdfm \ + tetex-texmf-dvips \ + tetex-texmf-fonts \ + tetex-texmf-makeindex \ + tetex-texmf-metafont \ + tetex-texmf-metapost \ + tetex-texmf-mft \ + tetex-texmf-omega \ + tetex-texmf-scripts \ + tetex-texmf-tex \ + tetex-texmf-texdoctk \ + tetex-texmf-web2c " + +PACKAGES = "${PN}-dbg tetex-texmf \ + tetex-texmf-bibtex \ + tetex-texmf-context \ + tetex-texmf-texdoc \ + tetex-texmf-dvipdfm \ + tetex-texmf-dvips \ + tetex-texmf-fonts \ + tetex-texmf-makeindex \ + tetex-texmf-metafont \ + tetex-texmf-metapost \ + tetex-texmf-mft \ + tetex-texmf-omega \ + tetex-texmf-scripts \ + tetex-texmf-tex \ + tetex-texmf-texdoctk \ + tetex-texmf-web2c \ + tetex-texmf-common" + +FILES_${PN} = "" +FILES_tetex-texmf-common = "${datadir}/texmf" +FILES_tetex-texmf-bibtex = "${datadir}/texmf/bibtex" +FILES_tetex-texmf-context = "${datadir}/texmf/context" +FILES_tetex-texmf-texdoc = "${datadir}/texmf/doc" +FILES_tetex-texmf-dvipdfm = "${datadir}/texmf/dvipdfm" +FILES_tetex-texmf-dvips = "${datadir}/texmf/dvips" +FILES_tetex-texmf-fonts = "${datadir}/texmf/fonts" +FILES_tetex-texmf-makeindex = "${datadir}/texmf/makeindex" +FILES_tetex-texmf-metafont = "${datadir}/texmf/metafont" +FILES_tetex-texmf-metapost = "${datadir}/texmf/metapost" +FILES_tetex-texmf-mft = "${datadir}/texmf/mft" +FILES_tetex-texmf-omega = "${datadir}/texmf/omega" +FILES_tetex-texmf-scripts = "${datadir}/texmf/scripts" +FILES_tetex-texmf-tex = "${datadir}/texmf/tex" +FILES_tetex-texmf-texdoctk = "${datadir}/texmf/texdoctk" +FILES_tetex-texmf-web2c = "${datadir}/texmf/web2c" diff --git a/packages/nonworking/tetex/tetex_3.0.bb b/packages/nonworking/tetex/tetex_3.0.bb new file mode 100644 index 0000000000..eedf8820b2 --- /dev/null +++ b/packages/nonworking/tetex/tetex_3.0.bb @@ -0,0 +1,100 @@ +DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible systems" +HOMEPAGE = "http://www.tug.org/tetex" +LICENSE = "GPL" +SECTION = "console/utils" +DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib" +PR = "r6" + +SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \ + file://configure.patch;patch=1" +S = "${WORKDIR}/tetex-src-${PV}" + +inherit autotools + +PARALLEL_MAKE = "" + +export BUILDCC = "${BUILD_CC}" +export BUILDCFLAGS = "${BUILD_CFLAGS}" +export BUILDLDFLAGS = "${BUILD_LDFLAGS}" +export BUILDCCLD = "${BUILD_CC}" + +EXTRA_OECONF = "--with-system-libgd \ + --with-system-ncurses \ + --with-ncurses-include=${STAGING_INCDIR} \ + --with-system-pnglib \ + --with-system-t1lib \ + --with-system-zlib \ + --without-dialog \ + --without-xdvik \ + --with-x11 \ + --without-mf-x-toolkit" + +# NOTE: In theory, teTeX has a good buildsystem, which automatically detects +# whether we are cross-compiling and compiles the necessary host tools. +# Unfortunately it doesn't work in our case and we better just add +# tetex-native for the time being. +# It would be good to autoreconf all the stuff, but the upstream configure.in +# is faulty and outdated :/ +do_configure() { + rm -f texk/libtool.m4 + libtoolize --force + gnu-configize + oe_runconf ${EXTRA_OECONF} + find . -name libtool|xargs rm -f + rm -rf ${S}/utils/texinfo/tools/info + rm -rf ${S}/utils/texinfo/tools/makeinfo + ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/info + ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/makeinfo + cat >${S}/utils/texinfo/tools/Makefile <= v 5.0.0 ""... $ac_c" 1>&6 - echo "configure:3906: checking whether installed T1 lib is >= v 5.0.0 " >&5 -- if test "$cross_compiling" = yes; then -- ac_compile_t1lib=1 -- ] --else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then - ac_compile_t1lib=0 --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_compile_t1lib=1 --fi - rm -fr conftest* - fi - -@@ -3975,7 +3963,6 @@ - LIBT1DEP= - using_system_t1lib=yes - fi --fi - - - ---- tetex-src-3.0/libs/configure~configure.patch -+++ tetex-src-3.0/libs/configure -@@ -1711,10 +1711,6 @@ - if test "$with_system_t1lib" = yes; then - echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 - echo "configure:1714: checking whether installed T1 lib is >= v 5.0.0 " >&5 -- if test "$cross_compiling" = yes; then -- ac_compile_t1lib=1 -- ] --else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_compile_t1lib=0 --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_compile_t1lib=1 --fi -+ac_compile_t1lib=0 - rm -fr conftest* - fi - -@@ -1783,7 +1771,6 @@ - LIBT1DEP= - using_system_t1lib=yes - fi --fi - - - ---- tetex-src-3.0/utils/texinfo/configure~configure.patch -+++ tetex-src-3.0/utils/texinfo/configure -@@ -689,7 +689,7 @@ - # FIXME: To remove some day. - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then -- cross_compiling=maybe -+ cross_compiling=no - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then ---- tetex-src-3.0/texk/dvipng/configure~configure.patch -+++ tetex-src-3.0/texk/dvipng/configure -@@ -2642,10 +2642,7 @@ - if test "$with_system_t1lib" = yes; then - echo $ac_n "checking whether installed T1 lib is >= v 5.0.0 ""... $ac_c" 1>&6 - echo "configure:2645: checking whether installed T1 lib is >= v 5.0.0 " >&5 -- if test "$cross_compiling" = yes; then -- ac_compile_t1lib=1 -- ] --else -+ac_compile_t1lib=0 - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_compile_t1lib=0 --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_compile_t1lib=1 -+ac_compile_t1lib=0 - fi - rm -fr conftest* - fi -@@ -2696,7 +2686,6 @@ - echo "$ac_t""no, will compile my own version" 1>&6 - with_system_t1lib=no - fi -- fi - - LDFLAGS=$OLD_LDFLAGS - CPP=$OLD_CPP -@@ -2714,7 +2703,6 @@ - LIBT1DEP= - using_system_t1lib=yes - fi --fi - - - diff --git a/packages/tetex/tetex-native_3.0.bb b/packages/tetex/tetex-native_3.0.bb deleted file mode 100644 index 4d683ff3d1..0000000000 --- a/packages/tetex/tetex-native_3.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -require tetex_${PV}.bb -inherit native -DEPENDS = "" -PR = "r2" - -PACKAGES="" -RRECOMMENDS_${PN}="" - -do_configure() { - oe_runconf -} - -BINARIES = "texk/web2c/tangle \ - texk/web2c/ctangle \ - texk/web2c/otangle \ - texk/web2c/tie \ - utils/texinfo/info/makedoc \ - utils/texinfo/makeinfo/makeinfo" - -do_stage() { - for binary in ${BINARIES} - do - install -m 0755 $binary ${STAGING_BINDIR} - done -} - -do_install () { - : -} - - -do_rm_work () { - : -} - diff --git a/packages/tetex/tetex-texmf_3.0.bb b/packages/tetex/tetex-texmf_3.0.bb deleted file mode 100644 index 80d6f779d8..0000000000 --- a/packages/tetex/tetex-texmf_3.0.bb +++ /dev/null @@ -1,75 +0,0 @@ -DESCRIPTION = "teTeX data" -LICENSE = "GPL" -SECTION = "console/utils" -PR = "r0" - -SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-texmf-${PV}.tar.gz" -S = "${WORKDIR}" - -STUFF = "aliases ChangeLog doc dvips LICENSE.texmf makeindex metapost omega \ - scripts texdoctk bibtex context dvipdfm fonts ls-R metafont \ - mft release-tetex-texmf.txt tex web2c " - -do_install() { - install -d ${D}${datadir}/texmf - for i in ${STUFF} - do - cp -pPR $i ${D}${datadir}/texmf - done -} - -ALLOW_EMPTY_${PN} = "1" - -RRECOMMENDS_${PN} = " \ - tetex-texmf-common \ - tetex-texmf-bibtex \ - tetex-texmf-context \ - tetex-texmf-texdoc \ - tetex-texmf-dvipdfm \ - tetex-texmf-dvips \ - tetex-texmf-fonts \ - tetex-texmf-makeindex \ - tetex-texmf-metafont \ - tetex-texmf-metapost \ - tetex-texmf-mft \ - tetex-texmf-omega \ - tetex-texmf-scripts \ - tetex-texmf-tex \ - tetex-texmf-texdoctk \ - tetex-texmf-web2c " - -PACKAGES = "${PN}-dbg tetex-texmf \ - tetex-texmf-bibtex \ - tetex-texmf-context \ - tetex-texmf-texdoc \ - tetex-texmf-dvipdfm \ - tetex-texmf-dvips \ - tetex-texmf-fonts \ - tetex-texmf-makeindex \ - tetex-texmf-metafont \ - tetex-texmf-metapost \ - tetex-texmf-mft \ - tetex-texmf-omega \ - tetex-texmf-scripts \ - tetex-texmf-tex \ - tetex-texmf-texdoctk \ - tetex-texmf-web2c \ - tetex-texmf-common" - -FILES_${PN} = "" -FILES_tetex-texmf-common = "${datadir}/texmf" -FILES_tetex-texmf-bibtex = "${datadir}/texmf/bibtex" -FILES_tetex-texmf-context = "${datadir}/texmf/context" -FILES_tetex-texmf-texdoc = "${datadir}/texmf/doc" -FILES_tetex-texmf-dvipdfm = "${datadir}/texmf/dvipdfm" -FILES_tetex-texmf-dvips = "${datadir}/texmf/dvips" -FILES_tetex-texmf-fonts = "${datadir}/texmf/fonts" -FILES_tetex-texmf-makeindex = "${datadir}/texmf/makeindex" -FILES_tetex-texmf-metafont = "${datadir}/texmf/metafont" -FILES_tetex-texmf-metapost = "${datadir}/texmf/metapost" -FILES_tetex-texmf-mft = "${datadir}/texmf/mft" -FILES_tetex-texmf-omega = "${datadir}/texmf/omega" -FILES_tetex-texmf-scripts = "${datadir}/texmf/scripts" -FILES_tetex-texmf-tex = "${datadir}/texmf/tex" -FILES_tetex-texmf-texdoctk = "${datadir}/texmf/texdoctk" -FILES_tetex-texmf-web2c = "${datadir}/texmf/web2c" diff --git a/packages/tetex/tetex_3.0.bb b/packages/tetex/tetex_3.0.bb deleted file mode 100644 index eedf8820b2..0000000000 --- a/packages/tetex/tetex_3.0.bb +++ /dev/null @@ -1,100 +0,0 @@ -DESCRIPTION = "teTeX is a complete (pdf)(La)TeX distribution for UNIX compatible systems" -HOMEPAGE = "http://www.tug.org/tetex" -LICENSE = "GPL" -SECTION = "console/utils" -DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib" -PR = "r6" - -SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \ - file://configure.patch;patch=1" -S = "${WORKDIR}/tetex-src-${PV}" - -inherit autotools - -PARALLEL_MAKE = "" - -export BUILDCC = "${BUILD_CC}" -export BUILDCFLAGS = "${BUILD_CFLAGS}" -export BUILDLDFLAGS = "${BUILD_LDFLAGS}" -export BUILDCCLD = "${BUILD_CC}" - -EXTRA_OECONF = "--with-system-libgd \ - --with-system-ncurses \ - --with-ncurses-include=${STAGING_INCDIR} \ - --with-system-pnglib \ - --with-system-t1lib \ - --with-system-zlib \ - --without-dialog \ - --without-xdvik \ - --with-x11 \ - --without-mf-x-toolkit" - -# NOTE: In theory, teTeX has a good buildsystem, which automatically detects -# whether we are cross-compiling and compiles the necessary host tools. -# Unfortunately it doesn't work in our case and we better just add -# tetex-native for the time being. -# It would be good to autoreconf all the stuff, but the upstream configure.in -# is faulty and outdated :/ -do_configure() { - rm -f texk/libtool.m4 - libtoolize --force - gnu-configize - oe_runconf ${EXTRA_OECONF} - find . -name libtool|xargs rm -f - rm -rf ${S}/utils/texinfo/tools/info - rm -rf ${S}/utils/texinfo/tools/makeinfo - ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/info - ln -sf ${STAGING_BINDIR_NATIVE} ${S}/utils/texinfo/tools/makeinfo - cat >${S}/utils/texinfo/tools/Makefile < Date: Sat, 22 Mar 2008 10:57:42 +0000 Subject: glib-2.0-2.16.1: bump PR for the change in f1f02c875914c0bfe542289381d12559c4843ff7 --- packages/glib-2.0/glib-2.0_2.16.1.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb index 111b3f59e3..ccbbb9be70 100644 --- a/packages/glib-2.0/glib-2.0_2.16.1.bb +++ b/packages/glib-2.0/glib-2.0_2.16.1.bb @@ -1,5 +1,7 @@ require glib.inc +PR = "r3" + SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ file://configure-libtool.patch;patch=1 \ -- cgit v1.2.3 From 379e6441f9af24ce817cad7e433ce9a599c4188c Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 22 Mar 2008 12:07:20 +0000 Subject: initramfs-uniboot-1.0: only source existing files in load_modules * this avoids "/init: source: 64: Can't open /initrd.d/0*" for initramfs images built without the bootldr-buster module. --- packages/initrdscripts/files/init.sh | 8 +++++--- packages/initrdscripts/initramfs-uniboot_1.0.bb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 60d2e5da8b..cfac69b6d9 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -41,9 +41,11 @@ read_args() { load_modules() { for module in $MODULE_DIR/$1; do - # Cannot redir to $CONSOLE here easily - may not be set yet - echo "initramfs: Loading $module module" - source $module + if [ -e "$module" ]; then + # Cannot redir to $CONSOLE here easily - may not be set yet + echo "initramfs: Loading $module module" + source $module + fi done } diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index 403db0b562..5a042ab748 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r8" +PR = "r9" DESCRIPTON = "A modular initramfs init script system." RRECOMMENDS = "kernel-module-mtdblock" -- cgit v1.2.3 From e2adcb8483aa81656a9ed3e63d527dcdb3dc4496 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sat, 22 Mar 2008 12:49:19 +0000 Subject: mpfr: upgrade to 2.3.1 (upstream bug fix release) --- packages/mpfr/mpfr-native_2.3.0.bb | 4 ---- packages/mpfr/mpfr-native_2.3.1.bb | 4 ++++ packages/mpfr/mpfr_2.3.0.bb | 11 ----------- packages/mpfr/mpfr_2.3.1.bb | 11 +++++++++++ 4 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 packages/mpfr/mpfr-native_2.3.0.bb create mode 100644 packages/mpfr/mpfr-native_2.3.1.bb delete mode 100644 packages/mpfr/mpfr_2.3.0.bb create mode 100644 packages/mpfr/mpfr_2.3.1.bb (limited to 'packages') diff --git a/packages/mpfr/mpfr-native_2.3.0.bb b/packages/mpfr/mpfr-native_2.3.0.bb deleted file mode 100644 index 01ba37c8bf..0000000000 --- a/packages/mpfr/mpfr-native_2.3.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require mpfr_${PV}.bb -inherit native -DEPENDS = "gmp-native" - diff --git a/packages/mpfr/mpfr-native_2.3.1.bb b/packages/mpfr/mpfr-native_2.3.1.bb new file mode 100644 index 0000000000..01ba37c8bf --- /dev/null +++ b/packages/mpfr/mpfr-native_2.3.1.bb @@ -0,0 +1,4 @@ +require mpfr_${PV}.bb +inherit native +DEPENDS = "gmp-native" + diff --git a/packages/mpfr/mpfr_2.3.0.bb b/packages/mpfr/mpfr_2.3.0.bb deleted file mode 100644 index 869c4227e2..0000000000 --- a/packages/mpfr/mpfr_2.3.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require mpfr.inc - -DEPENDS = "gmp" -PR = "r1" - -SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" -S = "${WORKDIR}/mpfr-${PV}" - -do_stage() { - autotools_stage_all -} diff --git a/packages/mpfr/mpfr_2.3.1.bb b/packages/mpfr/mpfr_2.3.1.bb new file mode 100644 index 0000000000..db04ce002b --- /dev/null +++ b/packages/mpfr/mpfr_2.3.1.bb @@ -0,0 +1,11 @@ +require mpfr.inc + +DEPENDS = "gmp" +PR = "r0" + +SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2" +S = "${WORKDIR}/mpfr-${PV}" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From d3bebc50f49d50ac145be46ca570d33cfadb811b Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sat, 22 Mar 2008 17:06:58 +0000 Subject: wlan-ng-utils: remove duplicated man pages --- packages/wlan-ng/wlan-ng-utils.inc | 2 +- packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb | 2 +- packages/wlan-ng/wlan-ng-utils_0.2.3.bb | 2 +- packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb | 2 ++ packages/wlan-ng/wlan-ng-utils_0.2.7.bb | 2 +- packages/wlan-ng/wlan-ng-utils_0.2.8.bb | 2 +- packages/wlan-ng/wlan-ng-utils_svn.bb | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) (limited to 'packages') diff --git a/packages/wlan-ng/wlan-ng-utils.inc b/packages/wlan-ng/wlan-ng-utils.inc index fe00e161d3..bade47ce30 100644 --- a/packages/wlan-ng/wlan-ng-utils.inc +++ b/packages/wlan-ng/wlan-ng-utils.inc @@ -61,8 +61,8 @@ do_install() { install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl install -d ${D}${mandir}/man1 install -m 0644 ${S}/man/*.1 ${D}${mandir}/man1/ + rm -rf ${D}/usr/local/man } -FILES_${PN}-doc += "/usr/local/man" FILES_${PN}-dbg += "/sbin/.debug" FILES_${PN} = "/etc /sbin" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb index 9ac5348a98..ff41097393 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.1-pre26.bb @@ -1,3 +1,3 @@ require wlan-ng-utils.inc -PR = "r1" +PR = "r2" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb index d4e0a39c70..7e28b417c9 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.3.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.3.bb @@ -1,6 +1,6 @@ require wlan-ng-utils.inc -PR = "r2" +PR = "r3" SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb index f71a2ee34a..6f7c75cf7d 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.4+svn20060823.bb @@ -1,5 +1,7 @@ require wlan-ng-utils.inc +PR = "r1" + SRCDATE = "20060823" PV = "0.2.4+svn${SRCDATE}" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb index 0b6f33e380..141ae42957 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.7.bb @@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ file://hostldflags.patch;patch=1" -PR = "r1" +PR = "r2" diff --git a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb index e37d548a9f..0b6f33e380 100644 --- a/packages/wlan-ng/wlan-ng-utils_0.2.8.bb +++ b/packages/wlan-ng/wlan-ng-utils_0.2.8.bb @@ -4,4 +4,4 @@ SRC_URI += "file://scripts-makefile-hostcc.patch;patch=1 \ file://pcmciasrc.patch;patch=1 \ file://hostldflags.patch;patch=1" -PR = "r0" +PR = "r1" diff --git a/packages/wlan-ng/wlan-ng-utils_svn.bb b/packages/wlan-ng/wlan-ng-utils_svn.bb index fae48545ff..9de024f006 100644 --- a/packages/wlan-ng/wlan-ng-utils_svn.bb +++ b/packages/wlan-ng/wlan-ng-utils_svn.bb @@ -1,6 +1,6 @@ require wlan-ng-utils.inc -PR = "r2" +PR = "r3" PV = "0.2.4+svn${SRCDATE}" SRC_URI = "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ -- cgit v1.2.3 From d452d1bfcadab6a85fc662bc11307d3271722830 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sat, 22 Mar 2008 17:15:02 +0000 Subject: wlan-ng-modules: fix RDEPENDS * rm RRECOMMENDS, as everything RDEPENDS on wlan-ng-utils * rm man pages and configure scripts, these are shipped by wlan-ng-utils * rm bogus RPROVIDES --- packages/wlan-ng/wlan-ng-modules.inc | 27 +++++++++++++--------- packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb | 2 +- packages/wlan-ng/wlan-ng-modules_0.2.3.bb | 3 +-- .../wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb | 2 ++ .../wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb | 3 ++- packages/wlan-ng/wlan-ng-modules_0.2.7.bb | 2 +- .../wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb | 3 ++- packages/wlan-ng/wlan-ng-modules_svn.bb | 2 +- 8 files changed, 26 insertions(+), 18 deletions(-) (limited to 'packages') diff --git a/packages/wlan-ng/wlan-ng-modules.inc b/packages/wlan-ng/wlan-ng-modules.inc index 20d7389512..6dbadceca8 100644 --- a/packages/wlan-ng/wlan-ng-modules.inc +++ b/packages/wlan-ng/wlan-ng-modules.inc @@ -2,8 +2,6 @@ DESCRIPTION = "linux-wlan-ng (prism2.x, prism3, pcmcia, pci, usb) driver for 11M HOMEPAGE = "http://www.linux-wlan.org" SECTION = "kernel/modules" DEPENDS = "virtual/kernel" -RRECOMMENDS = "wlan-ng-utils" -RPROVIDES += "wlan-ng-modules-usb wlan-ng-modules" LICENSE = "GPL" SRC_URI = "file://no-compat.patch;patch=1 \ @@ -55,15 +53,22 @@ do_install() { # Listen closely... sssshhh... can you hear the wlan-ng build system suck? rm -f ${KERNEL_SOURCE}/../config.mk rm -f ${KERNEL_SOURCE}/../../config.mk + + # man page and configure scripts are shipped by wlan-ng-utils + rm -rf ${D}/usr/local/man + rm -rf ${D}/etc } -PACKAGES = "${PN}-dbg wlan-ng-modules-usb wlan-ng-modules-cs wlan-ng-modules-pci wlan-ng-modules-p80211" -FILES_wlan-ng-modules-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}" -FILES_wlan-ng-modules-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}" -FILES_wlan-ng-modules-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}" -FILES_wlan-ng-modules-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \ +PACKAGES =+ "${PN}-p80211 ${PN}-usb ${PN}-cs ${PN}-pci" +ALLOW_EMPTY_${PN} = "1" +FILES_${PN}-p80211 = "/lib/modules/${KERNEL_VERSION}/wlan-ng/p80211${KERNEL_OBJECT_SUFFIX}" +FILES_${PN}-usb = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_usb${KERNEL_OBJECT_SUFFIX}" +FILES_${PN}-cs = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_cs${KERNEL_OBJECT_SUFFIX}" +FILES_${PN}-pci = "/lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_pci${KERNEL_OBJECT_SUFFIX} \ /lib/modules/${KERNEL_VERSION}/wlan-ng/prism2_plx${KERNEL_OBJECT_SUFFIX}" -RDEPENDS_wlan-ng-modules-p80211 = "wlan-ng-utils" -RDEPENDS_wlan-ng-modules-usb = "wlan-ng-modules-p80211" -RDEPENDS_wlan-ng-modules-cs = "wlan-ng-modules-p80211" -RDEPENDS_wlan-ng-modules-pci = "wlan-ng-modules-p80211" + +RDEPENDS_${PN}-p80211 = "wlan-ng-utils" +RDEPENDS_${PN} = "${PN}-p80211" +RDEPENDS_${PN}-usb = "${PN}-p80211" +RDEPENDS_${PN}-cs = "${PN}-p80211" +RDEPENDS_${PN}-pci = "${PN}-p80211" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb index cb6edc97dc..f2ead8d8b3 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb @@ -1,6 +1,6 @@ require wlan-ng-modules.inc -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/older/linux-wlan-ng-${PV}.tar.bz2 \ file://no-compat.patch;patch=1 \ diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb index 2157a29fa2..6dc9be552d 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.3.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.3.bb @@ -1,9 +1,8 @@ require wlan-ng-modules.inc -PR = "r3" +PR = "r4" SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ file://prism2sta_commsqual_defer.patch;patch=1 \ file://modules-symvers.patch;patch=1 \ file://usb-owner.patch;patch=1 " S = "${WORKDIR}/linux-wlan-ng-${PV}" - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb index ade99ac50d..9639389501 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.4+svn20060823.bb @@ -1,5 +1,7 @@ require wlan-ng-modules.inc +PR = "r1" + SRCDATE = "20060823" PV = "0.2.4+svn${SRCDATE}" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb index dd320276f5..f322848d59 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.5+svn20061109.bb @@ -1,8 +1,9 @@ require wlan-ng-modules.inc +PR = "r1" + SRCDATE = "20061109" PV = "0.2.5+svn${SRCDATE}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " S = "${WORKDIR}/trunk" - diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb index bacd662680..a0113e9ae4 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.7.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.7.bb @@ -1,6 +1,6 @@ require wlan-ng-modules.inc -PR = "r1" +PR = "r2" SRC_URI += "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ file://2.6.22-fixes.patch;patch=1" diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb index f1fadadd09..4a5df48ba9 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.8+svn20080315.bb @@ -1,9 +1,10 @@ require wlan-ng-modules.inc +PR = "r1" + SRCDATE = "20080315" PV = "0.2.8+svn${SRCDATE}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " S = "${WORKDIR}/trunk" - diff --git a/packages/wlan-ng/wlan-ng-modules_svn.bb b/packages/wlan-ng/wlan-ng-modules_svn.bb index a1826a36f3..1368729826 100644 --- a/packages/wlan-ng/wlan-ng-modules_svn.bb +++ b/packages/wlan-ng/wlan-ng-modules_svn.bb @@ -1,5 +1,5 @@ require wlan-ng-modules.inc -PR = "r0" +PR = "r1" PV = "0.2.4+svn${SRCDATE}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " -- cgit v1.2.3 From 000108573470503cad4447b8f5c8bd026712dd5f Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 22 Mar 2008 23:46:30 +0000 Subject: sysconf: make sure temporary partition is unmounted even in event of error. --- packages/slugos-init/files/sysconf | 4 ++++ packages/slugos-init/slugos-init_4.8.bb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf index 84a14af550..57a69b7643 100644 --- a/packages/slugos-init/files/sysconf +++ b/packages/slugos-init/files/sysconf @@ -665,6 +665,8 @@ sysconf_restore(){ # mkdir "$saved" || { sysconf_restore_error "$ffsdir" "$saved: failed to create temporary directory" + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 return 1 } # @@ -678,6 +680,8 @@ sysconf_restore(){ ) || { rm -rf "$saved" sysconf_restore_error "$ffsdir" "$saved: cpio -i failed" + umount "$ffsdir" && rmdir "$ffsdir" || + echo "$0: $ffsdir: temporary directory cleanup failed" >&2 return 1 } # either there must be no 'diff' files or it must diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb index 4babf89d61..ebb6ff7744 100644 --- a/packages/slugos-init/slugos-init_4.8.bb +++ b/packages/slugos-init/slugos-init_4.8.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r2" +PR = "r3" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3