minor trivia; [RFC] add xz
cover minor trivia; [RFC] add xz
Hi,
hwcloch.sh: resend with just the !getopt_long fixes.
autoconf: add SRC_URI name setting for later 2.65 addition
gmp: add SRC_URI name setting for later 5.0.1 addition (not sent) base.bbclass: handle xz compressed files
busybox: all *.gz were moved to legacy/ a few days ago. Switch to
new-style checksums while at it. Didn't touch 1.7.2 which is now undownloadable but ancient cruft anyway.
Remove checksums for download-patches that don't show up in recipes/busybox/*bb
autoconf: well, add 2.65; xz will need > 2.63
RFC: xz package (lzma successor). That's the RFC spot. The git versions
(e.g. xz-native_git, automake-1.11.1, autoconf-2.65) somehow behave oddly with NLS on.
Do sed -i -e "/^EXTRA_OECONF/d" recipes/xz/xz_git.bb and also wipe everything below "^# XXX" for the gory details. Ideas?
Everything but xz would be nice to have in dev, xz unaltered like in the patch in this series works for me but needs further love to be clean;
Thanks && cheers,
Bernhard Reutner-Fischer (8):
hwclock.sh: some more !getopt_long fixes
autoconf: set SRC_URI name
gmp: set SRC_URI name
handle xz compressed files and tarballs
busybox: use .tar.bz2
busybox: remove orphaned patch checksums
autoconf: add 2.65
xz: add xz package
classes/base.bbclass | 4 + conf/checksums.ini | 92 --------------- .../autoheader-nonfatal-warnings.patch | 13 ++ .../autoconf-2.65/autoreconf-exclude.patch | 123 ++++++++++++++++++++ .../autoconf-2.65/autoreconf-foreign.patch | 11 ++ .../autoconf-2.65/autoreconf-gnuconfigize.patch | 30 +++++ recipes/autoconf/autoconf-2.65/config-site.patch | 11 ++ recipes/autoconf/autoconf-2.65/fix_path_xtra.patch | 111 ++++++++++++++++++ recipes/autoconf/autoconf-2.65/program-GNU.patch | 13 ++ recipes/autoconf/autoconf-2.65/program-mkdir.patch | 11 ++ .../autoconf/autoconf-2.65/program_prefix.patch | 19 +++ recipes/autoconf/autoconf-native_2.65.bb | 12 ++ recipes/autoconf/autoconf.inc | 2 +- recipes/autoconf/autoconf_2.65.bb | 15 +++ recipes/busybox/busybox.inc | 1 - recipes/busybox/busybox_1.11.3.bb | 4 +- recipes/busybox/busybox_1.13.2.bb | 4 +- recipes/busybox/busybox_1.14.3.bb | 6 +- recipes/busybox/busybox_1.15.3.bb | 4 +- recipes/busybox/busybox_1.2.1.bb | 7 +- recipes/busybox/busybox_1.2.2.bb | 7 +- recipes/busybox/busybox_1.3.1.bb | 6 +- recipes/busybox/busybox_1.7.2.bb | 4 +- recipes/busybox/busybox_1.9.2.bb | 4 +- recipes/busybox/files/hwclock.sh | 10 +- recipes/gettext/gettext-0.17/m4_copy.patch | 52 ++++++++ recipes/gettext/gettext_0.17.bb | 1 + recipes/gmp/gmp.inc | 2 +- recipes/xz/xz-native.inc | 2 + recipes/xz/xz-native_4.999.9beta.bb | 3 + recipes/xz/xz-native_git.bb | 7 + recipes/xz/xz.inc | 8 ++ recipes/xz/xz_4.999.9beta.bb | 8 ++ recipes/xz/xz_git.bb | 22 ++++ 34 files changed, 518 insertions(+), 111 deletions(-) create mode 100644 recipes/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-exclude.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-foreign.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch create mode 100644 recipes/autoconf/autoconf-2.65/config-site.patch create mode 100644 recipes/autoconf/autoconf-2.65/fix_path_xtra.patch create mode 100644 recipes/autoconf/autoconf-2.65/program-GNU.patch create mode 100644 recipes/autoconf/autoconf-2.65/program-mkdir.patch create mode 100644 recipes/autoconf/autoconf-2.65/program_prefix.patch create mode 100644 recipes/autoconf/autoconf-native_2.65.bb create mode 100644 recipes/autoconf/autoconf_2.65.bb create mode 100644 recipes/gettext/gettext-0.17/m4_copy.patch create mode 100644 recipes/xz/xz-native.inc create mode 100644 recipes/xz/xz-native_4.999.9beta.bb create mode 100644 recipes/xz/xz-native_git.bb create mode 100644 recipes/xz/xz.inc create mode 100644 recipes/xz/xz_4.999.9beta.bb create mode 100644 recipes/xz/xz_git.bb
PATCH 1/8 hwclock.sh: some more !getopt_long fixes
busybox' hwclock can be built without support for getopt_long. Flags of the big hwclock are compatible with the busybox version.
--- recipes/busybox/files/hwclock.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
recipes/busybox/files/hwclock.sh +5 -5
@@ -14,7 +14,7 @@ . /etc/default/rcS -[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime +[ "$UTC" = yes ] && UTC=-u || UTC=-l case "$1" in start)
@@ -28,9 +28,9 @@ case "$1" in then if [ -z "$TZ" ] then - hwclock -s $UTC;# --hctosys + hwclock -s $UTC else - TZ="$TZ" hwclock -s $UTC;# --hctosys + TZ="$TZ" hwclock -s $UTC fi fi
@@ -53,7 +53,7 @@ case "$1" in fi if [ "$HWCLOCKACCESS" != no ] then - hwclock -w $UTC;# --systohc + hwclock -w $UTC fi if [ "$VERBOSE" != no ] then
@@ -64,7 +64,7 @@ case "$1" in show) if [ "$HWCLOCKACCESS" != no ] then - hwclock -r $UTC;# --show + hwclock -r $UTC fi ;; *)
Signature · 1 line
1.6.5
PATCH 2/8 autoconf: set SRC_URI name
--- recipes/autoconf/autoconf.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/autoconf/autoconf.inc +1 -1
@@ -7,7 +7,7 @@ DEPENDS += "m4-native" RDEPENDS_${PN} = "m4 perl gnu-config" INC_PR = "r8" -SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2;name=autoconf \ file://program_prefix.patch;patch=1" inherit autotools
Signature · 1 line
1.6.5
PATCH 3/8 gmp: set SRC_URI name
--- recipes/gmp/gmp.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
recipes/gmp/gmp.inc +1 -1
@@ -3,7 +3,7 @@ DESCRIPTION = "GNU multiprecision arithmetic library" HOMEPAGE = "http://www.swox.com/gmp/" LICENSE = "GPL LGPL" -SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \ +SRC_URI = "${GNU_MIRROR}/gmp/gmp-${PV}.tar.bz2;name=gmp \ file://configure.patch;patch=1 \ file://amd64.patch;patch=1"
Signature · 1 line
1.6.5
PATCH 4/8 handle xz compressed files and tarballs
--- classes/base.bbclass | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
classes/base.bbclass +4 -0
@@ -794,6 +794,10 @@ def oe_unpack_file(file, data, url = None): cmd = 'gzip -dc %s > %s' % (file, efile) elif file.endswith('.bz2'): cmd = 'bzip2 -dc %s > %s' % (file, efile) + elif file.endswith('.tar.xz'): + cmd = 'xz -dc %s | tar x --no-same-owner -f -' % file + elif file.endswith('.xz'): + cmd = 'xz -dc %s > %s' % (file, efile) elif file.endswith('.zip') or file.endswith('.jar'): cmd = 'unzip -q -o' (type, host, path, user, pswd, parm) = bb.decodeurl(url)
Signature · 1 line
1.6.5
PATCH 5/8 busybox: use .tar.bz2
Switch to new-style checksums and remove all checksums for tarballs from checksums.ini
--- conf/checksums.ini | 60 ------------------------------------- recipes/busybox/busybox.inc | 1 - recipes/busybox/busybox_1.11.3.bb | 4 ++- recipes/busybox/busybox_1.13.2.bb | 4 ++- recipes/busybox/busybox_1.14.3.bb | 6 ++-- recipes/busybox/busybox_1.15.3.bb | 4 ++- recipes/busybox/busybox_1.2.1.bb | 7 ++++- recipes/busybox/busybox_1.2.2.bb | 7 ++++- recipes/busybox/busybox_1.3.1.bb | 6 +++- recipes/busybox/busybox_1.7.2.bb | 4 ++- recipes/busybox/busybox_1.9.2.bb | 4 ++- 11 files changed, 35 insertions(+), 72 deletions(-)
conf/checksums.ini +0 -60
@@ -3682,18 +3682,6 @@ sha256=e4f5bc9be311a746bd37f5607d3c225462d7d9294e8b3c692f9a39717b65d843 md5=c17e047d1a6a3f3188de929dc8582e01 sha256=58eb43e7e781a6b61e452fa36fa03198ef44c742da80c8a1b60be073e4ab949b -[http://www.busybox.net/downloads/busybox-1.00.tar.gz] -md5=fa62459e098fc00b22772aaf2e75bc98 -sha256=f3e1592607d42cab45387790af0cb0fea2d061f70f8679672a4397bcfe3562e5 - -[http://www.busybox.net/downloads/busybox-1.01.tar.gz] -md5=63041103f88192d209f6b1d7944fd118 -sha256=1d7c1b1931549ac294f438c50148da052f69f501676ba361034ef72b111605d3 - -[http://www.busybox.net/downloads/busybox-1.11.0.tar.gz] -md5=2e5b08cd8a76daf4a185c69b8070797f -sha256=458e4f20723a1527be0b563896b2d314bf2bb0063d5627f0c6536ed07f544771 - [http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch] md5=f7780f73d3338b17d5f2eedbe76132de sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b
@@ -3702,14 +3690,6 @@ sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b md5=fb01aea02faf4c5107292454745806ff sha256=6a045d34561b8548ae08ca7d0803d77fc2b70bdfc61793aa0a99e59a91059443 -[http://www.busybox.net/downloads/busybox-1.11.1.tar.gz] -md5=9c9f06c2d949c6de844c7bed8eb47064 -sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03 - -[http://www.busybox.net/downloads/busybox-1.11.3.tar.gz] -md5=d113f2777e4f508faa8b674ece87a37b -sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f - [http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch] md5=7c9dfb5dcd66a1d6e837e72ad0cb05d4 sha256=35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5
@@ -3730,30 +3710,6 @@ sha256=ba540cad8a029ff2eec7b078e31a308f408c074a13160aa7eba80f5ca18ee703 md5=90d093817855bc63ad16fbb8524f80df sha256=9427fa9b45f3c322bf4fe2463c99c972e6ae03df630899b38be4f29133708a0e -[http://www.busybox.net/downloads/busybox-1.13.2.tar.gz] -md5=aeb526108f13b91c02b115c8d86f9659 -sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83 - -[http://www.busybox.net/downloads/busybox-1.14.3.tar.gz] -md5=dfb197b8de260ff284f7222ed23614fe -sha256=b5a0c76d414cca97fb21622a5d09fa5a58f59890f5c9ce4f8b851c4e8b73a163 - -[http://www.busybox.net/downloads/busybox-1.15.3.tar.gz] -md5=f24d830f292d1ad27910ef226d6b2ef8 -sha256=dd8e07708d380a44cddaccce731c0e39f4d47ad921ab886644b6258fdf80b590 - -[http://www.busybox.net/downloads/busybox-1.2.0.tar.gz] -md5=6af69ebbbf8adc874ccb6d67dca95df5 -sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0 - -[http://www.busybox.net/downloads/busybox-1.2.1.tar.gz] -md5=b9c853b2c453e80381077288f40035b3 -sha256=984b7974670d4f0291094ea2a36ee21fe46591f36cb51f95292dbe143c1eeab4 - -[http://www.busybox.net/downloads/busybox-1.5.0.tar.gz] -md5=158ccadd830fe6cb3d21a109f398e037 -sha256=08ef1e87c7198fb6d7c0a5f830fc2d99e5fd077dbb7d4ca1b66117ae924f6df3 - [http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch] md5=4149857c0b2c7f3d52a1f2cec5d7778d sha256=73706e7d77144a6270da02ede61cde3c2e3b0e716d879737ac9d478b29233ba9
@@ -3770,26 +3726,10 @@ sha256=5117584a563c512b68cd9678d3cf54e6186f5a062836398791385f8ed73cca86 md5=c211189556c59a2665af45bffe5a5878 sha256=f44c3c2d7d9b3fc8a5f9fb6ac587ae4170d2515d72f9e76deb8c071ce9847abe -[http://www.busybox.net/downloads/busybox-1.7.2.tar.gz] -md5=34c76dc55004d8d5dcea884e0e99bc21 -sha256=e0eb7d59ba996a58608999998ad630c67b93c05af4eafea29770c4839c0e5461 - -[http://www.busybox.net/downloads/busybox-1.8.2.tar.gz] -md5=12851f4844bcda78ef4ba9168e16cc56 -sha256=3400bf837d214adc8522d1e78bae936c0c2cde2127ab1ee095587b946a6b5131 - [http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch] md5=9e5d99b89d79dd117310ee675322d9f2 sha256=3fe138dc567d0fcda304f89523686aaec2f83c9193403cfc68d1ba32fa554511 -[http://www.busybox.net/downloads/busybox-1.9.1.tar.gz] -md5=b9ae7be6e9a112ea5653855bbe70b501 -sha256=722071b14aba77ce6e2a83608b2ae4d4dab318d7f339d83e6c1719886b21aed9 - -[http://www.busybox.net/downloads/busybox-1.9.2.tar.gz] -md5=b31e4d1648df9259e2426839bc067038 -sha256=9bfc34aa8104caba9c0f089aab908700ff4ad76c2b7ca6d5f4c93d842041b1a7 - [http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz] md5=b9d77c57bda2e019207a1874d9bb4dea sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
recipes/busybox/busybox.inc +0 -1
@@ -14,7 +14,6 @@ PRIORITY = "required" INC_PR = "r24" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \
recipes/busybox/busybox_1.11.3.bb +3 -1
@@ -2,7 +2,7 @@ require busybox.inc PR = "${INC_PR}.1" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ file://udhcpscript.patch;patch=1 \ file://B921600.patch;patch=1 \
@@ -23,6 +23,8 @@ SRC_URI = "\ file://mdev \ file://mdev.conf \ " +SRC_URI[tarball.md5sum] = "4355ad8bb57ce3b39ad827566c1a6da3" +SRC_URI[tarball.sha256sum] = "6d35fda668988c06f8c22e6e20fe6951ec83108169df6b8c0bad99872577c784" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
recipes/busybox/busybox_1.13.2.bb +3 -1
@@ -2,7 +2,7 @@ require busybox.inc PR = "${INC_PR}.1" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-1.13.2-awk.patch;patch=1 \ file://busybox-1.13.2-depmod.patch;patch=1 \ file://busybox-1.13.2-init.patch;patch=1 \
@@ -36,6 +36,8 @@ SRC_URI = "\ file://mdev \ file://mdev.conf \ " +SRC_URI[tarball.md5sum] = "9e2a604d18bef219a5a6bf3acf78b9e1" +SRC_URI[tarball.sha256sum] = "927774408bd982dd246fb716bb2e646ab0708ce321b42c5e271dc98c1f5d1dc8" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
recipes/busybox/busybox_1.14.3.bb +3 -3
@@ -4,7 +4,7 @@ PR = "${INC_PR}.0" DEFAULT_PREFERENCE = "-1" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz;name=tarball \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \
@@ -27,8 +27,8 @@ SRC_URI = "\ file://mdev.conf \ " -SRC_URI[tarball.md5sum] = "dfb197b8de260ff284f7222ed23614fe" -SRC_URI[tarball.sha256sum] = "b5a0c76d414cca97fb21622a5d09fa5a58f59890f5c9ce4f8b851c4e8b73a163" +SRC_URI[tarball.md5sum] = "d170bf5f97a41aec3a505eab690d5699" +SRC_URI[tarball.sha256sum] = "e94df4f9063a1951b4e94e76148ed80e921737a89d97bc2c310a2a8927982e90" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
recipes/busybox/busybox_1.15.3.bb +3 -1
@@ -2,7 +2,7 @@ require busybox.inc PR = "${INC_PR}.0" SRC_URI = "\ - http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ \ file://udhcpscript.patch;patch=1 \ file://udhcpc-fix-nfsroot.patch;patch=1 \
@@ -24,6 +24,8 @@ SRC_URI = "\ file://mdev \ file://mdev.conf \ " +SRC_URI[tarball.md5sum] = "6059ac9456de6fb18dc8ee4cd0ec9240" +SRC_URI[tarball.sha256sum] = "d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
recipes/busybox/busybox_1.2.1.bb +6 -1
@@ -2,9 +2,14 @@ require busybox.inc PR = "${INC_PR}.1" -SRC_URI += "file://wget-long-options.patch;patch=1 \ +SRC_URI += "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + \ + file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ file://defconfig" +SRC_URI[tarball.md5sum] = "362b3dc0f2023ddfda901dc1f1a74391" +SRC_URI[tarball.sha256sum] = "c6f955c7feafdb7c40645b3dc4c4a3c945477a2429633eef7b2a34ef01827410" SRC_URI_append_avr32 = " file://install-should-unlink-dest-if-it-exists.patch;patch=1" do_configure () {
recipes/busybox/busybox_1.2.2.bb +6 -1
@@ -4,8 +4,13 @@ PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" -SRC_URI = "file://wget-long-options.patch;patch=1 \ +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + \ + file://wget-long-options.patch;patch=1 \ file://defconfig" +SRC_URI[tarball.md5sum] = "ae8a4c65b9464c8ece3483a3d3b9544c" +SRC_URI[tarball.sha256sum] = "4de9fb2bb018e381e64199b38d90cb25e71366c37a8995e9ab5ed206ebcb972f" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
recipes/busybox/busybox_1.3.1.bb +5 -1
@@ -4,7 +4,11 @@ PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" -SRC_URI = "file://defconfig" +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ + file://defconfig" +SRC_URI[tarball.md5sum] = "571531cfa83726947ccb566de017ad4f" +SRC_URI[tarball.sha256sum] = "5bf9ead9cca99620d2e56ddf79fdf5fb306fd7f30087b5556e0956e3b1948206" do_configure () { install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe
recipes/busybox/busybox_1.7.2.bb +3 -1
@@ -1,7 +1,7 @@ require busybox.inc PR = "${INC_PR}.1" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://busybox-cron \ file://busybox-httpd \ file://busybox-udhcpd \
@@ -15,6 +15,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-appletlib-dependency.patch;patch=1 \ file://umount.busybox \ file://run_parts.c" +SRC_URI[tarball.md5sum] = "c91ec9756e2000073a9dd8fa9fc3f89e" +SRC_URI[tarball.sha256sum] = "83c4cc813124a43f13e2ebb83cea9da9909d63891b824bf4bc7006f0567db7cf" SRC_URI += "http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch;patch=1 \ http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-iptun.patch;patch=1 \
recipes/busybox/busybox_1.9.2.bb +3 -1
@@ -1,7 +1,7 @@ require busybox.inc PR = "${INC_PR}.1" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ +SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ file://sort-z-nul.patch;patch=1;status=upstream \
@@ -18,6 +18,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://syslog.conf \ file://umount.busybox \ file://defconfig" +SRC_URI[tarball.md5sum] = "7e26c56012dd5811251c2f87786b9a77" +SRC_URI[tarball.sha256sum] = "a14ca1104242953672807f5b5223de5615c237a27140f36d625b3067daaf11dc" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
Signature · 1 line
1.6.5
PATCH 6/8 busybox: remove orphaned patch checksums
These http download patches are not in use anymore. Just keep checksums for 1.7.2 (those are mentioned in the .bb)
--- conf/checksums.ini | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-)
conf/checksums.ini +0 -32
@@ -3682,34 +3682,6 @@ sha256=e4f5bc9be311a746bd37f5607d3c225462d7d9294e8b3c692f9a39717b65d843 md5=c17e047d1a6a3f3188de929dc8582e01 sha256=58eb43e7e781a6b61e452fa36fa03198ef44c742da80c8a1b60be073e4ab949b -[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch] -md5=f7780f73d3338b17d5f2eedbe76132de -sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b - -[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch] -md5=fb01aea02faf4c5107292454745806ff -sha256=6a045d34561b8548ae08ca7d0803d77fc2b70bdfc61793aa0a99e59a91059443 - -[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch] -md5=7c9dfb5dcd66a1d6e837e72ad0cb05d4 -sha256=35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5 - -[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-init.patch] -md5=7afb3a1b474742bc198b3c8450ab9a7e -sha256=39a8efb5a50c56feb733e519365b4e188c25c0e925a1a63cc1ace9735a80100f - -[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-mdev.patch] -md5=a72d169e9545e26257032e0e367feb95 -sha256=fd4a64c6a83e07586de0360258162c5bf431f164b3980301185743e4029940df - -[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-modprobe.patch] -md5=b2b9d0992b055816077ec9e0e4ee7775 -sha256=ba540cad8a029ff2eec7b078e31a308f408c074a13160aa7eba80f5ca18ee703 - -[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-tar.patch] -md5=90d093817855bc63ad16fbb8524f80df -sha256=9427fa9b45f3c322bf4fe2463c99c972e6ae03df630899b38be4f29133708a0e - [http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch] md5=4149857c0b2c7f3d52a1f2cec5d7778d sha256=73706e7d77144a6270da02ede61cde3c2e3b0e716d879737ac9d478b29233ba9
@@ -3726,10 +3698,6 @@ sha256=5117584a563c512b68cd9678d3cf54e6186f5a062836398791385f8ed73cca86 md5=c211189556c59a2665af45bffe5a5878 sha256=f44c3c2d7d9b3fc8a5f9fb6ac587ae4170d2515d72f9e76deb8c071ce9847abe -[http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch] -md5=9e5d99b89d79dd117310ee675322d9f2 -sha256=3fe138dc567d0fcda304f89523686aaec2f83c9193403cfc68d1ba32fa554511 - [http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz] md5=b9d77c57bda2e019207a1874d9bb4dea sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
Signature · 1 line
1.6.5
PATCH 7/8 autoconf: add 2.65
xz needs >= 2.64
Also add patches to recognize BusyBox versions of programs. Add patch for gettext-0.17 to nop out m4_copy on autoconf > 2.63
--- .../autoheader-nonfatal-warnings.patch | 13 ++ .../autoconf-2.65/autoreconf-exclude.patch | 123 ++++++++++++++++++++ .../autoconf-2.65/autoreconf-foreign.patch | 11 ++ .../autoconf-2.65/autoreconf-gnuconfigize.patch | 30 +++++ recipes/autoconf/autoconf-2.65/config-site.patch | 11 ++ recipes/autoconf/autoconf-2.65/fix_path_xtra.patch | 111 ++++++++++++++++++ recipes/autoconf/autoconf-2.65/program-GNU.patch | 13 ++ recipes/autoconf/autoconf-2.65/program-mkdir.patch | 11 ++ .../autoconf/autoconf-2.65/program_prefix.patch | 19 +++ recipes/autoconf/autoconf-native_2.65.bb | 12 ++ recipes/autoconf/autoconf_2.65.bb | 15 +++ recipes/gettext/gettext-0.17/m4_copy.patch | 52 ++++++++ recipes/gettext/gettext_0.17.bb | 1 + 13 files changed, 422 insertions(+), 0 deletions(-) create mode 100644 recipes/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-exclude.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-foreign.patch create mode 100644 recipes/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch create mode 100644 recipes/autoconf/autoconf-2.65/config-site.patch create mode 100644 recipes/autoconf/autoconf-2.65/fix_path_xtra.patch create mode 100644 recipes/autoconf/autoconf-2.65/program-GNU.patch create mode 100644 recipes/autoconf/autoconf-2.65/program-mkdir.patch create mode 100644 recipes/autoconf/autoconf-2.65/program_prefix.patch create mode 100644 recipes/autoconf/autoconf-native_2.65.bb create mode 100644 recipes/autoconf/autoconf_2.65.bb create mode 100644 recipes/gettext/gettext-0.17/m4_copy.patch
recipes/autoconf/autoconf-2.65/autoheader-nonfatal-warnings.patch new file +13 -0
@@ -0,0 +1,13 @@ +--- autoconf-2.59/bin/autoheader.in~ 2003-10-10 14:52:56.000000000 +0100 ++++ autoconf-2.59/bin/autoheader.in 2004-05-03 01:36:45.000000000 +0100 +@@ -272,8 +272,8 @@ + } + + } +- exit 1 +- if keys %symbol; ++# exit 1 ++# if keys %symbol; + } + + update_file ("$tmp/config.hin", "$config_h_in");
recipes/autoconf/autoconf-2.65/autoreconf-exclude.patch new file +123 -0
123 lines not on this page · raw message
recipes/autoconf/autoconf-2.65/autoreconf-foreign.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- autoconf-2.59/bin/autoreconf.in~autoreconf-foreign 2004-05-09 20:55:06.000000000 -0400 ++++ autoconf-2.59/bin/autoreconf.in 2004-05-09 20:55:55.000000000 -0400 +@@ -184,6 +184,8 @@ + + $aclocal_supports_force = `$aclocal --help` =~ /--force/; + ++ $automake .= ' --foreign'; ++ + # Dispatch autoreconf's option to the tools. + # --include; + $autoconf .= join (' --include=', '', @include);
recipes/autoconf/autoconf-2.65/autoreconf-gnuconfigize.patch new file +30 -0
@@ -0,0 +1,30 @@ +--- /tmp/autoreconf.in 2009-06-02 13:10:42.000000000 +0200 ++++ autoconf-2.63/bin/autoreconf.in 2009-06-02 13:12:28.000000000 +0200 +@@ -58,7 +58,7 @@ + $help = "Usage: $0 [OPTION]... [DIRECTORY]... + + Run `autoconf' (and `autoheader', `aclocal', `automake', `autopoint' +-(formerly `gettextize'), and `libtoolize' where appropriate) ++(formerly `gettextize'), `libtoolize', and `gnu-configize' where appropriate) + repeatedly to remake the GNU Build System files in specified + DIRECTORIES and their subdirectories (defaulting to `.'). + +@@ -115,6 +115,7 @@ + my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; + my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; + my $make = $ENV{'MAKE'} || 'make'; ++my $gnuconfigize = $ENV{'GNUCONFIGIZE'} || 'gnu-configize'; + + # --install -- as --add-missing in other tools. + my $install = 0; +@@ -643,6 +644,10 @@ + } + } + ++ @ex = grep (/^gnu-configize$/, @exclude); ++ if ($#ex == -1) { ++ xsystem ("$gnuconfigize"); ++ } + + # -------------- # + # Running make. #
recipes/autoconf/autoconf-2.65/config-site.patch new file +11 -0
@@ -0,0 +1,11 @@ +--- /tmp/general.m4 2009-06-02 15:14:15.000000000 +0200 ++++ autoconf-2.63/lib/autoconf/general.m4 2009-06-02 15:14:42.000000000 +0200 +@@ -1848,7 +1848,7 @@ + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site + fi +-for ac_site_file in "$ac_site_file1" "$ac_site_file2" ++for ac_site_file in $ac_site_file1 "$ac_site_file2" + do + test "x$ac_site_file" = xNONE && continue + if test -r "$ac_site_file"; then
recipes/autoconf/autoconf-2.65/fix_path_xtra.patch new file +111 -0
111 lines not on this page · raw message
recipes/autoconf/autoconf-2.65/program-GNU.patch new file +13 -0
@@ -0,0 +1,13 @@ +diff -rdup autoconf-2.64.oorig/lib/autoconf/programs.m4 autoconf-2.64/lib/autoconf/programs.m4 +--- autoconf-2.64.oorig/lib/autoconf/programs.m4 2009-10-29 20:41:30.000000000 +0100 ++++ autoconf-2.64/lib/autoconf/programs.m4 2009-10-29 20:42:04.000000000 +0100 +@@ -532,7 +532,8 @@ dnl # for best performing tool in a li + m4_define([_AC_PATH_PROG_FLAVOR_GNU], + [# Check for GNU $1 + case `"$1" --version 2>&1` in +-*GNU*) ++*GNU* | \ ++*'BusyBox v'*) + $2;; + m4_ifval([$3], + [*)
recipes/autoconf/autoconf-2.65/program-mkdir.patch new file +11 -0
@@ -0,0 +1,11 @@ +diff -rdup autoconf-2.64.oorig/lib/autoconf/programs.m4 autoconf-2.64/lib/autoconf/programs.m4 +--- autoconf-2.64.oorig/lib/autoconf/programs.m4 2009-05-13 14:29:15.000000000 +0200 ++++ autoconf-2.64/lib/autoconf/programs.m4 2009-10-29 18:39:06.000000000 +0100 +@@ -696,6 +696,7 @@ if test -z "$MKDIR_P"; then + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ ++ *'BusyBox v'* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;;
recipes/autoconf/autoconf-2.65/program_prefix.patch new file +19 -0
@@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- autoconf-2.57/lib/autoconf/general.m4~program_prefix ++++ autoconf-2.57/lib/autoconf/general.m4 +@@ -1676,8 +1676,9 @@ + # The aliases save the names the user supplied, while $host etc. + # will get canonicalized. + test -n "$target_alias" && +- test "$program_prefix$program_suffix$program_transform_name" = \ +- NONENONEs,x,x, && ++ test "$target_alias" != "$host_alias" && ++ test "$program_prefix$program_suffix$program_transform_name" = \ ++ NONENONEs,x,x, && + program_prefix=${target_alias}-[]dnl + ])# AC_CANONICAL_TARGET +
recipes/autoconf/autoconf-native_2.65.bb new file +12 -0
@@ -0,0 +1,12 @@ +require autoconf_${PV}.bb +PR = "${INC_PR}.0" + +DEPENDS = "m4-native gnu-config-native" +RDEPENDS_${PN} = "m4-native gnu-config-native" + +SRC_URI += "file://fix_path_xtra.patch;patch=1" + +S = "${WORKDIR}/autoconf-${PV}" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}" + +inherit native
recipes/autoconf/autoconf_2.65.bb new file +15 -0
@@ -0,0 +1,15 @@ +require autoconf.inc + +PR = "${INC_PR}.0" + +PARALLEL_MAKE = "" + +SRC_URI += "file://autoreconf-exclude.patch;patch=1 \ + file://autoreconf-foreign.patch;patch=1 \ + file://autoheader-nonfatal-warnings.patch;patch=1 \ + file://autoreconf-gnuconfigize.patch;patch=1 \ + file://config-site.patch;patch=1 \ + file://program-mkdir.patch;patch=1 \ + file://program-GNU.patch;patch=1" +SRC_URI[autoconf.md5sum] = "a6de1cc6434cd64038b0a0ae4e252b33" +SRC_URI[autoconf.sha256sum] = "db11944057f3faf229ff5d6ce3fcd819f565455c152b72cec17ebc1cbb80136b"
recipes/gettext/gettext-0.17/m4_copy.patch new file +52 -0
52 lines not on this page · raw message
recipes/gettext/gettext_0.17.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://wchar-uclibc.patch;patch=1 \ file://use_open_properly.patch;patch=1 \ file://gettext-autoconf-lib-link-no-L.patch;patch=1 \ + file://m4_copy.patch;patch=1 \ " SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
Signature · 1 line
1.6.5
PATCH 8/8 xz: add xz package
xz is the lzma successor
tested with automake-1.11.1, autoconf-2.65
--- recipes/xz/xz-native.inc | 2 ++ recipes/xz/xz-native_4.999.9beta.bb | 3 +++ recipes/xz/xz-native_git.bb | 7 +++++++ recipes/xz/xz.inc | 8 ++++++++ recipes/xz/xz_4.999.9beta.bb | 8 ++++++++ recipes/xz/xz_git.bb | 22 ++++++++++++++++++++++ 6 files changed, 50 insertions(+), 0 deletions(-) create mode 100644 recipes/xz/xz-native.inc create mode 100644 recipes/xz/xz-native_4.999.9beta.bb create mode 100644 recipes/xz/xz-native_git.bb create mode 100644 recipes/xz/xz.inc create mode 100644 recipes/xz/xz_4.999.9beta.bb create mode 100644 recipes/xz/xz_git.bb
recipes/xz/xz-native.inc new file +2 -0
@@ -0,0 +1,2 @@ +inherit native +require xz_${PV}.bb
recipes/xz/xz-native_4.999.9beta.bb new file +3 -0
@@ -0,0 +1,3 @@ +PV = "4.999.9beta" + +require xz-native.inc
recipes/xz/xz-native_git.bb new file +7 -0
@@ -0,0 +1,7 @@ +# XZ_BASE should be the latest released version of xz. +# It can be set in the distro file. +#XZ_BASE ?= "4.999.9" +#SRCREV = "HEAD" +#PV = "${XZ_BASE}+gitr${SRCREV}" +PV = "git" +require xz-native.inc
recipes/xz/xz.inc new file +8 -0
@@ -0,0 +1,8 @@ +DESCRIPTION = "XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils are the successor to LZMA Utils." +SECTION = "console/utils" +LICENSE = "Public Domain" +INC_PR = "r0" +S ?= "${WORKDIR}/xz-${PV}" +#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xz-${PV}" + +inherit autotools
recipes/xz/xz_4.999.9beta.bb new file +8 -0
@@ -0,0 +1,8 @@ +PV = "4.999.9beta" + +require xz.inc +PR = "${INC_PR}.0" +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz" +SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" +SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c" +EXTRA_OECONF = "--enable-shared"
recipes/xz/xz_git.bb new file +22 -0
@@ -0,0 +1,22 @@ +# XZ_BASE should be the latest released version of xz. +# It can be set in the distro file. +#XZ_BASE ?= "4.999.9" +#SRCREV = "HEAD" +#PV = "${XZ_BASE}+gitr${SRCREV}" +S = "${WORKDIR}/git" +PV = "git" +PR = "${INC_PR}.0" +SRC_URI = "git://ctrl.tukaani.org/xz.git;branch=master;protocol=git" +EXTRA_OECONF = "--enable-shared --disable-nls" +DEFAULT_PREFERENCE = "-1" +require xz.inc +inherit gettext +EXTRA_AUTORECONF = "--install" +# XXX: Not sure what i managed to break, but this should not be needed! +# | configure.ac:460: required file `build-aux/config.rpath' not found +do_configure () { + install -D -m0755 ${STAGING_DATADIR}/gettext/config.rpath \ + ${S}/build-aux/config.rpath + autotools_do_configure +} +# just disabled nls for now
Signature · 1 line
1.6.5
Re: [PATCH 8/8] xz: add xz package
Quoted 2 lines · Bernhard Reutner-Fischer
xz is the lzma successor
tested with automake-1.11.1, autoconf-2.65
Thanks for the patch. I think this could use a little cleanup before it is committed, though; please see below.
recipes/xz/xz-native.inc line 2
Quoted 6 lines
index 0000000..bc5e9ff
recipes/xz/xz-native.inc new file +2
-0@@ -0,0 +1,2 @@ +inherit native +require xz_${PV}.bb
You could consider using BBCLASSEXTEND to eliminate the need for this separate recipe.
recipes/xz/xz-native_4.999.9beta.bb line 3
Quoted 9 lines
recipes/xz/xz-native_4.999.9beta.bb new file +3
-0@@ -0,0 +1,3 @@ +PV = "4.999.9beta" + +require xz-native.inc
Is it necessary to set PV here? I would have thought base.bbclass would infer that same value from the filename.
recipes/xz/xz-native_git.bb line 5
Quoted 11 lines
recipes/xz/xz-native_git.bb new file +5
-0@@ -0,0 +1,7 @@ +# XZ_BASE should be the latest released version of xz. +# It can be set in the distro file. +#XZ_BASE ?= "4.999.9" +#SRCREV = "HEAD" +#PV = "${XZ_BASE}+gitr${SRCREV}"
Please don't leave this sort of stuff commented out in the file. If it's not needed, just delete those lines.
recipes/xz/xz-native_git.bb line 6
Quoted 1 line
recipes/xz/xz-native_git.bb new file +1
-0+#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xz-${PV}"
Likewise for that.
recipes/xz/xz_4.999.9beta.bb line 1
Quoted 4 lines
recipes/xz/xz_4.999.9beta.bb new file +1
-0@@ -0,0 +1,8 @@ +PV = "4.999.9beta"
See above regarding PV.
recipes/xz/xz_4.999.9beta.bb line 5
Quoted 4 lines
recipes/xz/xz_4.999.9beta.bb new file +4
-0+ +require xz.inc +PR = "${INC_PR}.0" +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz"
Wouldn't that SRC_URI be better in the .inc file? Presumably this is the correct URI for everything except the _git version.
recipes/xz/xz_4.999.9beta.bb line 8
Quoted 3 lines
recipes/xz/xz_4.999.9beta.bb new file +3
-0+SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" +SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c" +EXTRA_OECONF = "--enable-shared"
Likewise for that EXTRA_OECONF, I would have thought that would also belong in the .inc really.
p.
Re: [PATCH 8/8] xz: add xz package
Quoted 6 lines · Phil Blundell
Quoted 2 lines · Bernhard Reutner-Fischer
xz is the lzma successor
tested with automake-1.11.1, autoconf-2.65Thanks for the patch. I think this could use a little cleanup before it is committed, though; please see below.
I flagged it as RFC in the summary, so yes, like the summary said, still needs love..
Quoted 10 lines
recipes/xz/xz-native.inc line 2
Quoted 7 lines
index 0000000..bc5e9ff
recipes/xz/xz-native.inc new file +2
-0@@ -0,0 +1,2 @@ +inherit native +require xz_${PV}.bbYou could consider using BBCLASSEXTEND to eliminate the need for this separate recipe.
Thanks for that, good thing. This will trim down alot on the number of recipes in the tree!
Quoted 13 lines
recipes/xz/xz-native_4.999.9beta.bb line 3
Quoted 10 lines
recipes/xz/xz-native_4.999.9beta.bb new file +3
-0@@ -0,0 +1,3 @@ +PV = "4.999.9beta" + +require xz-native.incIs it necessary to set PV here? I would have thought base.bbclass would infer that same value from the filename.
It was needed since above xz-native.inc had
require xz_${PV}.inc
in it, and if i didn't set PV before it, it defaulted to 1.0, breaking horribly for obvious reasons. BBCLASSEXTEND nullifies this. Ditched.
Quoted 15 lines
recipes/xz/xz-native_git.bb line 5
Quoted 12 lines
recipes/xz/xz-native_git.bb new file +5
-0@@ -0,0 +1,7 @@ +# XZ_BASE should be the latest released version of xz. +# It can be set in the distro file. +#XZ_BASE ?= "4.999.9" +#SRCREV = "HEAD" +#PV = "${XZ_BASE}+gitr${SRCREV}"Please don't leave this sort of stuff commented out in the file. If it's not needed, just delete those lines.
dropped.
Quoted 4 lines
recipes/xz/xz-native_git.bb line 6
Quoted 2 lines
recipes/xz/xz-native_git.bb new file +1
-0+#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xz-${PV}"Likewise for that.
ditto (RFC..)
Quoted 8 lines
recipes/xz/xz_4.999.9beta.bb line 1
Quoted 5 lines
recipes/xz/xz_4.999.9beta.bb new file +1
-0@@ -0,0 +1,8 @@ +PV = "4.999.9beta"See above regarding PV.
Quoted 7 lines
recipes/xz/xz_4.999.9beta.bb line 5
Quoted 4 lines
recipes/xz/xz_4.999.9beta.bb new file +4
-0+ +require xz.inc +PR = "${INC_PR}.0" +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz"Wouldn't that
SRC_URIbe better in the .inc file? Presumably this is the correct URI for everything except the_gitversion.
It would indeed. Can i somehow say
file1: SRC="http:://one.ext/one.tar.xz"
SRC[md5sum]=md5
SRC[sha256sum]=sha256
or, perhaps it's the basename if there was no ;name=
SRC[one.tar.xz.md5sum]=md5
SRC[one.tar.xz.sha256sum]=sha256
file2: SRC="git://two"
inc: FOO_SRC ?= SRC
SRC_URI += FOO_SRC?
Quoted 7 lines
recipes/xz/xz_4.999.9beta.bb line 8
Quoted 4 lines
recipes/xz/xz_4.999.9beta.bb new file +3
-0+SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" +SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c" +EXTRA_OECONF = "--enable-shared"Likewise for that
EXTRA_OECONF, I would have thought that would also belong in the .inc really.
the EXTRA_OECONF can. Done.
Revised patch is attached, but:
it works for the 4.999beta9 version (literally, since that's how upstream calls the tarball; Is this a problem with the version-naming like Koon indicates?) but not if youPREFERRED_VERSION_xz = "git"
PREFERRED_VERSION_xz-native = "git"
and then bake xz-native:
NOTE: Task failed: Fetch failed: [snip]; git read-tree 1 failed with signal 128, output:
fatal: Not a valid object name 1
since: $ ls -a ../sources/git/ctrl.tukaani.org.xz.git/ . .. 1 .git
"1" ?!
recipes/xz/xz.inc new file +9 -0
@@ -0,0 +1,9 @@ +DESCRIPTION = "XZ Utils is free general-purpose data compression software with high compression ratio. XZ Utils are the successor to LZMA Utils." +SECTION = "console/utils" +LICENSE = "Public Domain" +INC_PR = "r0" +S ?= "${WORKDIR}/xz-${PV}" +EXTRA_OECONF = "--enable-shared" +BBCLASSEXTEND = "native" + +inherit autotools
recipes/xz/xz_4.999.9beta.bb new file +5 -0
@@ -0,0 +1,5 @@ +require xz.inc +PR = "${INC_PR}.0" +SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz" +SRC_URI[xz.md5sum] = "cc4044fcc073b8bcf3164d1d0df82161" +SRC_URI[xz.sha256sum] = "330312c4397608d8b7be362cc7edbfeafa6101614bc2164d816ea767656aa15c"
recipes/xz/xz_git.bb new file +6 -0
@@ -0,0 +1,6 @@ +S = "${WORKDIR}/git" +require xz.inc +PV = "git" +PR = "${INC_PR}.0" +SRC_URI = "git://ctrl.tukaani.org/xz.git;branch=master;protocol=git" +DEFAULT_PREFERENCE = "-1"
Re: [PATCH 8/8] xz: add xz package
Quoted 10 lines · Bernhard Reutner-Fischer
It would indeed. Can i somehow say
file1: SRC="http:://one.ext/one.tar.xz"SRC[md5sum]=md5 SRC[sha256sum]=sha256 or, perhaps it's the basename if there was no ;name= SRC[one.tar.xz.md5sum]=md5 SRC[one.tar.xz.sha256sum]=sha256 file2: SRC="git://two" inc: FOO_SRC ?= SRC SRC_URI += FOO_SRC
I don't think this needs to be as complicated as you are making it. You should be able to simply move your original SRC_URI verbatim to the .inc file, i.e.:
SRC_URI = "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz"
and then, in the individual .bb files for each version, write:
SRC_URI[xz.md5sum] = ...
There's no requirement for the two things to be in the same file. If you need to add other things like patches to the SRC_URI for a specific version, you can just write:
SRC_URI += "file://..."
in the .bb file in question.
Quoted 4 lines
Revised patch is attached, but:
it works for the 4.999beta9 version (literally, since that's how upstream calls the tarball; Is this a problem with the version-naming like Koon indicates?)
It rather depends on what upstream are going to do next. If "4.999" is the number that they are using for pre-releases leading up to 5.0, and everything in the 4.999 series is going to be a beta (i.e. they do 4.999.8beta, 4.999.9beta, 4.999.10beta, 5.0) then it is probably fine as it stands. But, if there is any risk that "4.999.9beta" might be followed at some point by a version called just "4.999.9", or even "4.999", then that would be a problem because the latter version will sort lower than the former.
Quoted 4 lines
since: $ ls -a ../sources/git/ctrl.tukaani.org.xz.git/ . .. 1 .git
"1" ?!
That is rather weird. I can't see any obvious cause for that from a quick inspection of the files you attached.
p.
Re: [PATCH 8/8] xz: add xz package
Quoted 22 lines · Phil Blundell
Quoted 10 lines · Bernhard Reutner-Fischer
It would indeed. Can i somehow say
file1: SRC="http:://one.ext/one.tar.xz"SRC[md5sum]=md5 SRC[sha256sum]=sha256 or, perhaps it's the basename if there was no ;name= SRC[one.tar.xz.md5sum]=md5 SRC[one.tar.xz.sha256sum]=sha256 file2: SRC="git://two" inc: FOO_SRC ?= SRC SRC_URI += FOO_SRCI don't think this needs to be as complicated as you are making it. You should be able to simply move your original
SRC_URIverbatim to the .inc file, i.e.:
SRC_URI= "http://tukaani.org/xz/xz-${PV}.tar.bz2;name=xz"and then, in the individual .bb files for each version, write:
SRC_URI[xz.md5sum] = ...
Quoted 7 lines
There's no requirement for the two things to be in the same file. If you need to add other things like patches to the
SRC_URIfor a specific version, you can just write:
SRC_URI+= "file://..."in the .bb file in question.
But that would clash with _git, wouldn't it, unless, and only if this exact sequence would be used:
.inc:=S ?= ${WORKDIR}/xz-${PV}
.inc:=SRC_URI=http
0815.bb:PV=0814+0815foo
0815.bb:require .inc
0815.bb:SRC_URI+=patch1
git.bb:S=${WORKDIR}/git
git.bb:require .inc
git.bb:SRC_URI=git
which we can obey to in this case, but it somehow feels brittle altough it should work out fine in practise, i think.
Quoted 6 lines
Quoted 5 lines
Revised patch is attached, but:
it works for the 4.999beta9 version (literally, since that's how upstream calls the tarball; Is this a problem with the version-naming like Koon indicates?)
Quoted 8 lines
It rather depends on what upstream are going to do next. If "4.999" is the number that they are using for pre-releases leading up to 5.0, and everything in the 4.999 series is going to be a beta (i.e. they do 4.999.8beta, 4.999.9beta, 4.999.10beta, 5.0) then it is probably fine as it stands. But, if there is any risk that "4.999.9beta" might be followed at some point by a version called just "4.999.9", or even "4.999", then that would be a problem because the latter version will sort lower than the former.
ACK, exactly. I follow Koon on this.
Quoted 8 lines
Quoted 5 lines
since: $ ls -a ../sources/git/ctrl.tukaani.org.xz.git/ . .. 1 .git
"1" ?!
That is rather weird. I can't see any obvious cause for that from a quick inspection of the files you attached.
Just try it out, that package shouldn't interfere with any existing recipe.
To my untrained eyes it sounds like a glitch somewhere in infrastructure and not in those recipes, but YMV alot from mine in this respect :) Insights?
TIA && cheers,
Bernhard
Re: [PATCH 8/8] xz: add xz package
Quoted 10 lines · Bernhard Reutner-Fischer
But that would clash with
_git, wouldn't it, unless, and only if this exact sequence would be used:
.inc:=S ?= ${WORKDIR}/xz-${PV}
.inc:=SRC_URI=http
0815.bb:PV=0814+0815foo
0815.bb:require .inc
0815.bb:SRC_URI+=patch1
git.bb:S=${WORKDIR}/git
git.bb:require .inc
git.bb:SRC_URI=git
It would be more traditional to set S with a hard assignment in the .inc file, and simply override it (the same as SRC_URI) in the _git.bb file. But, essentially, yes, what you are describing there is basically what you'd have to do. There is plenty of precedent in OE for the general approach of using an .inc file to set generic defaults and then allowing particular .bb files to override the parts they don't want.
I'll have a look at your git checkout issue later today.
p.
BBCLASSEXTEND canadian?
In reply to Bernhard Reutner-FischerQuoted 12 lines · Bernhard Reutner-Fischer
Quoted 10 lines · Phil Blundell
recipes/xz/xz-native.inc line 2
Quoted 6 lines · Bernhard Reutner-Fischer
index 0000000..bc5e9ff
recipes/xz/xz-native.inc new file +2
-0@@ -0,0 +1,2 @@ +inherit native +require xz_${PV}.bbYou could consider using BBCLASSEXTEND to eliminate the need for this separate recipe.
Quoted 2 lines
Thanks for that, good thing. This will trim down alot on the number of recipes in the tree!
AFAICS BBCLASSEXTEND does not take canadian into account ATM, so i could convert mpfr without pain but gmp-canadian on darwin (at least 4.2.4 is mentioned in there) will/would break AFAICT, is that correct?
Re: BBCLASSEXTEND canadian?
Quoted 13 lines · Bernhard Reutner-Fischer
Quoted 12 lines · Bernhard Reutner-Fischer
Quoted 10 lines · Phil Blundell
recipes/xz/xz-native.inc line 2
Quoted 6 lines · Bernhard Reutner-Fischer
index 0000000..bc5e9ff
recipes/xz/xz-native.inc new file +2
-0@@ -0,0 +1,2 @@ +inherit native +require xz_${PV}.bbYou could consider using BBCLASSEXTEND to eliminate the need for this separate recipe.
Quoted 6 lines
Quoted 2 lines
Thanks for that, good thing. This will trim down alot on the number of recipes in the tree!
AFAICS BBCLASSEXTEND does not take canadian into account ATM, so i could convert mpfr without pain but gmp-canadian on darwin (at least 4.2.4 is mentioned in there) will/would break AFAICT, is that correct?
Since I didn't see a reply... at current, yes BBLCASSEXTEND only covers -native (and not -cross, -cross-sdk/-sdk nor -canadian*).
Signature · 2 lines
Tom Rini <[email protected]> Mentor Graphics Corporation
Re: BBCLASSEXTEND canadian?
Canadian seems to be deprecated in favour of nativesdk (which is handled by BBCLASSEXTEND), so I will try use that instead.
On 25 Feb 2010 01:50, "Tom Rini" <[email protected]> wrote:
Quoted 1 line · Bernhard Reutner-Fischer
On Sat, Feb 13, 2010 at 01:51:4...
Since I didn't see a reply... at current, yes BBLCASSEXTEND only covers -native (and not -cross, -cross-sdk/-sdk nor -canadian*).
--
Tom Rini <[email protected]>
Mentor Graphics Corporation
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: BBCLASSEXTEND canadian?
Quoted 2 lines · Bernhard Reutner-Fischer
Canadian seems to be deprecated in favour of nativesdk (which is handled by BBCLASSEXTEND), so I will try use that instead.
Yes, -nativesdk is intended to replace -sdk packages
Cheers,
Richard
Re: BBCLASSEXTEND canadian?
In reply to Tom RiniQuoted 17 lines · Tom Rini
Quoted 16 lines · Bernhard Reutner-Fischer
Quoted 14 lines · Bernhard Reutner-Fischer
Quoted 10 lines · Phil Blundell
recipes/xz/xz-native.inc line 2
Quoted 6 lines · Bernhard Reutner-Fischer
index 0000000..bc5e9ff
recipes/xz/xz-native.inc new file +2
-0@@ -0,0 +1,2 @@ +inherit native +require xz_${PV}.bbYou could consider using BBCLASSEXTEND to eliminate the need for this separate recipe.
Thanks for that, good thing. This will trim down alot on the number of recipes in the tree!
Quoted 6 lines
Quoted 3 lines
AFAICS BBCLASSEXTEND does not take canadian into account ATM, so i could convert mpfr without pain but gmp-canadian on darwin (at least 4.2.4 is mentioned in there) will/would break AFAICT, is that correct?
Since I didn't see a reply... at current, yes BBLCASSEXTEND only covers -native (and not -cross, -cross-sdk/-sdk nor -canadian*).
BBCLASSEXTEND covers -native and -nativesdk
The -cross, -crosssdk, -canadian-cross and other combinations usually have too many differences to be worth the effort although it would be possible to make them work.
Cheers,
Richard
Re: BBCLASSEXTEND canadian?
Quoted 18 lines · Richard Purdie
Quoted 17 lines · Tom Rini
Quoted 16 lines · Bernhard Reutner-Fischer
Quoted 14 lines · Bernhard Reutner-Fischer
Quoted 10 lines · Phil Blundell
recipes/xz/xz-native.inc line 2
Quoted 6 lines · Bernhard Reutner-Fischer
index 0000000..bc5e9ff
recipes/xz/xz-native.inc new file +2
-0@@ -0,0 +1,2 @@ +inherit native +require xz_${PV}.bbYou could consider using BBCLASSEXTEND to eliminate the need for this separate recipe.
Thanks for that, good thing. This will trim down alot on the number of recipes in the tree!
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
AFAICS BBCLASSEXTEND does not take canadian into account ATM, so i could convert mpfr without pain but gmp-canadian on darwin (at least 4.2.4 is mentioned in there) will/would break AFAICT, is that correct?
Since I didn't see a reply... at current, yes BBLCASSEXTEND only covers -native (and not -cross, -cross-sdk/-sdk nor -canadian*).
BBCLASSEXTEND covers -native and -nativesdk
Is the -nativesdk part implicit in the anonfuncs in nativesdk.bbclass or just not merged yet?
Quoted 3 lines
The -cross, -crosssdk, -canadian-cross and other combinations usually have too many differences to be worth the effort although it would be possible to make them work.
I'm not so sure about that, but we'll see. I should have some form of canadian stuff working again shortly.
Signature · 2 lines
Tom Rini <[email protected]> Mentor Graphics Corporation
Re: BBCLASSEXTEND canadian?
can someone explain what BBCLASSEXTEND does... sorry for the rookie question.
Re: BBCLASSEXTEND canadian?
In reply to Tom RiniQuoted 4 lines · Tom Rini
Quoted 1 line
BBCLASSEXTEND covers -native and -nativesdk
Is the -nativesdk part implicit in the anonfuncs in nativesdk.bbclass or just not merged yet?
It should be implicit in the anonfuncs. If that class differs to Poky, the Poky changes should be merged though.
Quoted 6 lines
Quoted 3 lines
The -cross, -crosssdk, -canadian-cross and other combinations usually have too many differences to be worth the effort although it would be possible to make them work.
I'm not so sure about that, but we'll see. I should have some form of canadian stuff working again shortly.
You're unsure it would be possible to make them work of that its not worth the effort?
Cheers,
Richard
Re: BBCLASSEXTEND canadian?
Quoted 13 lines · Richard Purdie
Quoted 4 lines · Tom Rini
Quoted 1 line
BBCLASSEXTEND covers -native and -nativesdk
Is the -nativesdk part implicit in the anonfuncs in nativesdk.bbclass or just not merged yet?
It should be implicit in the anonfuncs. If that class differs to Poky, the Poky changes should be merged though.
Quoted 4 lines
Quoted 3 lines
The -cross, -crosssdk, -canadian-cross and other combinations usually have too many differences to be worth the effort although it would be possible to make them work.
Quoted 5 lines
Quoted 2 lines
I'm not so sure about that, but we'll see. I should have some form of canadian stuff working again shortly.
You're unsure it would be possible to make them work of that its not worth the effort?
Tom?
Yesterday evening i was building a pristine master reference again and saw that mpfr et al are (still) pretty outdated.
AFAIR i cannot mix BBCLASSEXTEND vs. old-fashioned recipes for one package (didn't try if that's still true) so i'm, again, running into the issue of what to do with older toolchains needing that canadian stuff. I'm not too jazzed about the idea to touch the old toolchains just because i want to have current gmp/mpc/mpfr/gcc (using CLASSEXTEND nativesdk). So, how to proceed?
cheers,
Re: BBCLASSEXTEND canadian?
Quoted 18 lines · Bernhard Reutner-Fischer
Quoted 7 lines · Richard Purdie
Quoted 3 lines · Tom Rini
Quoted 1 line
BBCLASSEXTEND covers -native and -nativesdk
Is the -nativesdk part implicit in the anonfuncs in nativesdk.bbclass or just not merged yet?
It should be implicit in the anonfuncs. If that class differs to Poky, the Poky changes should be merged though.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
The -cross, -crosssdk, -canadian-cross and other combinations usually have too many differences to be worth the effort although it would be possible to make them work.
I'm not so sure about that, but we'll see. I should have some form of canadian stuff working again shortly.
You're unsure it would be possible to make them work of that its not worth the effort?
Tom?
Quoted 8 lines
Yesterday evening i was building a pristine master reference again and saw that mpfr et al are (still) pretty outdated.
AFAIR i cannot mix BBCLASSEXTEND vs. old-fashioned recipes for one package (didn't try if that's still true) so i'm, again, running into the issue of what to do with older toolchains needing that canadian stuff. I'm not too jazzed about the idea to touch the old toolchains just because i want to have current gmp/mpc/mpfr/gcc (using CLASSEXTEND nativesdk). So, how to proceed?
So, where things stand right now (and have stood for a while) is that the existing canadian recipes simply don't work. We've made them work internally, and then moved them up to using nativesdk/etc. That's also been finished and the engineer in question is now working on making it work in OE.dev. But for now, don't let the existing canadian stuff (which is broken) get in the way of fixing up other stuff.
Signature · 2 lines
Tom Rini Mentor Graphics Corporation
Re: [PATCH 8/8] xz: add xz package
In reply to Bernhard Reutner-Fischer-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 3 lines · Bernhard Reutner-Fischer
xz is the lzma successor
+PV = "4.999.9beta"
That seems to violate our versioning policy, you want something like
PV = "4.999.8+4.999.9beta"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLdA7yMkyGM64RGpERAnsoAJ4uaDiGhIn+wmdxB17vcTC5FeWXwQCeMrZj IRPeOv6iFyGgLcHcZLL0Wlo=
=qU1s
-----END PGP SIGNATURE-----
Re: [PATCH 8/8] xz: add xz package
Quoted 11 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 3 lines · Bernhard Reutner-Fischer
xz is the lzma successor
+PV = "4.999.9beta"
That seems to violate our versioning policy, you want something like
PV = "4.999.8+4.999.9beta"
the upstream tarball is (literally!) named 4.999.9beta
According to http://wiki.openembedded.net/index.php/Versioning_Policy
(it would be nice to be able to just refer to /Versioning_Policy, btw) this should be ok in this particular case, no?
Re: [PATCH 8/8] xz: add xz package
Quoted 5 lines · Bernhard Reutner-Fischer
Quoted 4 lines · Koen Kooi
Quoted 1 line · Bernhard Reutner-Fischer
+PV = "4.999.9beta"
That seems to violate our versioning policy, you want something like
Quoted 7 lines
Quoted 1 line
PV = "4.999.8+4.999.9beta"
the upstream tarball is (literally!) named 4.999.9beta
According to http://wiki.openembedded.net/index.php/Versioning_Policy
(it would be nice to be able to just refer to /Versioning_Policy, btw) this should be ok in this particular case, no?
nm.. I now see the pitfall that may imply if Larhzu would do another intermediate release. Done and thanks!
Re: [PATCH 7/8] autoconf: add 2.65
In reply to Bernhard Reutner-FischerDnia środa, 10 lutego 2010 o 21:12:59 Bernhard Reutner-Fischer napisał(a):
Quoted 3 lines
xz needs >= 2.64
Also add patches to recognize BusyBox versions of programs. Add patch for gettext-0.17 to nop outm4_copyon autoconf > 2.63
Can you update that changeset?
Also please split it to 1. autoconf 2. gettext - will be more readable.
Regards,
Signature · 3 lines
JID: [email protected] Website: http://marcin.juszkiewicz.com.pl/ LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
Re: [PATCH 6/8] busybox: remove orphaned patch checksums
In reply to Bernhard Reutner-FischerQuoted 2 lines · Bernhard Reutner-Fischer
These http download patches are not in use anymore. Just keep checksums for 1.7.2 (those are mentioned in the .bb)
Thanks. I checked this in.
p.
Re: [PATCH 5/8] busybox: use .tar.bz2
In reply to Bernhard Reutner-FischerQuoted 2 lines · Bernhard Reutner-Fischer
Switch to new-style checksums and remove all checksums for tarballs from checksums.ini
Thanks. I checked this in.
p.
Re: [PATCH 4/8] handle xz compressed files and tarballs
In reply to Bernhard Reutner-FischerQuoted 3 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- classes/base.bbclass | 4 ++++
Thanks. I checked this in.
p.
Re: [PATCH 3/8] gmp: set SRC_URI name
In reply to Bernhard Reutner-FischerQuoted 4 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- recipes/gmp/gmp.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Thanks. I checked this in.
p.
Re: [PATCH 2/8] autoconf: set SRC_URI name
In reply to Bernhard Reutner-FischerQuoted 4 lines · Bernhard Reutner-Fischer
Signed-off-by Bernhard Reutner-Fischer <[email protected]>--- recipes/autoconf/autoconf.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Thanks. I checked this in.
p.
Re: [PATCH 1/8] hwclock.sh: some more !getopt_long fixes
In reply to Bernhard Reutner-FischerQuoted 4 lines · Bernhard Reutner-Fischer
busybox' hwclock can be built without support for
getopt_long. Flags of the big hwclock are compatible with the busybox version.Signed-off-by Bernhard Reutner-Fischer <[email protected]>
Thanks. I checked this in.
p.