Major set of Changes
Richard,
I have test build this grouping of changes and theyseem good to me at this point. One issue is with the linux-yocto change set from Bruce seems to introduce a problem with compile perf on some hardware Machine settings.
The openssl changes will need to be backported to 1.1.1, which Joshua is aware of.
Please review this change set and pull as appropriate.
Thanks
Sau!
The following changes since commit 91e17c0c0ac2330f826b95e762542cd0d0c82385:
pango: Use gnomebase class, not gnome (2012-01-16 18:01:31 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Andrei Gherzan (1):
wpa-supplicant: Compile without CONFIG_GNUTLS_EXTRA (PR BUMP)
Aneesh Bansal (1):
add mfatbu/mfatbl instructions support in Valgrind
Bruce Ashfield (1):
linux-yocto: consolidated fix SRCREV updates
Christopher Larson (5):
ncurses-native: install to libdir, not base_libdir
copyleft_compliance: add control of recipe types to include
copyleft_compliance: add debug message with the reason for exclusion oe.license: add is_included convenience function oe.license: avoid the need to catch SyntaxError
Colin Walters (1):
libtool: Put all libltdl headers in the correct libltdl-dev package
Darren Hart (1):
bootimg: Account for FAT filesystem overhead in image size
Denis 'GNUtoo' Carikli (1):
alsa-utils: depend on libsamplerate0
Enrico Scholz (2):
package.bbclass: quote pathname given to objdump bitbake.conf: search /lib for -native builds
James Limbouris (1):
ghostscript: build cups filters
Joshua Lock (4):
task-base: move default definition of VIRTUAL-RUNTIME_apm
alsa-state: add alsa-state from oe classic
alsa-state: move state files to localstatedir
task-base: add VIRTUAL-RUNTIME_alsa-state to task-base-alsa
Liming Wang (4):
qemuppc: replace emulation of qemuppc from prep to mac99
qemuppc: add pointercal file
qemuppc: add machconfig
tslib: enable big endian support for qemuppc
Mark Hatle (1):
prelink: Update to latest version
Martin Jansa (2):
xorg-*: disable xmlto where it was failing dbus-1.4.16: use INC_PR from dbus.inc to fix PR bump after
dbus-launch-helper permission change
Matthew McClintock (2):
image_types.bbclass: Fix generating uncompressed ext2 images image_types_uboot.bbclass: Add uncompressed ext2 image option
Nitin A Kamble (7):
locale: fix package's "provides" tag
diffstat: upgrade from 1.54 to 1.55
insane.bbclass: fix elf.arch not matching error for x32 kernel
libpcre: upgrade from 8.20 to 8.21
btrfs-tools: upgrade to newer git commit
distro_tracking: update manual_check_date fields
grub-efi-native: fix errors with automake 1.11.2
Paul Eggleton (4):
classes/base: note variable name in COMPATIBLE_* skip messages conf/bitbake.conf: allow wget to output error messages classes/package: remove out-of-date notice referring to the OE
bugtracker
classes/packagehistory: remove now obsolete class
Saul Wold (7):
m4: refactor .bb and .inc files
tcmode-eglibc: Fix PREFERRED_VERSION of eglibc
valgrind: Update for eglibc 2.15
python: PR bump for eglibc update
tcl: PR bump for eglibc update openssl-0.9.8: Update to 0.9.8s openssl-1.0.0: Update to 1.0.0e and fix QA Warning
Scott Garman (3):
libpam: upgrade to 1.1.5
e2fsprogs: upgrade to 1.42
distro_tracking: recipe upgrades and manual check info
Shane Wang (2):
stat: add recipe stat with version 3.3
hdparm: upgrade to 9.37
Tom Zanussi (5):
base.bbclass: add support for LICENSE_FLAGS
Add LICENSE_FLAGS to packages mentioned in COMMERCIAL_LICENSE base.bbclass: remove COMMERCIAL_LICENSE code default-distrovars.inc: remove COMMERCIAL_LICENSE et al documentation-audit.sh: remove COMMERCIAL_LICENSE warning
Xiaofeng Yan (1):
distro_tracking_fields.inc: Modify the status of eds-tools and
mingetty
Zhai Edwin (2):
distro-tracking: Update info for webkit-gtk, web-webkit
runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10
Zumeng Chen (4):
lttng-ust: Update to 2.0
lttng-tools: Update to 2.0-pre16
lttng-modules: Update to 2.0
babeltrace: Integrated from version 0.8
meta/classes/base.bbclass | 16 +-
meta/classes/bootimg.bbclass | 45 +-
meta/classes/copyleft_compliance.bbclass | 56 +-
meta/classes/image_types.bbclass | 7 +-
meta/classes/image_types_uboot.bbclass | 6 +-
meta/classes/insane.bbclass | 3 +-
meta/classes/libc-package.bbclass | 3 -
meta/classes/license.bbclass | 30 +
meta/classes/package.bbclass | 7 +-
meta/classes/packagehistory.bbclass | 249 -
meta/conf/bitbake.conf | 14 +-
meta/conf/distro/include/default-distrovars.inc | 5 -
meta/conf/distro/include/default-providers.inc | 2 +
.../conf/distro/include/distro_tracking_fields.inc | 96 +-
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/conf/machine/qemuppc.conf | 2 +-
meta/lib/oe/license.py | 59 +-
meta/lib/test.py | 3 +
meta/recipes-bsp/alsa-state/alsa-state.bb | 59 +
meta/recipes-bsp/alsa-state/alsa-state/alsa-state | 29 +
meta/recipes-bsp/alsa-state/alsa-state/asound.conf | 12 +
.../recipes-bsp/alsa-state/alsa-state/asound.state | 1 +
.../formfactor/files/qemuppc/machconfig | 10 +
.../files/grub-1.99_fix_for_automake_1.11.2.patch | 5888 ++++++++++++++++++++
meta/recipes-bsp/grub/grub-efi-native_1.99.bb | 5 +-
.../pointercal/files/qemuppc/pointercal | Bin 0 -> 36 bytes
.../configure-targets.patch | 0
.../debian/ca.patch | 0
.../debian/config-hurd.patch | 0
.../debian/debian-targets.patch | 0
.../debian/engines-path.patch | 0
.../debian/kfreebsd-pipe.patch | 0
.../debian/make-targets.patch | 0
.../debian/man-dir.patch | 0
.../debian/man-section.patch | 0
.../debian/no-rpath.patch | 0
.../debian/no-symbolic.patch | 0
.../debian/perl-path.diff | 0
.../debian/pic.patch | 0
.../debian/pkg-config.patch | 0
.../debian/rc4-amd64.patch | 0
.../debian/rehash-crt.patch | 0
.../debian/rehash_pod.patch | 0
.../debian/series | 0
.../debian/shared-lib-ext.patch | 0
.../debian/stddef.patch | 0
.../debian/version-script.patch | 0
.../parallel-make-fix.patch | 0
.../shared-libs.patch | 0
.../configure-targets.patch | 0
.../debian/c_rehash-compat.patch | 0
.../debian/ca.patch | 0
.../debian/debian-targets.patch | 0
.../debian/make-targets.patch | 0
.../debian/man-dir.patch | 0
.../debian/man-section.patch | 0
.../debian/no-rpath.patch | 0
.../debian/no-symbolic.patch | 0
.../debian/pic.patch | 0
.../debian/pkg-config.patch | 0
.../debian/version-script.patch | 0
.../engines-install-in-libdir-ssl.patch | 0
.../oe-ldflags.patch | 0
.../openssl-fix-link.patch | 0
.../openssl_fix_for_x32.patch | 0
.../shared-libs.patch | 0
.../{openssl_0.9.8r.bb => openssl_0.9.8s.bb} | 8 +-
.../{openssl_1.0.0e.bb => openssl_1.0.0f.bb} | 8 +-
.../wpa-supplicant/defconfig.inc | 4 -
.../wpa-supplicant-0.7.3/defconfig-gnutls | 2 +-
.../wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3 | 409 --
.../wpa-supplicant/wpa-supplicant-0.7.inc | 7 +-
.../wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +-
meta/recipes-core/dbus/dbus_1.4.16.bb | 2 +
meta/recipes-core/eglibc/eglibc-locale.inc | 2 +-
meta/recipes-core/ncurses/ncurses.inc | 6 +-
meta/recipes-core/tasks/task-base.bb | 8 +-
.../btrfs-tools/btrfs-tools_git.bb | 4 +-
.../{diffstat_1.54.bb => diffstat_1.55.bb} | 6 +-
.../acinclude.m4 | 0
.../mkdir.patch | 0
.../quotefix.patch | 45 +-
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
.../{e2fsprogs_1.41.14.bb => e2fsprogs_1.42.bb} | 7 +-
meta/recipes-devtools/libtool/libtool-2.4.2.inc | 2 +-
meta/recipes-devtools/m4/m4-native_1.4.16.bb | 3 +-
meta/recipes-devtools/m4/m4.inc | 19 +
meta/recipes-devtools/m4/m4_1.4.16.bb | 19 +-
meta/recipes-devtools/prelink/prelink_git.bb | 4 +-
meta/recipes-devtools/python/python_2.7.2.bb | 2 +-
meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 2 +-
...upport-for-PPC-instructions-mfatbu-mfatbl.patch | 94 +
.../valgrind/valgrind-3.7.0/configure-fix.patch | 25 +-
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 5 +-
.../ghostscript/ghostscript_9.04.bb | 29 +-
.../recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37 -
.../hdparm/hdparm-6.3/uclibc.patch | 34 -
meta/recipes-extended/hdparm/hdparm_6.3.bb | 18 -
meta/recipes-extended/hdparm/hdparm_9.37.bb | 36 +
.../pam/{libpam_1.1.4.bb => libpam_1.1.5.bb} | 27 +-
meta/recipes-extended/stat/stat_3.3.bb | 26 +
meta/recipes-graphics/tslib/tslib_1.0.bb | 1 +
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 +-
.../xorg-proto/xorg-proto-common.inc | 2 +-
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 +
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 6 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 15 +-
meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb | 28 +
...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 41 +
.../lttng-2.0/lttng-modules_2.0.pre11.bb | 27 +
...tools-fix-compiling-error-for-powerpc-arm.patch | 27 +
.../lttng-2.0/lttng-tools_2.0-pre16.bb | 30 +
meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb | 30 +
.../recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb | 4 +-
.../gstreamer/gst-fluendo-mp3_0.10.16.bb | 1 +
.../gstreamer/gst-openmax_0.10.1.bb | 1 +
.../gstreamer/gst-plugins-ugly_0.10.18.bb | 1 +
meta/recipes-multimedia/lame/lame_3.99.3.bb | 2 +
meta/recipes-multimedia/libmad/libmad_0.15.1b.bb | 1 +
meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 1 +
meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb | 1 +
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 1 +
.../libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} | 5 +-
scripts/contrib/documentation-audit.sh | 3 +-
scripts/runqemu | 7 +-
scripts/runqemu-internal | 27 +-
126 files changed, 6777 insertions(+), 1001 deletions(-)
delete mode 100644 meta/classes/packagehistory.bbclass
create mode 100644 meta/lib/test.py
create mode 100644 meta/recipes-bsp/alsa-state/alsa-state.bb
create mode 100755 meta/recipes-bsp/alsa-state/alsa-state/alsa-state
create mode 100644 meta/recipes-bsp/alsa-state/alsa-state/asound.conf
create mode 100644 meta/recipes-bsp/alsa-state/alsa-state/asound.state
create mode 100755 meta/recipes-bsp/formfactor/files/qemuppc/machconfig
create mode 100644 meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
create mode 100644 meta/recipes-bsp/pointercal/files/qemuppc/pointercal
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/config-hurd.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/engines-path.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/kfreebsd-pipe.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/make-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/perl-path.diff (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/pkg-config.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/rc4-amd64.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/rehash-crt.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/rehash_pod.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/series (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/shared-lib-ext.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/stddef.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/parallel-make-fix.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/c_rehash-compat.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/make-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/pkg-config.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/engines-install-in-libdir-ssl.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/oe-ldflags.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/openssl-fix-link.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/openssl_fix_for_x32.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl_0.9.8r.bb => openssl_0.9.8s.bb} (87%)
rename meta/recipes-connectivity/openssl/{openssl_1.0.0e.bb => openssl_1.0.0f.bb} (84%)
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/defconfig.inc
delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3
rename meta/recipes-devtools/diffstat/{diffstat_1.54.bb => diffstat_1.55.bb} (82%)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.14 => e2fsprogs-1.42}/acinclude.m4 (100%)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.14 => e2fsprogs-1.42}/mkdir.patch (100%)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.14 => e2fsprogs-1.42}/quotefix.patch (40%)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.41.14.bb => e2fsprogs_1.42.bb} (92%)
create mode 100644 meta/recipes-devtools/m4/m4.inc
create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.7.0/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch
delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch
delete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb
create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb
rename meta/recipes-extended/pam/{libpam_1.1.4.bb => libpam_1.1.5.bb} (85%)
create mode 100644 meta/recipes-extended/stat/stat_3.3.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
rename meta/recipes-support/libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} (93%)Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 01/62] base.bbclass: add support for LICENSE_FLAGS
From: Tom Zanussi <[email protected]>
LICENSE_FLAGS are a per-recipe replacement for the COMMERCIAL_LICENSE mechanism.
In the COMMERCIAL_LICENSE mechanism, any package name mentioned in the global COMMERCIAL_LICENSE list is 'blacklisted' from being included in an image. To allow the blacklisted package into the image, the corresponding packages need to be removed from the COMMERCIAL_LICENSE list. This mechanism relies on a global list defined in default-distrovars.inc.
The LICENSE_FLAGS mechanism essentially implements the same thing but turns the global blacklist into a per-recipe whitelist. Any recipe can optionally define one or more 'license flags'; if defined, each of the license flags defined for a recipe must have matching entries in a global LICENSE_FLAGS_WHITELIST variable. Typically a recipe will have a single license flag specific to itself, which allows it to be individually toggled on and off. For example, a package named 'foo' might define a single license flag, 'commercial_foo':
LICENSE_FLAGS = "commercial_foo"
This says that in order for the foo package to be included in the image, the string 'commercial_foo' must appear in the LICENSE_FLAGS_WHITELIST variable:
LICENSE_FLAGS_WHITELIST = "commercial_foo"
Because the typical case is indeed to create LICENSE_FLAGS containing the package name, the LICENSE_FLAGS could just as well have been specified as:
LICENSE_FLAGS = "commercial_${PN}
which would pick up the package name automatically.
The mechanism has the word 'flags' in the name because although the typical case is to specify a single string to match as above, the user can add additional strings that might be thought of additional 'attributes' of a license that also need to be matched. This allows for the creation and specification of license categories that could be used to flexibly match sets of packages that match certain attributes without forcing them to all be specified individually. For example, a particular set of recipes that are typically used together might all contain a 'commercial_video' flag. Additionally, some of them might specify an additional 'binary' flag meaning that it's not possible to get the source for those packages. Specifying both 'commercial_video and binary' in the LICENSE_FLAGS_WHITELIST would allow them all to be pulled in, but if 'binary' was missing, it would only allow those packages that had source to be allowed in to the image.
The current behavior of COMMERCIAL_LICENSE is replicated as mentioned above by having the current set of COMMERCIAL_LICENSE flags implement their using LICENSE_FLAGS = "commercial_${PN}.
That being the case, the current COMMERCIAL_LICENSE can equivalently be specified in the new scheme by putting the below in local.conf:
# This is a list of packages that require a commercial license to ship
# product. If shipped as part of an image these packages may have # implications so they are disabled by default. To enable them, # un-comment the below as appropriate. #LICENSE_FLAGS_WHITELIST = "commercial_gst-fluendo-mp3 \ # commercial_gst-openmax \ # commercial_gst-plugins-ugly \ # commercial_lame \ # commercial_libmad \ # commercial_libomxil \ # commercial_mpeg2dec \ # commercial_qmmp"
The above allows all of the current COMMERCIAL_LICENSE packages in - to disallow a particular package from appearing in the image, simply remove it from the whitelist.
--- meta/classes/base.bbclass | 7 +++++++ meta/classes/license.bbclass | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-)
meta/classes/base.bbclass +7 -0
@@ -349,6 +349,13 @@ python () { if license == "INVALID": bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn) + unmatched_license_flag = check_license_flags(d) + if unmatched_license_flag: + bb.debug(1, "Skipping %s because it has a restricted license (%s) not" + " whitelisted in LICENSE_FLAGS_WHITELIST" % (pn, unmatched_license_flag)) + raise bb.parse.SkipPackage("because it has a restricted license (%s) not" + " whitelisted in LICENSE_FLAGS_WHITELIST" % unmatched_license_flag) + commercial_license = " %s " % d.getVar('COMMERCIAL_LICENSE', 1) import re pnr = "[ \t]%s[ \t]" % pn.replace('+', "\+")
meta/classes/license.bbclass +30 -0
@@ -282,6 +282,36 @@ def incompatible_license(d,dont_want_license): return True return False + +def check_license_flags(d): + """ + This function checks if a recipe has any LICENSE_FLAGs that aren't whitelisted. + + If it does, it returns the first LICENSE_FLAG missing from the whitelist, or all the + the LICENSE_FLAGs if there is no whitelist. + + If everything is is properly whitelisted, it returns None. + """ + + def all_license_flags_match(flags, whitelist): + """ Return first unmatched flag, None if all flags match """ + + for flag in flags.split(): + if not flag in whitelist.split(): + return flag + return None + + license_flags = d.getVar('LICENSE_FLAGS', True) + if license_flags: + license_flags_whitelist = d.getVar('LICENSE_FLAGS_WHITELIST', True) + if not license_flags_whitelist: + return license_flags + unmatched_flag = all_license_flags_match(license_flags, license_flags_whitelist) + if unmatched_flag: + return unmatched_flag + return None + + SSTATETASKS += "do_populate_lic" do_populate_lic[sstate-name] = "populate-lic" do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 03/62] base.bbclass: remove COMMERCIAL_LICENSE code
In reply to Saul WoldFrom: Tom Zanussi <[email protected]>
The COMMERCIAL_LICENSE mechanism has been superseded by LICENSE_FLAGS so remove the code that implements COMMERCIAL_LICENSE.
--- meta/classes/base.bbclass | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
meta/classes/base.bbclass +0 -7
@@ -356,13 +356,6 @@ python () { raise bb.parse.SkipPackage("because it has a restricted license (%s) not" " whitelisted in LICENSE_FLAGS_WHITELIST" % unmatched_license_flag) - commercial_license = " %s " % d.getVar('COMMERCIAL_LICENSE', 1) - import re - pnr = "[ \t]%s[ \t]" % pn.replace('+', "\+") - if commercial_license and re.search(pnr, commercial_license): - bb.debug(1, "Skipping %s because it's commercially licensed" % pn) - raise bb.parse.SkipPackage("because it may require a commercial license to ship in a product (listed in COMMERCIAL_LICENSE)") - # If we're building a target package we need to use fakeroot (pseudo) # in order to capture permissions, owners, groups and special files if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 02/62] Add LICENSE_FLAGS to packages mentioned in COMMERCIAL_LICENSE
In reply to Saul WoldFrom: Tom Zanussi <[email protected]>
Per-recipe LICENSE_FLAGS replace the global COMMERCIAL_LICENSE list; add LICENSE_FLAGS varables to each the recipes mentioned in that list:
- lame
- gst-fluendo-mp3
- gst-openmax
- gst-plugins-ugly
- libmad
- libomxil
- mpeg2dec
- qmmp
--- .../gstreamer/gst-fluendo-mp3_0.10.16.bb | 1 + .../gstreamer/gst-openmax_0.10.1.bb | 1 + .../gstreamer/gst-plugins-ugly_0.10.18.bb | 1 + meta/recipes-multimedia/lame/lame_3.99.3.bb | 2 ++ meta/recipes-multimedia/libmad/libmad_0.15.1b.bb | 1 + meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb | 1 + meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb | 1 + meta/recipes-qt/qt-apps/qmmp_0.5.2.bb | 1 + 8 files changed, 9 insertions(+), 0 deletions(-)
meta/recipes-multimedia/gstreamer/gst-fluendo-mp3_0.10.16.bb +1 -0
@@ -2,6 +2,7 @@ require gst-fluendo.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=98326cbb1723a5a97e9b1db62e9faa05" +LICENSE_FLAGS = "commercial_${PN}" acpaths = "-I ${S}/common/m4 -I ${S}/m4"
meta/recipes-multimedia/gstreamer/gst-openmax_0.10.1.bb +1 -0
@@ -1,6 +1,7 @@ DEPENDS = "gstreamer" RDEPENDS_${PN} = "libomxil" LICENSE = "LGPLv2.1" +LICENSE_FLAGS = "commercial_${PN}" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://util/sem.h;beginline=1;endline=20;md5=accce5550d5583b839b441a0623f09fc"
meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.18.bb +1 -0
@@ -1,6 +1,7 @@ require gst-plugins.inc LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" +LICENSE_FLAGS = "commercial_${PN}" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/synaesthesia/synaescope.h;beginline=1;endline=20;md5=99f301df7b80490c6ff8305fcc712838 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 \
meta/recipes-multimedia/lame/lame_3.99.3.bb +2 -0
@@ -3,6 +3,8 @@ HOMEPAGE = "http://sourceforge.net/projects/lame/files/lame/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=290&atid=100290" SECTION = "console/utils" LICENSE = "LGPLv2+" +LICENSE_FLAGS = "commercial_${PN}" + LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9 \ file://include/lame.h;beginline=1;endline=20;md5=a2258182c593c398d15a48262130a92b PR = "r0"
meta/recipes-multimedia/libmad/libmad_0.15.1b.bb +1 -0
@@ -2,6 +2,7 @@ DESCRIPTION = "MPEG Audio Decoder Library" HOMEPAGE = "http://sourceforge.net/projects/mad/" BUGTRACKER = "http://sourceforge.net/tracker/?group_id=12349&atid=112349" LICENSE = "GPLv2+" +LICENSE_FLAGS = "commercial_${PN}" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYRIGHT;md5=8e55eb14894e782b84488d5a239bc23d \ file://version.h;beginline=1;endline=8;md5=aa07311dd39288d4349f28e1de516454"
meta/recipes-multimedia/libomxil/libomxil_0.9.3.bb +1 -0
@@ -1,6 +1,7 @@ DESCRIPTION = "Bellagio OpenMAX Integration Layer" HOMEPAGE = "http://omxil.sourceforge.net/" LICENSE = "LGPLv2.1+" +LICENSE_FLAGS = "commercial_${PN}" LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \ file://src/omxcore.h;beginline=1;endline=27;md5=806b1e5566c06486fe8e42b461e03a90" DEPENDS = "libvorbis libogg alsa-lib libmad"
meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb +1 -0
@@ -2,6 +2,7 @@ DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video str HOMEPAGE = "http://libmpeg2.sourceforge.net/" SECTION = "libs" LICENSE = "GPLv2+" +LICENSE_FLAGS = "commercial_${PN}" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154"
meta/recipes-qt/qt-apps/qmmp_0.5.2.bb +1 -0
@@ -1,6 +1,7 @@ DESCRIPTION = "Qmmp (Qt-based Multimedia Player) is an audio-player, written with help of Qt library" HOMEPAGE = "http://qmmp.ylsoftware.com" LICENSE = "GPLv2" +LICENSE_FLAGS = "commercial_${PN}" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 06/62] wpa-supplicant: Compile without CONFIG_GNUTLS_EXTRA (PR BUMP)
In reply to Saul WoldFrom: Andrei Gherzan <[email protected]>
CONFIG_GNUTLS_EXTRA is needed as support for TLS/IA which was designed to be used in the EAP-TTLSv1. As we don't see any requirement for that protocol today we decided to remove it from wpa-supplicant .config file.
This change includes PR bump.
[YOCTO #1845]
--- .../wpa-supplicant/defconfig.inc | 4 - .../wpa-supplicant-0.7.3/defconfig-gnutls | 2 +- .../wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3 | 409 -------------------- .../wpa-supplicant/wpa-supplicant-0.7.inc | 7 +- .../wpa-supplicant/wpa-supplicant_0.7.3.bb | 2 +- 5 files changed, 4 insertions(+), 420 deletions(-) delete mode 100644 meta/recipes-connectivity/wpa-supplicant/defconfig.inc delete mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3
meta/recipes-connectivity/wpa-supplicant/defconfig.inc deleted +0 -4
@@ -1,4 +0,0 @@ -def get_defconfig(bb, d): - if d.getVar('INCOMPATIBLE_LICENSE', 1) in [ 'GPLv3' ]: - return "-nogplv3" - return ""
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls +1 -1
@@ -404,6 +404,6 @@ CONFIG_PEERKEY=y #LIBS_p += -lbfd -liberty -lz #LIBS_c += -lbfd -liberty -lz CONFIG_TLS = gnutls -CONFIG_GNUTLS_EXTRA=y +#CONFIG_GNUTLS_EXTRA=y CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.3/defconfig-gnutls-nogplv3 deleted +0 -409
409 lines not on this page · raw message
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-0.7.inc +2 -5
@@ -9,11 +9,8 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ DEPENDS = "gnutls dbus libnl" RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" -# Check if GPLv3 build and select the correct file in configure -require defconfig.inc - SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://defconfig-gnutls${@get_defconfig(bb, d)} \ + file://defconfig-gnutls \ file://defaults-sane \ file://wpa-supplicant.sh \ file://wpa_supplicant.conf \
@@ -28,7 +25,7 @@ FILES_wpa-supplicant-cli = "${sbindir}/wpa_cli" FILES_${PN} += " ${datadir}/dbus-1/system-services/* do_configure () { - install -m 0755 ${WORKDIR}/defconfig-gnutls${@get_defconfig(bb, d)} .config + install -m 0755 ${WORKDIR}/defconfig-gnutls .config } export EXTRA_CFLAGS = "${CFLAGS}"
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_0.7.3.bb +1 -1
@@ -1,6 +1,6 @@ require wpa-supplicant-0.7.inc -PR = "r5" +PR = "r6" SRC_URI[md5sum] = "f516f191384a9a546e3f5145c08addda" SRC_URI[sha256sum] = "d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 04/62] default-distrovars.inc: remove COMMERCIAL_LICENSE et al
In reply to Saul WoldFrom: Tom Zanussi <[email protected]>
The global COMMERCIAL_LICENSE mechanism has been obsoleted by per-recipe LICENSE_FLAGS, so remove the related variables.
--- meta/conf/distro/include/default-distrovars.inc | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
meta/conf/distro/include/default-distrovars.inc +0 -5
@@ -26,11 +26,6 @@ HOSTTOOLS_WHITELIST_GPLv3 ?= "" WHITELIST_GPLv3 ?= "less" LGPLv2_WHITELIST_GPLv3 ?= "libassuan gnutls libtasn1 libidn libgcc gcc-runtime" -# This is a list of packages that require a commercial license to ship -# product. If shipped as part of an image these packages may have -# implications so they are disabled by default -COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp ${COMMERCIAL_LICENSE_DEPENDEES}" -COMMERCIAL_LICENSE_DEPENDEES ?= "gst-plugins-ugly libomxil gst-openmax" COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" COMMERCIAL_VIDEO_PLUGINS ?= ""
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 05/62] documentation-audit.sh: remove COMMERCIAL_LICENSE warning
In reply to Saul WoldFrom: Tom Zanussi <[email protected]>
COMMERCIAL_LICENSE no longer exists; the equivalent functionality is now has been replaced by LICENSE_FLAGS_WHITELIST, so replace the COMMERCIAL_LICENSE warning with a similarly equivalent warning.
--- scripts/contrib/documentation-audit.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
scripts/contrib/documentation-audit.sh +2 -1
@@ -25,7 +25,8 @@ if [ -z "$BITBAKE" ]; then fi echo "REMINDER: you need to build for MACHINE=qemux86 or you won't get useful results" -echo "REMINDER: you need to have COMMERCIAL_LICENSE = \"\" in local.conf or you'll get false positives" +echo "REMINDER: you need to set LICENSE_FLAGS_WHITELIST appropriately in local.conf or " +echo " you'll get false positives. For example, LICENSE_FLAGS_WHITELIST = \"Commercial\"" for pkg in `bitbake -s | awk '{ print \$1 }'`; do if [[ "$pkg" == "Loading" || "$pkg" == "Loaded" ||
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 09/62] locale: fix package's "provides" tag
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Fixes this bug: [YOCTO #1874]
Fixes an issue where a locale package depends on one package while it also provides the same, as seen bellow.
Package: locale-base-de-de
Version: 2.12-r19
Depends: eglibc-binary-localedata-de-de
Provides: virtual-locale-de-de, virtual-locale-de, eglibc-binary-localedata-de-de
Actually the eglibc-binary-localedata-de-de is ia separate package,
and it should not be part of provides of the locale-base-de-de.
--- meta/classes/libc-package.bbclass | 3 --- meta/recipes-core/eglibc/eglibc-locale.inc | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-)
meta/classes/libc-package.bbclass +0 -3
@@ -248,9 +248,6 @@ python package_do_split_gconvs () { libc_name = name d.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('%s-binary-localedata-%s' \ % (bpn, libc_name))) - rprovides = (d.getVar('RPROVIDES_%s' % pkgname, True) or "").split() - rprovides.append(legitimize_package_name('%s-binary-localedata-%s' % (bpn, libc_name))) - d.setVar('RPROVIDES_%s' % pkgname, " ".join(rprovides)) commands = {}
meta/recipes-core/eglibc/eglibc-locale.inc +1 -1
@@ -26,7 +26,7 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips" # set "0" for qemu emulation of native localedef for locale generation LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" -PR = "r18" +PR = "r19" PKGSUFFIX = "" PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 08/62] ncurses-native: install to libdir, not base_libdir
In reply to Saul WoldFrom: Christopher Larson <[email protected]>
For target, both base_libdir and libdir in sysroot can be used, as we pass --sysroot to the toolchain. For native, we don't do this, and we also only add -L<sysroot>/${libdir}, not -L<sysroot>/${base_libdir}, resulting in other native recipes (like readline-native) failing to find the ncurses libraries.
readline-native only built successfully on hosts where it could fall back to their ncurses/termcap rather than the one in the sysroot.
--- meta/recipes-core/ncurses/ncurses.inc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/ncurses/ncurses.inc +3 -3
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS_virtclass-native = "" -INC_PR = "r3" +INC_PR = "r4" inherit autotools binconfig multilib_header
@@ -26,8 +26,8 @@ ENABLE_WIDEC ?= "true" # builds. BUILD_CPPFLAGS += "-D_GNU_SOURCE" -# tic from the -native build cannot run without setting this explicitly -BUILD_LDFLAGS_virtclass-native += "-Wl,-rpath,${base_libdir}" +# natives don't generally look in base_libdir +base_libdir_virtclass-native = "${libdir}" # Helper function for do_configure to allow multiple configurations # $1 the directory to run configure in
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 07/62] ghostscript: build cups filters
In reply to Saul WoldFrom: James Limbouris <[email protected]>
Cups filters are no longer built by default. Since ghostscript already depends on cups, build the filters and package them as ghostscript-cups.
Ghostscript uses the cups-config script from the oe sysroots to determine some of the target install paths, as well as to determine the linker path. The config script gives out paths pointing to the sysroot, so some of the paths needed to be adjusted in the Makefile.
--- .../ghostscript/ghostscript_9.04.bb | 29 ++++++++++++++++--- 1 files changed, 24 insertions(+), 5 deletions(-)
meta/recipes-extended/ghostscript/ghostscript_9.04.bb +24 -5
@@ -15,7 +15,7 @@ SECTION = "console/utils" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=d151214b3131251dfc9d858593acbd24" -PR = "r2" +PR = "r3" DEPENDS = "ghostscript-native tiff jpeg fontconfig cups" DEPENDS_virtclass-native = ""
@@ -34,7 +34,8 @@ SRC_URI_virtclass-native = "${SRC_URI_BASE}" SRC_URI[md5sum] = "9c2fb4af1eb609d09dba5bb0fa76173a" SRC_URI[sha256sum] = "f1e333738c41c3bf2b47ceb9806abb8045bcdc7353002c32736150425a7c1ef4" -EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper --with-fontpath=${datadir}/fonts" +EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec --without-jasper \ + --with-fontpath=${datadir}/fonts --with-install-cups" # This has been fixed upstream but for now we need to subvert the check for time.h # http://bugs.ghostscript.com/show_bug.cgi?id=692443
@@ -60,6 +61,14 @@ do_configure_append () { cp ${STAGING_BINDIR_NATIVE}/ghostscript-${PV}/$i obj/aux/$i done fi + + # replace cups paths from sysroots/.../usr/bin/crossscripts/cups-config with target paths + # CUPSDATA is compiled into a utility, and CUPSSERVERBIN is used as an install path + CUPSSERVERBIN=${exec_prefix}/lib/cups # /usr/lib NOT libdir + CUPSDATA=${datadir}/cups + + sed -e "s#^CUPSSERVERBIN=.*#CUPSSERVERBIN=${CUPSSERVERBIN}#" -i Makefile + sed -e "s#^CUPSDATA=.*#CUPSDATA=${CUPSDATA}#" -i Makefile } do_install_append () {
@@ -67,9 +76,7 @@ do_install_append () { cp -r Resource ${D}${datadir}/ghostscript/${PV}/ cp -r iccprofiles ${D}${datadir}/ghostscript/${PV}/ - if [ -f ${D}${sysconfdir}/cups ]; then - chown -R root:lp ${D}${sysconfdir}/cups - fi + chown -R root:lp ${D}${sysconfdir}/cups } python do_patch_virtclass-native () {
@@ -95,3 +102,15 @@ BBCLASSEXTEND = "native" # Ghostscript install tool 'instcopy' tries to remove already created # directories during install and parallel make causes problems. PARALLEL_MAKEINST="" + +PACKAGES =+ "${PN}-cups" + +FILES_${PN}-dbg += "${exec_prefix}/lib/cups/filter/.debug" + +FILES_${PN}-cups += "${exec_prefix}/lib/cups/filter/gstoraster \ + ${exec_prefix}/lib/cups/filter/pstopxl \ + ${datadir}/cups \ + ${sysconfdir}/cups \ + " + +RDEPENDS_${PN}-cups = ${PN}
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 10/62] diffstat: upgrade from 1.54 to 1.55
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
---
.../{diffstat_1.54.bb => diffstat_1.55.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/diffstat/{diffstat_1.54.bb => diffstat_1.55.bb} (82%)meta/recipes-devtools/diffstat/diffstat_1.55.bb renamed from meta/recipes-devtools/diffstat/diffstat_1.54.bb +3 -3
@@ -6,13 +6,13 @@ HOMEPAGE = "http://invisible-island.net/diffstat/" SECTION = "devel" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5" -PR = "r1" +PR = "r0" SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \ file://dirfix.patch" -SRC_URI[md5sum] = "af08bef2eb37050ceb0c4fddedb2ee36" -SRC_URI[sha256sum] = "d8e67660ec85be597f8548ecdd088926639dac34ec7184aaf9d09c1e6ecb83e5" +SRC_URI[md5sum] = "630d5278f1cd874dc3cc68cff3fddecf" +SRC_URI[sha256sum] = "59a46c75a99f2c373a81880051adc43a17b71c55478691e702c61c13c6d61b55" S = "${WORKDIR}/diffstat-${PV}"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 12/62] libpcre: upgrade from 8.20 to 8.21
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
---
.../libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-support/libpcre/{libpcre_8.20.bb => libpcre_8.21.bb} (93%)meta/recipes-support/libpcre/libpcre_8.21.bb renamed from meta/recipes-support/libpcre/libpcre_8.20.bb +3 -2
@@ -12,8 +12,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch \ file://fix-pcre-name-collision.patch" -SRC_URI[md5sum] = "a1931c70e1273e3450d5036fe273d25c" -SRC_URI[sha256sum] = "e06b0943ce4b0f15324a20020d6086760a75b72f5ad7c23b9b2bfe690ed49acd" +SRC_URI[md5sum] = "0a7b592bea64b7aa7f4011fc7171a730" +SRC_URI[sha256sum] = "a4b8509d11fc2764fb4e1415b764ad2c214459edc011ce48aeeb6bbe1ac599e3" + S = "${WORKDIR}/pcre-${PV}" PROVIDES = "pcre"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 11/62] insane.bbclass: fix elf.arch not matching error for x32 kernel
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
For x32 the user space is 32bit and the kernel is 64bit. So the elf.arch for vmlinuz is x86_64 and not x86. This commit fixes this QA error thrown for x32 kernel.
| ERROR: QA Issue: Architecture did not match (62 to 3) on /work/qemux86_64-poky-linux-gnux32/linux-korg-3.1+git1+e2bf8464ddbf5da24d3d320cded5691828a91a0b-r1/packages-split/kernel-vmlinux/boot/vmlinux-3.1.0-yocto-standard-01628-ge2bf846
--- meta/classes/insane.bbclass | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/classes/insane.bbclass +2 -1
@@ -331,7 +331,8 @@ def package_qa_check_arch(path,name,d, elf, messages): = package_qa_get_machine_dict()[target_os][target_arch] # Check the architecture and endiannes of the binary - if not machine == elf.machine(): + if not ((machine == elf.machine()) or \ + ("virtual/kernel" in provides) and (target_os == "linux-gnux32")): messages.append("Architecture did not match (%d to %d) on %s" % \ (machine, elf.machine(), package_qa_clean_path(path,d))) elif not ((bits == elf.abiSize()) or \
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 14/62] distro_tracking: update manual_check_date fields
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
--- .../conf/distro/include/distro_tracking_fields.inc | 36 +++++++++++--------- 1 files changed, 20 insertions(+), 16 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +20 -16
@@ -31,9 +31,9 @@ RECIPE_MAINTAINER_pn-gtk-theme-torturer = "Zhai Edwin <[email protected]>" DISTRO_PN_ALIAS_pn-gtk-theme-torturer = "OSPDT upstream=http://wiki.laptop.org/go/GTK_for_OLPC" RECIPE_STATUS_pn-libpcre = "green" -RECIPE_LATEST_VERSION_pn-libpcre = "8.20" -RECIPE_LAST_UPDATE_pn-libpcre = "Nov 15, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-libpcre = "Nov 15, 2011" +RECIPE_LATEST_VERSION_pn-libpcre = "8.21" +RECIPE_LAST_UPDATE_pn-libpcre = "Jan 10, 2012" +RECIPE_MANUAL_CHECK_DATE_pn-libpcre = "Jan 10, 2012" RECIPE_MAINTAINER_pn-libpcre = "Nitin A Kamble <[email protected]>" DISTRO_PN_ALIAS_pn-libpcre = "Mandriva=libpcre0 Fedora=pcre"
@@ -2979,13 +2979,20 @@ RECIPE_STATUS_pn-ldconfig-native = "red" RECIPE_LAST_UPDATE_pn-ldconfig-native = "Nov 23, 2007" DISTRO_PN_ALIAS_pn-ldconfig-native = "Ubuntu=libc-bin Fedora=glibc" -RECIPE_STATUS_pn-gcc="red" -RECIPE_LATEST_VERSION_pn-gcc="4.6.1" +RECIPE_LATEST_VERSION_pn-gcc="4.6.2+git" RECIPE_LAST_UPDATE_pn-gcc = "May 1, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-gcc = "Jul 06, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-gcc = "Jan 10, 2012" RECIPE_MAINTAINER_pn-gcc = "Nitin A Kamble <[email protected]>" DISTRO_PN_ALIAS_pn-gcc-runtime = "Ubuntu=gcc Fedora=gcc" +RECIPE_LATEST_VERSION_pn-libgcc = "4.6.2+git" +RECIPE_LAST_UPDATE_pn-libgcc = "May 1, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-libgcc = "Jan 10, 2012" +DISTRO_PN_ALIAS_pn-libgcc = "Debian=libgcc4 Ubuntu=libgcc1 OpenSuSE=libgcc46" + +RECIPE_LATEST_VERSION_pn-gcc-runtime = "4.6.2+git" +RECIPE_LAST_UPDATE_pn-gcc-runtime = "May 1, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-gcc-runtime = "Jan 10, 2012" RECIPE_STATUS_pn-autoconf="red" RECIPE_LATEST_VERSION_pn-autoconf="2.68"
@@ -3018,7 +3025,7 @@ DISTRO_PN_ALIAS_pn-distcc = "Debian=distcc Fedora=distcc" RECIPE_STATUS_pn-flex="green" RECIPE_LATEST_VERSION_pn-flex="2.5.35" RECIPE_LAST_UPDATE_pn-flex = "Jun 20, 2010" -RECIPE_MANUAL_CHECK_DATE_pn-flex = "Nov 16, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-flex = "Jan 10, 2012" RECIPE_MAINTAINER_pn-flex = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-fstests="green"
@@ -3075,14 +3082,14 @@ RECIPE_MAINTAINER_pn-postinsts = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-nasm="green" RECIPE_LATEST_VERSION_pn-nasm="2.07" -RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Nov 16, 2011" RECIPE_LAST_UPDATE_pn-nasm = "Jun 23, 2010" +RECIPE_MANUAL_CHECK_DATE_pn-nasm = "Jan 10, 2012" RECIPE_MAINTAINER_pn-nasm = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-btrfs-tools="green" RECIPE_LATEST_VERSION_pn-btrfs-tools="git" -RECIPE_MANUAL_CHECK_DATE_pn-btrfs-tools = "Oct 18, 2011" -RECIPE_LAST_UPDATE_pn-btrfs-tools = "Jun 09, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-btrfs-tools = "Jan 10, 2012" +RECIPE_LAST_UPDATE_pn-btrfs-tools = "Jan 10, 2012" RECIPE_MAINTAINER_pn-btrfs-tools = "Nitin A Kamble <[email protected]>" DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
@@ -3143,6 +3150,7 @@ DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex" RECIPE_STATUS_pn-python-scons="green" RECIPE_LATEST_VERSION_pn-python-scons="2.1.0" RECIPE_LAST_UPDATE_pn-python-scons = "Oct 18, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-python-scons = "Jan 10, 2012" DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons" RECIPE_MANUAL_CHECK_DATE_pn-python-scons = "Nov 16, 2011" RECIPE_MAINTAINER_pn-python-scons = "Nitin A Kamble <[email protected]>"
@@ -3160,7 +3168,7 @@ RECIPE_MAINTAINER_pn-quilt = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-tcl="green" RECIPE_LATEST_VERSION_pn-tcl="8.5.11" RECIPE_LAST_UPDATE_pn-tcl = "Nov 16, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-tcl = "Nov 16, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-tcl = "Jan 10, 2012" RECIPE_MAINTAINER_pn-tcl = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-unifdef="green" # poky local source files
@@ -3176,7 +3184,7 @@ RECIPE_MAINTAINER_pn-gnu-config = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-mpfr="green" RECIPE_LATEST_VERSION_pn-mpfr="3.1.0" -RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Nov 15, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-mpfr = "Jan 10, 2012" RECIPE_LAST_UPDATE_pn-mpfr = "Nov 15, 2011" RECIPE_MAINTAINER_pn-mpfr = "Nitin A Kamble <[email protected]>"
@@ -5992,10 +6000,6 @@ RECIPE_LAST_UPDATE_pn-mailx = "Jul 1, 2011" RECIPE_MANUAL_CHECK_DATE_pn-mailx = "Jul 28, 2011" RECIPE_MAINTAINER_pn-mailx = "Kai Kang <[email protected]>" -RECIPE_LATEST_VERSION_pn-libgcc = "4.5.1" -DISTRO_PN_ALIAS_pn-libgcc = "Debian=libgcc4 Ubuntu=libgcc1 OpenSuSE=libgcc45" -RECIPE_MANUAL_CHECK_DATE_pn-libgcc = "Feb 28, 2011" - RECIPE_STATUS_pn-transfig = "green" RECIPE_DEPENDENCY_CHECK_pn-transfig = "not done" RECIPE_LATEST_VERSION_pn-transfig = "3.2.5d"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 13/62] btrfs-tools: upgrade to newer git commit
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
--- .../btrfs-tools/btrfs-tools_git.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +2 -2
@@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067" SECTION = "base" DEPENDS = "util-linux attr" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git;tag=13eced9a0c2b6bd6bc38e6f0f46a1977b1167e67;branch=master" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git;tag=fdb6c0402337d9607c7a39155088eaf033742752;branch=master" S = "${WORKDIR}/git" -PR = "r5" +PR = "r6" SRC_URI += " file://fix_use_of_gcc.patch \ file://weak-defaults.patch \
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 17/62] hdparm: upgrade to 9.37
In reply to Saul WoldFrom: Shane Wang <[email protected]>
The patch was imported from the OpenEmbedded server (http://git.openembedded.org/openembedded/tree/recipes/hdparm) as of commit id 4d2cb79dcecd056742f411a328f9f1f1113bf689.
And changes include:
- upgrade to the latest version 9.37 from 9.35.
- added license checksum.
- the license for wiper which is in hdparm is GPLv2.
--- .../recipes-extended/hdparm/hdparm-6.3/bswap.patch | 37 -------------------- .../hdparm/hdparm-6.3/uclibc.patch | 34 ------------------ meta/recipes-extended/hdparm/hdparm_6.3.bb | 18 --------- meta/recipes-extended/hdparm/hdparm_9.37.bb | 36 +++++++++++++++++++ 4 files changed, 36 insertions(+), 89 deletions(-) delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch delete mode 100644 meta/recipes-extended/hdparm/hdparm_6.3.bb create mode 100644 meta/recipes-extended/hdparm/hdparm_9.37.bb
meta/recipes-extended/hdparm/hdparm-6.3/bswap.patch deleted +0 -37
@@ -1,37 +0,0 @@ -Upstream-Status: Backport - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- hdparm-5.8/hdparm.c~bswap -+++ hdparm-5.8/hdparm.c -@@ -20,7 +20,9 @@ - #include <linux/types.h> - #include <linux/hdreg.h> - #include <linux/major.h> --#include <asm/byteorder.h> -+#include <byteswap.h> -+ -+#define le16_to_cpus(x) bswap_16(htons(x)) - - #include "hdparm.h" - -@@ -1160,7 +1162,7 @@ - } - } else { - for(i = 0; i < 0x100; ++i) { -- __le16_to_cpus(&id[i]); -+ le16_to_cpus(&id[i]); - } - identify((void *)id, NULL); - } -@@ -1380,7 +1382,7 @@ - } - for (i = 0; count >= 4; ++i) { - sbuf[i] = (fromhex(b[0]) << 12) | (fromhex(b[1]) << 8) | (fromhex(b[2]) << 4) | fromhex(b[3]); -- __le16_to_cpus((__u16 *)(&sbuf[i])); -+ le16_to_cpus((__u16 *)(&sbuf[i])); - b += 5; - count -= 5; - }
meta/recipes-extended/hdparm/hdparm-6.3/uclibc.patch deleted +0 -34
@@ -1,34 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - ---- hdparm-5.8/hdparm.c.ark 2005-05-22 19:48:34.000000000 +0000 -+++ hdparm-5.8/hdparm.c 2005-05-22 19:52:18.000000000 +0000 -@@ -17,7 +17,9 @@ - #include <sys/times.h> - #include <sys/types.h> - #include <sys/mount.h> -+#ifndef __UCLIBC__ - #include <linux/types.h> -+#endif - #include <linux/hdreg.h> - #include <linux/major.h> - #include <byteswap.h> ---- hdparm-5.8/hdparm.h.ark 2005-05-22 19:51:49.000000000 +0000 -+++ hdparm-5.8/hdparm.h 2005-05-22 19:54:54.000000000 +0000 -@@ -1,6 +1,6 @@ - /* Some prototypes for extern functions. */ - --#include <linux/types.h> /* for __u16 */ -+#include <stdint.h> - - #if !defined(__GNUC__) && !defined(__attribute__) - #define __attribute__(x) /* if not using GCC, turn off the __attribute__ -@@ -11,7 +11,7 @@ - others, though, were declared in hdparm.c with global scope; since other - functions in that file have static (file) scope, I assume the difference is - intentional. */ --extern void identify (__u16 *id_supplied, const char *devname); -+extern void identify (uint16_t *id_supplied, const char *devname); - - extern void usage_error(int out) __attribute__((noreturn)); - extern int main(int argc, char **argv) __attribute__((noreturn)); -
meta/recipes-extended/hdparm/hdparm_6.3.bb deleted +0 -18
@@ -1,18 +0,0 @@ -SUMMARY = "Utility for displaying and setting hard disk parameters" -DESCRIPTION = "hdparm is a system utility for viewing \ -and manipulating various IDE drive and driver parameters." -SECTION = "console/utils" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24" - -SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz \ - file://bswap.patch \ - file://uclibc.patch" - -SRC_URI[md5sum] = "0c12672f3a09c14ad0b0882f15fc9389" -SRC_URI[sha256sum] = "08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d" - -do_install () { - install -d ${D}/${sbindir} ${D}/${mandir}/man8 - oe_runmake 'DESTDIR=${D}' install -}
meta/recipes-extended/hdparm/hdparm_9.37.bb new file +36 -0
@@ -0,0 +1,36 @@ +DESCRIPTION = "hdparm is a Linux shell utility for viewing \ +and manipulating various IDE drive and driver parameters." +SECTION = "console/utils" +PRIORITY = "optional" +LICENSE = "BSD" +LICENSE_wiper = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=910a8a42c962d238619c75fdb78bdb24 \ + file://debian/copyright;md5=a82d7ba3ade9e8ec902749db98c592f3 \ + file://wiper/GPLv2.txt;md5=fcb02dc552a041dee27e4b85c7396067 \ + file://wiper/wiper.sh;beginline=7;endline=31;md5=b7bc642addc152ea307505bf1a296f09" + +PACKAGES += "wiper" + +FILES_wiper = "${bindir}/wiper.sh" +FILES_${PN} = "${base_sbindir} ${mandir}" + +RDEPENDS_wiper = "bash gawk stat" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/hdparm-${PV}.tar.gz " +SRC_URI[md5sum] = "0bb94ddd1bedd5c02b1ca62f1caaf6de" +SRC_URI[sha256sum] = "87ede0a7cb5b4de500748232e9d251b75acfccce078e1d42c8d125b9e5b4ccd3" + +do_install () { + install -d ${D}/${base_sbindir} ${D}/${mandir}/man8 ${D}/${bindir} + oe_runmake 'DESTDIR=${D}' 'sbindir=${base_sbindir}' install + mv ${D}${base_sbindir}/hdparm ${D}${base_sbindir}/hdparm.${PN} + cp ${S}/wiper/wiper.sh ${D}/${bindir} +} + +pkg_postinst_${PN} () { + update-alternatives --install ${base_sbindir}/hdparm hdparm hdparm.${PN} 100 +} + +pkg_prerm_${PN} () { + update-alternatives --remove hdparm hdparm.${PN} +}
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 18/62] qemuppc: replace emulation of qemuppc from prep to mac99
In reply to Saul WoldFrom: Liming Wang <[email protected]>
With this new emulation, existing qemuppc functionality is maintained and other functionality such as framebuffer + sato and NFS boot are added.
--- meta/conf/machine/qemuppc.conf | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +- scripts/runqemu | 7 +------ scripts/runqemu-internal | 16 ++++++++-------- 5 files changed, 12 insertions(+), 17 deletions(-)
meta/conf/machine/qemuppc.conf +1 -1
@@ -5,7 +5,7 @@ require conf/machine/include/qemu.inc require conf/machine/include/tune-ppc603e.inc -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "vmlinux" SERIAL_CONSOLE = "115200 ttyS0"
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt" SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2" SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b" -SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r1" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476" SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e" SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b" SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf" -SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r2" PV = "${LINUX_VERSION}+git${SRCPV}"
scripts/runqemu +1 -6
@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3 QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin QEMUMIPS_DEFAULT_FSTYPE=ext3 -QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin +QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin QEMUPPC_DEFAULT_FSTYPE=ext3 AKITA_DEFAULT_KERNEL=zImage-akita.bin
@@ -365,11 +365,6 @@ if [ -z "$FSTYPE" ]; then fi fi -if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then - echo "Error: usermode NFS boot is not available for qemuppc." - exit 1 -fi - # FSTYPE is now set for all cases # Handle cases where a ROOTFS type is given instead of a filename, e.g.
scripts/runqemu-internal +8 -8
@@ -389,13 +389,13 @@ fi if [ "$MACHINE" = "qemuppc" ]; then QEMU=qemu-system-ppc - MACHINE_SUBTYPE=prep - CPU_SUBTYPE=603e - BIOS=powerpc_rom.bin - QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic" + MACHINE_SUBTYPE=mac99 + CPU_SUBTYPE=G4 + QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" + QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD" if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then - KERNCMDLINE="root=/dev/hda rw console=ttyS0 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" - QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" + KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" + QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "nfs" ]; then if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
@@ -403,8 +403,8 @@ if [ "$MACHINE" = "qemuppc" ]; then cleanup return fi - KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" - QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS" + KERNCMDLINE="root=/dev/nfs console=ttyS0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" + QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS" fi fi
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 16/62] stat: add recipe stat with version 3.3
In reply to Saul WoldFrom: Shane Wang <[email protected]>
stat is brought into Yocto because the latest version hdparm 9.37 depends on it, and add license checksum.
The recipe was imported from the OpenEmbedded server
(http://git.openembedded.org/openembedded/tree/recipes/stat) as of commit ids 709c4d66e0b107ca606941b988bad717c0b45d9b, 44985d56bc556786812a0a02d6219afd31a7381d, b3246d96069fd11caee42ec6ebcbf6dca2d62449.
--- meta/recipes-extended/stat/stat_3.3.bb | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-extended/stat/stat_3.3.bb
meta/recipes-extended/stat/stat_3.3.bb new file +26 -0
@@ -0,0 +1,26 @@ +SECTION = "console/utils" +DESCRIPTION = "Display all information about a file that the stat() call provides and all information a filesystem that statfs() provides." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39886b077fd072e876e5c4c16310b631 \ + file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f" + +BBCLASSEXTEND = "native" + +PR = "r0" + +SRC_URI = "ftp://metalab.unc.edu/pub/Linux/utils/file/stat-3.3.tar.gz" +SRC_URI[md5sum] = "37e247e8e400ad9205f1b0500b728fd3" +SRC_URI[sha256sum] = "7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09" + +do_install() { + install -d ${D}${bindir} ${D}${mandir}/man1 + install -m 755 stat ${D}${bindir} + install -m 644 stat.1 ${D}${mandir}/man1 +} + +#do_install_virtclass-native() { +# install -d ${D}${bindir} +# install -m 755 stat ${D}${bindir} +#} + +NATIVE_INSTALL_WORKS = "1"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 15/62] distro-tracking: Update info for webkit-gtk, web-webkit
In reply to Saul WoldFrom: Zhai Edwin <[email protected]>
--- .../conf/distro/include/distro_tracking_fields.inc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +4 -3
@@ -5250,8 +5250,8 @@ RECIPE_MAINTAINER_pn-gnome-common = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-webkit-gtk = "green" DISTRO_PN_ALIAS_pn-webkit-gtk = "Fedora=webkitgtk" RECIPE_DEPENDENCY_CHECK_pn-webkit-gtk = "not done" -RECIPE_LATEST_VERSION_pn-webkit-gtk = "1.6.1+svnr101367" -RECIPE_MANUAL_CHECK_DATE_pn-webkit-gtk = "Dec 2, 2011" +RECIPE_LATEST_VERSION_pn-webkit-gtk = "1.6.1+svnr104660" +RECIPE_MANUAL_CHECK_DATE_pn-webkit-gtk = "Jan 11, 2012" RECIPE_NO_OF_PATCHES_pn-webkit-gtk = "1" RECIPE_INTEL_SECTION_pn-webkit-gtk = "graphic UX" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-webkit-gtk = "1 month"
@@ -5450,7 +5450,8 @@ RECIPE_MAINTAINER_pn-libgnome-keyring = "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-web-webkit = "green" RECIPE_DEPENDENCY_CHECK_pn-web-webkit = "not done" -RECIPE_LATEST_VERSION_pn-web-webkit = "0.0+svnr110" +RECIPE_LATEST_VERSION_pn-web-webkit = "0.1+git0+0f7019acd9db5383c732d0524c7c3a5eaec9be2b" +RECIPE_MANUAL_CHECK_DATE_pn-web-webkit = "Jan 11, 2012" RECIPE_NO_OF_PATCHES_pn-web-webkit = "1" RECIPE_INTEL_SECTION_pn-web-webkit = "graphic UX" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-web-webkit = "n/a"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 19/62] qemuppc: add pointercal file
In reply to Saul WoldFrom: Liming Wang <[email protected]>
This file is for tslib.
--- .../pointercal/files/qemuppc/pointercal | Bin 0 -> 36 bytes 1 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-bsp/pointercal/files/qemuppc/pointercal
meta/recipes-bsp/pointercal/files/qemuppc/pointercal new file binary +0 -0
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 20/62] qemuppc: add machconfig
In reply to Saul WoldFrom: Liming Wang <[email protected]>
--- .../formfactor/files/qemuppc/machconfig | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) create mode 100755 meta/recipes-bsp/formfactor/files/qemuppc/machconfig
meta/recipes-bsp/formfactor/files/qemuppc/machconfig new file +10 -0
@@ -0,0 +1,10 @@ +HAVE_TOUCHSCREEN=1 +HAVE_KEYBOARD=1 + +DISPLAY_CAN_ROTATE=0 +DISPLAY_ORIENTATION=0 +DISPLAY_WIDTH_PIXELS=800 +DISPLAY_HEIGHT_PIXELS=600 +DISPLAY_BPP=16 +DISPLAY_DPI=150 +DISPLAY_SUBPIXEL_ORDER=vrgb
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 21/62] tslib: enable big endian support for qemuppc
In reply to Saul WoldFrom: Liming Wang <[email protected]>
This enables wacom tablet/touchscreen support on qemuppc.
--- meta/recipes-graphics/tslib/tslib_1.0.bb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-graphics/tslib/tslib_1.0.bb +1 -0
@@ -22,6 +22,7 @@ SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e" SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8" SRC_URI_append_qemumips += " file://32bitBE-support.patch" +SRC_URI_append_qemuppc += " file://32bitBE-support.patch" inherit autotools pkgconfig
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 22/62] linux-yocto: consolidated fix SRCREV updates
In reply to Saul WoldFrom: Bruce Ashfield <[email protected]>
Updating the SRCREVs to include the following fixes from Khem Raj and Zumeng Chen.
6f5b118 compiler.h: Undef before redefining __attribute_const__ fe80c1e oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue
--- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +2 -2
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32" LINUX_VERSION ?= "3.0.14" LINUX_KERNEL_TYPE = "preempt-rt" -SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2" -SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b" +SRCREV_machine ?= "f1cc220f4ddf434bf254707c83a45794a63f117f" +SRCREV_machine_qemuppc ?= "8bd5b80cb3243dadc9d6c5c09482c49994dff1a8" SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r1"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +7 -6
@@ -12,12 +12,13 @@ KBRANCH = ${KMACHINE} LINUX_VERSION ?= "3.0.14" -SRCREV_machine_qemuarm ?= "c498cc6e4b56784b3c2c547cb9a7af435b9412c1" -SRCREV_machine_qemumips ?= "791c3f4124a238a798e2360340800f4989fad695" -SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476" -SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e" -SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b" -SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf" + +SRCREV_machine_qemuarm ?= "c0386e4195c685b0ff94b7e21581ec47008ab13b" +SRCREV_machine_qemumips ?= "56e4361a1bfc10042d83a7d8a5f96932056e3f35" +SRCREV_machine_qemuppc ?= "53e71af30e30162e17e32b2f57e4481f5bc0573e" +SRCREV_machine_qemux86 ?= "9e73573b6b227ab2c62e66e63470866d136f8d76" +SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a" +SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e" SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r2"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 23/62] copyleft_compliance: add control of recipe types to include
In reply to Saul WoldFrom: Christopher Larson <[email protected]>
In this context, recipe "type" refers to whether it is 'target', 'native', 'cross', etc. COPYLEFT_RECIPE_TYPES is a space separated list of types to include. It defaults to 'target'.
--- meta/classes/copyleft_compliance.bbclass | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-)
meta/classes/copyleft_compliance.bbclass +18 -3
@@ -16,6 +16,22 @@ COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary' COPYLEFT_LICENSE_EXCLUDE[type] = 'list' COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which exclude licenses' +COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}' +COPYLEFT_RECIPE_TYPE[doc] = 'The "type" of the current recipe (e.g. target, native, cross)' + +COPYLEFT_RECIPE_TYPES ?= 'target' +COPYLEFT_RECIPE_TYPES[type] = 'list' +COPYLEFT_RECIPE_TYPES[doc] = 'Space separated list of recipe types to include' + +COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross-canadian' +COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list' +COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types' + +def copyleft_recipe_type(d): + for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d): + if oe.utils.inherits(d, recipe_type): + return recipe_type + return 'target' def copyleft_should_include(d): """Determine if this recipe's sources should be deployed for compliance"""
@@ -23,9 +39,8 @@ def copyleft_should_include(d): import oe.license from fnmatch import fnmatchcase as fnmatch - if oe.utils.inherits(d, 'native', 'nativesdk', 'cross', 'crossdk'): - # not a target recipe - return + if d.getVar('COPYLEFT_RECIPE_TYPE', True) not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): + return False include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d)
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 24/62] copyleft_compliance: add debug message with the reason for exclusion
In reply to Saul WoldFrom: Christopher Larson <[email protected]>
--- meta/classes/copyleft_compliance.bbclass | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-)
meta/classes/copyleft_compliance.bbclass +17 -7
@@ -39,8 +39,9 @@ def copyleft_should_include(d): import oe.license from fnmatch import fnmatchcase as fnmatch - if d.getVar('COPYLEFT_RECIPE_TYPE', True) not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): - return False + recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True) + if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): + return False, 'recipe type "%s" is excluded' % recipe_type include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d)
@@ -63,18 +64,27 @@ def copyleft_should_include(d): licenses = oe.license.flattened_licenses(d.getVar('LICENSE', True), choose_licenses) except oe.license.InvalidLicense as exc: bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) - except SyntaxError: - bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF', True))) - - return all(include_license(lic) for lic in licenses) + except SyntaxError as exc: + bb.warn('%s: error when parsing the LICENSE variable: %s' % (d.getVar('P', True), exc)) + else: + excluded = filter(lambda lic: not include_license(lic), licenses) + if excluded: + return False, 'recipe has excluded licenses: %s' % ', '.join(excluded) + else: + return True, None python do_prepare_copyleft_sources () { """Populate a tree of the recipe sources and emit patch series files""" import os.path import shutil - if not copyleft_should_include(d): + p = d.getVar('P', True) + included, reason = copyleft_should_include(d) + if not included: + bb.debug(1, 'copyleft: %s is excluded: %s' % (p, reason)) return + else: + bb.debug(1, 'copyleft: %s is included' % p) sources_dir = d.getVar('COPYLEFT_SOURCES_DIR', 1) src_uri = d.getVar('SRC_URI', 1).split()
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 25/62] oe.license: add is_included convenience function
In reply to Saul WoldFrom: Christopher Larson <[email protected]>
Given a license string and whitelist and blacklist, determine if the license string matches the whitelist and does not match the blacklist.
When encountering an OR, it prefers the side with the highest weight (more included licenses). It then checks the inclusion of the flattened list of licenses from there.
Returns a tuple holding the boolean state and a list of the applicable licenses which were excluded (or None, if the state is True)
Examples:
is_included, excluded = oe.license.is_included(licensestr, ['GPL*', 'LGPL*']) is_included, excluded = oe.license.is_included(licensestr, blacklist=['Proprietary', 'CLOSED'])
--- meta/classes/copyleft_compliance.bbclass | 23 +++--------------- meta/lib/oe/license.py | 36 ++++++++++++++++++++++++++++++ meta/lib/test.py | 3 ++ 3 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 meta/lib/test.py
meta/classes/copyleft_compliance.bbclass +4 -19
@@ -46,32 +46,17 @@ def copyleft_should_include(d): include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) - def include_license(license): - if any(fnmatch(license, pattern) for pattern in exclude): - return False - if any(fnmatch(license, pattern) for pattern in include): - return True - return False - - def choose_licenses(a, b): - """Select the left option in an OR if all its licenses are to be included""" - if all(include_license(lic) for lic in a): - return a - else: - return b - try: - licenses = oe.license.flattened_licenses(d.getVar('LICENSE', True), choose_licenses) + is_included, excluded = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) except oe.license.InvalidLicense as exc: bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) except SyntaxError as exc: bb.warn('%s: error when parsing the LICENSE variable: %s' % (d.getVar('P', True), exc)) else: - excluded = filter(lambda lic: not include_license(lic), licenses) - if excluded: - return False, 'recipe has excluded licenses: %s' % ', '.join(excluded) - else: + if is_included: return True, None + else: + return False, 'recipe has excluded licenses: %s' % ', '.join(excluded) python do_prepare_copyleft_sources () { """Populate a tree of the recipe sources and emit patch series files"""
meta/lib/oe/license.py +36 -0
@@ -3,6 +3,7 @@ import ast import re +from fnmatch import fnmatchcase as fnmatch class InvalidLicense(StandardError): def __init__(self, license):
@@ -60,3 +61,38 @@ def flattened_licenses(licensestr, choose_licenses): flatten = FlattenVisitor(choose_licenses) flatten.visit_string(licensestr) return flatten.licenses + +def is_included(licensestr, whitelist=None, blacklist=None): + """Given a license string and whitelist and blacklist, determine if the + license string matches the whitelist and does not match the blacklist. + + Returns a tuple holding the boolean state and a list of the applicable + licenses which were excluded (or None, if the state is True) + """ + + def include_license(license): + return (any(fnmatch(license, pattern) for pattern in whitelist) and not + any(fnmatch(license, pattern) for pattern in blacklist)) + + def choose_licenses(alpha, beta): + """Select the option in an OR which is the 'best' (has the most + included licenses).""" + alpha_weight = len(filter(include_license, alpha)) + beta_weight = len(filter(include_license, beta)) + if alpha_weight > beta_weight: + return alpha + else: + return beta + + if not whitelist: + whitelist = ['*'] + + if not blacklist: + blacklist = [] + + licenses = flattened_licenses(licensestr, choose_licenses) + excluded = filter(lambda lic: not include_license(lic), licenses) + if excluded: + return False, excluded + else: + return True, None
meta/lib/test.py new file +3 -0
@@ -0,0 +1,3 @@ +import oe.license + +print(oe.license.is_included('LGPLv2.1 | GPLv3', ['*'], []))
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 27/62] bootimg: Account for FAT filesystem overhead in image size
In reply to Saul WoldFrom: Darren Hart <[email protected]>
Fixes [YOCTO #1852]
The bootimg class wasn't accounting for non-trivial amount of space required by the directory entries and FATs for the FAT filesystem.
This patch attempts to make an accurate prediction of FAT overhead and adjusts the image size accordingly. It assumes no more than 16 directory entries per directory (which fit in a single sector). It also assumes 8.3 filenames. With the ceiling functions rounding up to full sectors and tracks, these assumptions seem reasonable.
In order to ensure the calculations are accurate, this patch forces the FAT size to 32, rather than allowing mkdosfs to automatically select 12, 16, or 32 depending on the image being built.
Tested by setting BOOTIMG_EXTRA_SPACE=0 and building core-image-minimal and core-image-sato for fri2-noemgd from meta-intel.
--- meta/classes/bootimg.bbclass | 45 +++++++++++++++++++++++++++++++++-------- 1 files changed, 36 insertions(+), 9 deletions(-)
meta/classes/bootimg.bbclass +36 -9
@@ -103,19 +103,46 @@ build_hddimg() { grubefi_hddimg_populate fi - # Determine the 1024 byte block count for the final image. - BLOCKS=`du --apparent-size -ks ${HDDDIR} | cut -f 1` - SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}` + # Calculate the size required for the final image including the + # data and filesystem overhead. + # Sectors: 512 bytes + # Blocks: 1024 bytes + + # Determine the sector count just for the data + SECTORS=$(expr $(du --apparent-size -ks ${HDDDIR} | cut -f 1) \* 2) + + # Account for the filesystem overhead. This includes directory + # entries in the clusters as well as the FAT itself. + # Assumptions: + # < 16 entries per directory + # 8.3 filenames only + + # 32 bytes per dir entry + DIR_BYTES=$(expr $(find ${HDDDIR} | tail -n +2 | wc -l) \* 32) + # 32 bytes for every end-of-directory dir entry + DIR_BYTES=$(expr $DIR_BYTES + $(expr $(find ${HDDDIR} -type d | tail -n +2 | wc -l) \* 32)) + # 4 bytes per FAT entry per sector of data + FAT_BYTES=$(expr $SECTORS \* 4) + # 4 bytes per FAT entry per end-of-cluster list + FAT_BYTES=$(expr $FAT_BYTES + $(expr $(find ${HDDDIR} -type d | tail -n +2 | wc -l) \* 4)) + + # Use a ceiling function to determine FS overhead in sectors + DIR_SECTORS=$(expr $(expr $DIR_BYTES + 511) / 512) + # There are two FATs on the image + FAT_SECTORS=$(expr $(expr $(expr $FAT_BYTES + 511) / 512) \* 2) + SECTORS=$(expr $SECTORS + $(expr $DIR_SECTORS + $FAT_SECTORS)) + + # Determine the final size in blocks accounting for some padding + BLOCKS=$(expr $(expr $SECTORS \* 2) + ${BOOTIMG_EXTRA_SPACE}) # Ensure total sectors is an integral number of sectors per - # track or mcopy will complain. Sectors are 512 bytes, and and - # we generate images with 32 sectors per track. This calculation - # is done in blocks, which are twice the size of sectors, thus - # the 16 instead of 32. - SIZE=$(expr $SIZE + $(expr 16 - $(expr $SIZE % 16))) + # track or mcopy will complain. Sectors are 512 bytes, and we + # generate images with 32 sectors per track. This calculation is + # done in blocks, thus the mod by 16 instead of 32. + BLOCKS=$(expr $BLOCKS + $(expr 16 - $(expr $BLOCKS % 16))) IMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg - mkdosfs -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${IMG} ${SIZE} + mkdosfs -F 32 -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${IMG} ${BLOCKS} # Copy HDDDIR recursively into the image file directly mcopy -i ${IMG} -s ${HDDDIR}/* ::/
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 28/62] alsa-utils: depend on libsamplerate0
In reply to Saul WoldFrom: Denis 'GNUtoo' Carikli <[email protected]>
We need to depend on libsamplerate0 because it's detected automatically
and if we configure without it we get that issue at runtime trying to run the alsaloop program:
No libsamplerate support.
--- .../recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-multimedia/alsa/alsa-utils_1.0.24.2.bb +2 -2
@@ -5,8 +5,8 @@ SECTION = "console/utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ file://alsactl/utils.c;beginline=1;endline=20;md5=fe9526b055e246b5558809a5ae25c0b9" -DEPENDS = "alsa-lib ncurses" -PR = "r3" +DEPENDS = "alsa-lib ncurses libsamplerate0" +PR = "r4" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \ file://ncursesfix.patch \
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 26/62] oe.license: avoid the need to catch SyntaxError
In reply to Saul WoldFrom: Christopher Larson <[email protected]>
--- meta/classes/copyleft_compliance.bbclass | 4 +--- meta/lib/oe/license.py | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-)
meta/classes/copyleft_compliance.bbclass +1 -3
@@ -48,10 +48,8 @@ def copyleft_should_include(d): try: is_included, excluded = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) - except oe.license.InvalidLicense as exc: + except oe.license.LicenseError as exc: bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) - except SyntaxError as exc: - bb.warn('%s: error when parsing the LICENSE variable: %s' % (d.getVar('P', True), exc)) else: if is_included: return True, None
meta/lib/oe/license.py +19 -4
@@ -5,13 +5,25 @@ import ast import re from fnmatch import fnmatchcase as fnmatch -class InvalidLicense(StandardError): +class LicenseError(StandardError): + pass + +class LicenseSyntaxError(LicenseError): + def __init__(self, licensestr, exc): + self.licensestr = licensestr + self.exc = exc + LicenseError.__init__(self) + + def __str__(self): + return "error in '%s': %s" % (self.licensestr, self.exc) + +class InvalidLicense(LicenseError): def __init__(self, license): self.license = license - StandardError.__init__(self) + LicenseError.__init__(self) def __str__(self): - return "invalid license '%s'" % self.license + return "invalid characters in license '%s'" % self.license license_operator = re.compile('([&|() ])') license_pattern = re.compile('[a-zA-Z0-9.+_\-]+$')
@@ -59,7 +71,10 @@ class FlattenVisitor(LicenseVisitor): def flattened_licenses(licensestr, choose_licenses): """Given a license string and choose_licenses function, return a flat list of licenses""" flatten = FlattenVisitor(choose_licenses) - flatten.visit_string(licensestr) + try: + flatten.visit_string(licensestr) + except SyntaxError as exc: + raise LicenseSyntaxError(licensestr, exc) return flatten.licenses def is_included(licensestr, whitelist=None, blacklist=None):
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 29/62] xorg-*: disable xmlto where it was failing
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
* meta-oe now provides xmlto-native
http://git.openembedded.org/meta-openembedded/commit/?id=ab8f876ca8fa223c183e3db2029cce88f3435a27
but not the stylesheets for buildhosts without them it's unusable and fails, because xorg macros autodetecting xmlto available, see:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-December/037066.html
after adding xmlto-native and stylesheets-native to DEPENDS we can enable it again
--- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 +- .../xorg-proto/xorg-proto-common.inc | 2 +- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 3 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
@@ -13,4 +13,4 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no" +EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto"
meta/recipes-graphics/xorg-proto/xorg-proto-common.inc +1 -1
@@ -14,7 +14,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" DEPENDS = "util-macros" inherit autotools pkgconfig -EXTRA_OECONF = "--with-fop=no" +EXTRA_OECONF = "--with-fop=no --without-xmlto" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = ""
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -0
@@ -9,4 +9,5 @@ EXTRA_OECONF += "\ --enable-glx-tls \ --with-pic \ --with-int10=x86emu \ + --without-xmlto \ "
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 31/62] runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10
In reply to Saul WoldFrom: Zhai Edwin <[email protected]>
From 11.10, libGL.so is installed @ /usr/lib/x86_64-linux-gnu/ in 64b Ubuntu.
[YOCTO #1885] got fixed
--- scripts/runqemu-internal | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-)
scripts/runqemu-internal +10 -1
@@ -472,8 +472,17 @@ EOM # Automatically use Ubuntu system's mesa libGL, other distro can add its own path if grep -i ubuntu /etc/lsb-release &> /dev/null then + GL_PATH="" + if test -e /usr/lib/libGL.so + then + GL_PATH="/usr/lib/libGL.so" + elif test -e /usr/lib/x86_64-linux-gnu/libGL.so + then + GL_PATH="/usr/lib/x86_64-linux-gnu/libGL.so" + fi + echo "Skip nVidia's libGL on Ubuntu!" - GL_LD_PRELOAD="/usr/lib/libGL.so $LD_PRELOAD" + GL_LD_PRELOAD="$GL_PATH $LD_PRELOAD" fi fi
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 30/62] distro_tracking_fields.inc: Modify the status of eds-tools and mingetty
In reply to Saul WoldFrom: Xiaofeng Yan <[email protected]>
Update the status of eds-tools and mingetty.
mingetty has still not been updated since 2008.
[Fixed Date format]
--- .../conf/distro/include/distro_tracking_fields.inc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +4 -3
@@ -79,7 +79,8 @@ RECIPE_MAINTAINER_pn-meta-ide-support = "Joshua Lock <[email protected]>" RECIPE_STATUS_pn-mingetty = "red" RECIPE_LATEST_VERSION_pn-mingetty = "1.08" -RECIPE_LAST_UPDATE_pn-mingetty = "Sep 1, 2010" +RECIPE_LAST_UPDATE_pn-mingetty = "Jan 1, 2008" +RECIPE_MANUAL_CHECK_DATE_pn-mingetty = "Jan 12, 2012" RECIPE_MAINTAINER_pn-mingetty = "Xiaofeng.Yan <[email protected]>" RECIPE_STATUS_pn-minicom = "green"
@@ -5752,8 +5753,8 @@ DISTRO_PN_ALIAS_pn-table = "Intel" RECIPE_STATUS_pn-eds-tools = "red" DISTRO_PN_ALIAS_pn-eds-tools = "OpenedHand" RECIPE_LATEST_VERSION_pn-eds-tools = "git" -RECIPE_LAST_UPDATE_pn-eds-tools = "Sep 12, 2007" -RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "Nov 25, 2011" +RECIPE_LAST_UPDATE_pn-eds-tools = "Oct 10, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "Jan 12, 2012" RECIPE_MAINTAINER_pn-eds-tools = "Wenzong Fan <[email protected]>" RECIPE_STATUS_pn-abiword-embedded = "red"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 33/62] image_types.bbclass: Fix generating uncompressed ext2 images
In reply to Saul WoldFrom: Matthew McClintock <[email protected]>
--- meta/classes/image_types.bbclass | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
meta/classes/image_types.bbclass +6 -1
@@ -40,7 +40,12 @@ IMAGE_CMD_sum.jffs2 = "${IMAGE_CMD_jffs2} && sumtool -i ${DEPLOY_DIR_IMAGE}/${IM IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" -IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2" +IMAGE_CMD_ext2 () { + rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} + genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 + mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 + rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} +} IMAGE_CMD_ext2.gz () { rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 32/62] dbus-1.4.16: use INC_PR from dbus.inc to fix PR bump after dbus-launch-helper permission change
In reply to Saul WoldFrom: Martin Jansa <[email protected]>
--- meta/recipes-core/dbus/dbus_1.4.16.bb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-core/dbus/dbus_1.4.16.bb +2 -0
@@ -1,5 +1,7 @@ include dbus.inc +PR = "${INC_PR}.0" + SRC_URI[md5sum] = "44a2a10678e7e50460879c3eb4453a65" SRC_URI[sha256sum] = "1d8ee6262f8cc2148f06578eee522c755ba0896206b3464ca9bdc84f411b29c6"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 35/62] package.bbclass: quote pathname given to objdump
In reply to Saul WoldFrom: Enrico Scholz <[email protected]>
Packaging will fail with executable files containing spaces in their names. Patch quotes the parameter passed to 'objdump'.
--- meta/classes/package.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/package.bbclass +2 -2
@@ -1205,7 +1205,7 @@ SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs" SHLIBSWORKDIR = "${WORKDIR}/shlibs" python package_do_shlibs() { - import re + import re, pipes exclude_shlibs = d.getVar('EXCLUDE_FROM_SHLIBS', 0) if exclude_shlibs:
@@ -1234,7 +1234,7 @@ python package_do_shlibs() { lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) def linux_so(root, path, file): - cmd = d.getVar('OBJDUMP', True) + " -p " + os.path.join(root, file) + " 2>/dev/null" + cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null" cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd) fd = os.popen(cmd) lines = fd.readlines()
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 34/62] image_types_uboot.bbclass: Add uncompressed ext2 image option
In reply to Saul WoldFrom: Matthew McClintock <[email protected]>
--- meta/classes/image_types_uboot.bbclass | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
meta/classes/image_types_uboot.bbclass +5 -1
@@ -5,6 +5,10 @@ oe_mkimage () { -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot } +IMAGE_DEPENDS_ext2.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native" +IMAGE_CMD_ext2.u-boot = "${IMAGE_CMD_ext2} \ + oe_mkimage ${IMAGE_NAME}.rootfs.ext2 none" + IMAGE_DEPENDS_ext2.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native" IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz} \ oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz gzip"
@@ -25,4 +29,4 @@ IMAGE_DEPENDS_ext4.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz} \ oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz gzip" -IMAGE_TYPES += "ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot" +IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 37/62] libtool: Put all libltdl headers in the correct libltdl-dev package
In reply to Saul WoldFrom: Colin Walters <[email protected]>
/usr/include/ltdl.h was in libtldl-dev, but not the headers it depends on.
--- meta/recipes-devtools/libtool/libtool-2.4.2.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/libtool/libtool-2.4.2.inc +1 -1
@@ -37,7 +37,7 @@ DEPENDS = "libtool-native" PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" FILES_${PN} += "${datadir}/aclocal*" FILES_libltdl = "${libdir}/libltdl.so.*" -FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" +FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h ${includedir}/libltdl/*.h" FILES_libltdl-dbg = "${libdir}/.debug/" EXTRA_OECONF = "--with-sysroot"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 39/62] libpam: upgrade to 1.1.5
In reply to Saul WoldFrom: Scott Garman <[email protected]>
Updated HOMEPAGE, BUGTRACKER, and SRC_URI fields to reflect new project hosting.
Cleaned up some of the metadata ordering.
---
.../pam/{libpam_1.1.4.bb => libpam_1.1.5.bb} | 27 ++++++++++---------
1 files changed, 14 insertions(+), 13 deletions(-)
rename meta/recipes-extended/pam/{libpam_1.1.4.bb => libpam_1.1.5.bb} (85%)meta/recipes-extended/pam/libpam_1.1.5.bb renamed from meta/recipes-extended/pam/libpam_1.1.4.bb +14 -13
@@ -1,7 +1,7 @@ SUMMARY = "Linux-PAM (Pluggable Authentication Modules)" -DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), Basically, it is a flexible mechanism for authenticating users" -HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/" -BUGTRACKER = "http://sourceforge.net/projects/pam/support" +DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), a flexible mechanism for authenticating users" +HOMEPAGE = "https://fedorahosted.org/linux-pam/" +BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" SECTION = "base" # PAM is dual licensed under GPL and BSD. # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time
@@ -9,28 +9,25 @@ SECTION = "base" LICENSE = "GPLv2+ | BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083" -PR = "r2" +PR = "r0" -DEPENDS = "bison flex flex-native cracklib" -RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" -RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory \ - pam-plugin-succeed-if pam-plugin-time coreutils" -RRECOMMENDS_${PN} = "libpam-runtime" - -SRC_URI = "${KERNELORG_MIRROR}/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \ +SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \ file://99_pam \ file://pam.d/* \ file://libpam-xtests.patch" SRC_URI_append_libc-uclibc = " file://pam-no-innetgr.patch" -SRC_URI[md5sum] = "e9af5fb27bb22edb55d077e2888b3ebc" -SRC_URI[sha256sum] = "ccd89331914390b1e9e99c954471d65f19b660d81e15a46eeb96cee125d44056" +SRC_URI[md5sum] = "927ee5585bdec5256c75117e9348aa47" +SRC_URI[sha256sum] = "65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116" + +DEPENDS = "bison flex flex-native cracklib" EXTRA_OECONF = "--with-db-uniquename=_pam \ --includedir=${includedir}/security \ --libdir=${base_libdir} \ --disable-regenerate-docu" + CFLAGS_append = " -fPIC " S = "${WORKDIR}/Linux-PAM-${PV}"
@@ -49,6 +46,10 @@ FILES_${PN}-xtests = "${datadir}/Linux-PAM/xtests" PACKAGES_DYNAMIC += " pam-plugin-*" +RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" +RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cracklib pam-plugin-pwhistory pam-plugin-succeed-if pam-plugin-time coreutils" +RRECOMMENDS_${PN} = "libpam-runtime" + python populate_packages_prepend () { import os.path
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 38/62] bitbake.conf: search /lib for -native builds
In reply to Saul WoldFrom: Enrico Scholz <[email protected]>
Changes to BUILD_LDFLAGS are required due to the recent movement of some libraries from ${libdir} to ${base_libdir}. ${base_libdir} must be now in the linker search path to avoid build problems of -native packages.
--- meta/conf/bitbake.conf | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
meta/conf/bitbake.conf +7 -1
@@ -49,6 +49,7 @@ bindir_native = "${prefix_native}/bin" sbindir_native = "${prefix_native}/sbin" includedir_native = "${prefix_native}/include" libdir_native = "${prefix_native}/lib" +base_libdir_native = "/lib" datadir_native = "${prefix_native}/share" bindir_cross = "/bin" bindir_crossscripts = "${bindir}/crossscripts"
@@ -330,6 +331,7 @@ STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" +STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}" STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
@@ -462,8 +464,12 @@ export CXXFLAGS = "${TARGET_CXXFLAGS}" export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive" export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ + -L${STAGING_BASE_LIBDIR_NATIVE} \ -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ - -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" + -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} \ + -Wl,-rpath,${STAGING_LIBDIR_NATIVE} \ + -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE} \ + -Wl,-O1" BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \ -Wl,-rpath-link,${STAGING_LIBDIR} \
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 40/62] e2fsprogs: upgrade to 1.42
In reply to Saul WoldFrom: Scott Garman <[email protected]>
Refactored quotefix.patch to apply cleanly.
---
.../acinclude.m4 | 0
.../mkdir.patch | 0
.../quotefix.patch | 45 +++++++++----------
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
.../{e2fsprogs_1.41.14.bb => e2fsprogs_1.42.bb} | 7 +--
5 files changed, 25 insertions(+), 29 deletions(-)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.14 => e2fsprogs-1.42}/acinclude.m4 (100%)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.14 => e2fsprogs-1.42}/mkdir.patch (100%)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs-1.41.14 => e2fsprogs-1.42}/quotefix.patch (40%)
rename meta/recipes-devtools/e2fsprogs/{e2fsprogs_1.41.14.bb => e2fsprogs_1.42.bb} (92%)meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/acinclude.m4 renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/acinclude.m4 +0 -0
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/mkdir.patch renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/mkdir.patch +0 -0
meta/recipes-devtools/e2fsprogs/e2fsprogs-1.42/quotefix.patch renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.14/quotefix.patch +21 -24
66 lines not on this page · raw message
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +1 -1
@@ -21,7 +21,7 @@ SECTION = "base" DEPENDS = "util-linux" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://mkdir.patch;apply=yes" + file://mkdir.patch" inherit autotools gettext
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.14.bb +3 -4
@@ -1,13 +1,12 @@ require e2fsprogs.inc -PR = "r4" +PR = "r0" SRC_URI += "file://quotefix.patch \ file://acinclude.m4" -SRC_URI[md5sum] = "05f70470aea2ef7efbb0845b2b116720" -SRC_URI[sha256sum] = "3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176" -#file://no-hardlinks.patch +SRC_URI[md5sum] = "a3c4ffd7352310ab5e9412965d575610" +SRC_URI[sha256sum] = "55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46" PARALLEL_MAKE = ""
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 50/62] classes/packagehistory: remove now obsolete class
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
packagehistory.bbclass has been superseded by buildhistory.bbclass, which gives more detailed output (including information on produced images) as well as other enhanced functionality.
--- meta/classes/packagehistory.bbclass | 249 ----------------------------------- 1 files changed, 0 insertions(+), 249 deletions(-) delete mode 100644 meta/classes/packagehistory.bbclass
meta/classes/packagehistory.bbclass deleted +0 -249
@@ -1,249 +0,0 @@ -# Must inherit package first before changing PACKAGEFUNCS -inherit package -PACKAGEFUNCS += "emit_pkghistory" - -PKGHIST_DIR = "${TMPDIR}/pkghistory/${MULTIMACH_TARGET_SYS}/" - -# -# Called during do_package to write out metadata about this package -# for comparision when writing future packages -# -python emit_pkghistory() { - import re - - pkghistdir = os.path.join(d.getVar('PKGHIST_DIR', True), d.getVar('PN', True)) - - class RecipeInfo: - def __init__(self, name): - self.name = name - self.pe = "0" - self.pv = "0" - self.pr = "r0" - self.depends = "" - self.packages = "" - - class PackageInfo: - def __init__(self, name): - self.name = name - self.pe = "0" - self.pv = "0" - self.pr = "r0" - self.size = 0 - self.depends = "" - self.rdepends = "" - self.rrecommends = "" - self.files = "" - self.filelist = "" - - # Should check PACKAGES here to see if anything removed - - def getpkgvar(pkg, var): - val = d.getVar('%s_%s' % (var, pkg), True) - if val: - return val - val = d.getVar(var, True) - - return val - - def readRecipeInfo(pn, histfile): - rcpinfo = RecipeInfo(pn) - f = open(histfile, "r") - try: - for line in f: - lns = line.split('=') - name = lns[0].strip() - value = lns[1].strip(" \t\r\n").strip('"') - if name == "PE": - rcpinfo.pe = value - elif name == "PV": - rcpinfo.pv = value - elif name == "PR": - rcpinfo.pr = value - elif name == "DEPENDS": - rcpinfo.depends = value - elif name == "PACKAGES": - rcpinfo.packages = value - finally: - f.close() - return rcpinfo - - def readPackageInfo(pkg, histfile): - pkginfo = PackageInfo(pkg) - f = open(histfile, "r") - try: - for line in f: - lns = line.split('=') - name = lns[0].strip() - value = lns[1].strip(" \t\r\n").strip('"') - if name == "PE": - pkginfo.pe = value - elif name == "PV": - pkginfo.pv = value - elif name == "PR": - pkginfo.pr = value - elif name == "RDEPENDS": - pkginfo.rdepends = value - elif name == "RRECOMMENDS": - pkginfo.rrecommends = value - elif name == "PKGSIZE": - pkginfo.size = long(value) - elif name == "FILES": - pkginfo.files = value - elif name == "FILELIST": - pkginfo.filelist = value - finally: - f.close() - return pkginfo - - def getlastrecipeversion(pn): - try: - histfile = os.path.join(pkghistdir, "latest") - return readRecipeInfo(pn, histfile) - except EnvironmentError: - return None - - def getlastpkgversion(pkg): - try: - histfile = os.path.join(pkghistdir, pkg, "latest") - return readPackageInfo(pkg, histfile) - except EnvironmentError: - return None - - def squashspaces(string): - return re.sub("\s+", " ", string) - - pn = d.getVar('PN', True) - pe = d.getVar('PE', True) or "0" - pv = d.getVar('PV', True) - pr = d.getVar('PR', True) - packages = squashspaces(d.getVar('PACKAGES', True)) - - rcpinfo = RecipeInfo(pn) - rcpinfo.pe = pe - rcpinfo.pv = pv - rcpinfo.pr = pr - rcpinfo.depends = squashspaces(d.getVar('DEPENDS', True) or "") - rcpinfo.packages = packages - write_recipehistory(rcpinfo, d) - write_latestlink(None, pe, pv, pr, d) - - # Apparently the version can be different on a per-package basis (see Python) - pkgdest = d.getVar('PKGDEST', True) - for pkg in packages.split(): - pe = getpkgvar(pkg, 'PE') or "0" - pv = getpkgvar(pkg, 'PV') - pr = getpkgvar(pkg, 'PR') - # - # Find out what the last version was - # Make sure the version did not decrease - # - lastversion = getlastpkgversion(pkg) - if lastversion: - last_pe = lastversion.pe - last_pv = lastversion.pv - last_pr = lastversion.pr - r = bb.utils.vercmp((pe, pv, pr), (last_pe, last_pv, last_pr)) - if r < 0: - bb.fatal("Package version for package %s went backwards which would break package feeds from (%s:%s-%s to %s:%s-%s)" % (pkg, last_pe, last_pv, last_pr, pe, pv, pr)) - - pkginfo = PackageInfo(pkg) - pkginfo.pe = pe - pkginfo.pv = pv - pkginfo.pr = pr - pkginfo.rdepends = squashspaces(getpkgvar(pkg, 'RDEPENDS') or "") - pkginfo.rrecommends = squashspaces(getpkgvar(pkg, 'RRECOMMENDS') or "") - pkginfo.files = squashspaces(getpkgvar(pkg, 'FILES') or "") - - # Gather information about packaged files - pkgdestpkg = os.path.join(pkgdest, pkg) - filelist = [] - pkginfo.size = 0 - for root, dirs, files in os.walk(pkgdestpkg): - relpth = os.path.relpath(root, pkgdestpkg) - for f in files: - fstat = os.lstat(os.path.join(root, f)) - pkginfo.size += fstat.st_size - filelist.append(os.sep + os.path.join(relpth, f)) - pkginfo.filelist = " ".join(filelist) - - write_pkghistory(pkginfo, d) - - if lastversion: - check_pkghistory(pkginfo, lastversion) - - write_latestlink(pkg, pe, pv, pr, d) -} - - -def check_pkghistory(pkginfo, lastversion): - - bb.debug(2, "Checking package history") - # RDEPENDS removed? - # PKG changed? - # Each file list of each package for file removals? - - -def write_recipehistory(rcpinfo, d): - bb.debug(2, "Writing recipe history") - - pkghistdir = os.path.join(d.getVar('PKGHIST_DIR', True), d.getVar('PN', True)) - - if not os.path.exists(pkghistdir): - os.makedirs(pkghistdir) - - verfile = os.path.join(pkghistdir, "%s:%s-%s" % (rcpinfo.pe, rcpinfo.pv, rcpinfo.pr)) - f = open(verfile, "w") - try: - if rcpinfo.pe != "0": - f.write("PE = %s\n" % rcpinfo.pe) - f.write("PV = %s\n" % rcpinfo.pv) - f.write("PR = %s\n" % rcpinfo.pr) - f.write("DEPENDS = %s\n" % rcpinfo.depends) - f.write("PACKAGES = %s\n" % rcpinfo.packages) - finally: - f.close() - - -def write_pkghistory(pkginfo, d): - bb.debug(2, "Writing package history") - - pkghistdir = os.path.join(d.getVar('PKGHIST_DIR', True), d.getVar('PN', True)) - - verpath = os.path.join(pkghistdir, pkginfo.name) - if not os.path.exists(verpath): - os.makedirs(verpath) - - verfile = os.path.join(verpath, "%s:%s-%s" % (pkginfo.pe, pkginfo.pv, pkginfo.pr)) - f = open(verfile, "w") - try: - if pkginfo.pe != "0": - f.write("PE = %s\n" % pkginfo.pe) - f.write("PV = %s\n" % pkginfo.pv) - f.write("PR = %s\n" % pkginfo.pr) - f.write("RDEPENDS = %s\n" % pkginfo.rdepends) - f.write("RRECOMMENDS = %s\n" % pkginfo.rrecommends) - f.write("PKGSIZE = %d\n" % pkginfo.size) - f.write("FILES = %s\n" % pkginfo.files) - f.write("FILELIST = %s\n" % pkginfo.filelist) - finally: - f.close() - - -def write_latestlink(pkg, pe, pv, pr, d): - import shutil - - pkghistdir = os.path.join(d.getVar('PKGHIST_DIR', True), d.getVar('PN', True)) - - def rm_link(path): - try: - os.unlink(path) - except OSError: - return - - if pkg: - filedir = os.path.join(pkghistdir, pkg) - else: - filedir = pkghistdir - rm_link(os.path.join(filedir, "latest")) - shutil.copy(os.path.join(filedir, "%s:%s-%s" % (pe, pv, pr)), os.path.join(filedir, "latest")) -
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 41/62] distro_tracking: recipe upgrades and manual check info
In reply to Saul WoldFrom: Scott Garman <[email protected]>
Updated info for the following recipes:
e2fsprogs
expat
chrpath
libevent
libpam
--- .../conf/distro/include/distro_tracking_fields.inc | 40 +++++++++++--------- 1 files changed, 22 insertions(+), 18 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +22 -18
@@ -184,12 +184,13 @@ RECIPE_MAINTAINER_pn-glib-2.0 = "Dongxiao Xu <[email protected]>" RECIPE_STATUS_pn-libpam = "green" DISTRO_PN_ALIAS_pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" RECIPE_DEPENDENCY_CHECK_pn-libpam = "not done" -RECIPE_LATEST_VERSION_pn-libpam = "1.1.3" +RECIPE_LATEST_VERSION_pn-libpam = "1.1.5" RECIPE_INTEL_SECTION_pn-libpam = "base libs" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libpam = "2 months" -RECIPE_LATEST_RELEASE_DATE_pn-libpam = "Oct 28, 2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libpam = "unknown" +RECIPE_LATEST_RELEASE_DATE_pn-libpam = "Oct 25, 2011" RECIPE_COMMENTS_pn-libpam = "" -RECIPE_LAST_UPDATE_pn-libpam = "Nov 23, 2010" +RECIPE_LAST_UPDATE_pn-libpam = "Jan 12, 2012" +RECIPE_MANUAL_CHECK_DATE_pn-libpam = "Jan 12, 2012" RECIPE_MAINTAINER_pn-libpam = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-libgpg-error = "yellow" # specific .pc handle
@@ -221,10 +222,10 @@ RECIPE_LATEST_VERSION_pn-expat = "2.0.1" RECIPE_PATCH_pn-expat+autotools = "added in 2.0.0; 70774a74; 2006; don't include its own version of m4" RECIPE_INTEL_SECTION_pn-expat = "base libs" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-expat = "17 months" -RECIPE_LATEST_RELEASE_DATE_pn-expat = "Jun 01, 2007" +RECIPE_LATEST_RELEASE_DATE_pn-expat = "Jun 5, 2007" RECIPE_COMMENTS_pn-expat = "" RECIPE_LAST_UPDATE_pn-expat = "Jul 7, 2010" -RECIPE_MANUAL_CHECK_DATE_pn-expat = "Nov 14, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-expat = "Jan 12, 2012" RECIPE_MAINTAINER_pn-expat = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-dbus = "green"
@@ -545,13 +546,12 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcap = "1 month" RECIPE_COMMENTS_pn-libcap = "Not available on kernel.org right now" RECIPE_STATUS_pn-libevent = "green" -RECIPE_LAST_UPDATE_pn-libevent = "Jul 7, 2010" +RECIPE_LAST_UPDATE_pn-libevent = "Jan 3, 2012" RECIPE_MAINTAINER_pn-libevent = "Scott Garman <[email protected]>" -RECIPE_NO_UPDATE_REASON_pn-libevent="libevent 2 is incompatible" -RECIPE_LATEST_VERSION_pn-libevent = "2.0.11" +RECIPE_LATEST_VERSION_pn-libevent = "2.0.16" RECIPE_INTEL_SECTION_pn-libevent = "base libs" -RECIPE_LATEST_RELEASE_DATE_pn-libevent = "Apr 11, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-libevent = "May 24, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-libevent = "Nov 18, 2011" +RECIPE_MANUAL_CHECK_DATE_pn-libevent = "Jan 12, 2012" RECIPE_STATUS_pn-libnfsidmap = "green" RECIPE_LAST_UPDATE_pn-libnfsidmap = "Jan 20, 2011"
@@ -644,16 +644,16 @@ RECIPE_MAINTAINER_pn-dbus-wait= "Zhai Edwin <[email protected]>" RECIPE_STATUS_pn-e2fsprogs = "yellow" # patch comment RECIPE_DEPENDENCY_CHECK_pn-e2fsprogs = "not done" -RECIPE_LATEST_VERSION_pn-e2fsprogs = "1.41.12" +RECIPE_LATEST_VERSION_pn-e2fsprogs = "1.42" RECIPE_PATCH_pn-e2fsprogs+quotefix = "to be pushed upstream" RECIPE_PATCH_pn-e2fsprogs+mkdir = "to be pushed upstream; no comment; MKINSTALLDIRS is not supported in new version autotool" RECIPE_PATCH_pn-e2fsprogs+acinclude = "to be pushed upstream;" RECIPE_INTEL_SECTION_pn-e2fsprogs = "base utils" -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-e2fsprogs = "2 months" -RECIPE_LATEST_RELEASE_DATE_pn-e2fsprogs = "May 01, 2010" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-e2fsprogs = "11 months" +RECIPE_LATEST_RELEASE_DATE_pn-e2fsprogs = "Nov 29, 2011" RECIPE_COMMENTS_pn-e2fsprogs = "" -RECIPE_LAST_UPDATE_pn-e2fsprogs = "Jun 1, 2010" -RECIPE_MANUAL_CHECK_DATE_pn-e2fsprogs = "Nov 14, 2011" +RECIPE_LAST_UPDATE_pn-e2fsprogs = "Jan 12, 2012" +RECIPE_MANUAL_CHECK_DATE_pn-e2fsprogs = "Jan 12, 2012" RECIPE_MAINTAINER_pn-e2fsprogs = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-initramfs-boot = "green"
@@ -1205,8 +1205,12 @@ RECIPE_MANUAL_CHECK_DATE_pn-apt = "Nov 08, 2011" RECIPE_NO_UPDATE_REASON_pn-apt="similar to zypper, defer the upgrading" RECIPE_STATUS_pn-chrpath = "red" -RECIPE_LATEST_VERSION_pn-chrpath = "0.13-2" -RECIPE_LAST_UPDATE_pn-chrpath = "Dec 15, 2009" +RECIPE_DEPENDENCY_CHECK_pn-chrpath = "not done" +RECIPE_LATEST_VERSION_pn-chrpath = "0.14" +RECIPE_LATEST_RELEASE_DATE_pn-chrpath = "Sep 27, 2011" +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-chrpath = "unknown" +RECIPE_LAST_UPDATE_pn-chrpath = "Jan 12, 2012" +RECIPE_MANUAL_CHECK_DATE_pn-chrpath = "Jan 12, 2012" RECIPE_MAINTAINER_pn-chrpath = "Scott Garman <[email protected]>" RECIPE_STATUS_pn-dosfstools = "red"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 51/62] m4: refactor .bb and .inc files
In reply to Saul WoldThe orignal had common code in the m4_1.4.16.bb file that was in the m4.inc file. m4-native was then including the m4.bb file and picking up the BBCLASSEXTEND, which causes the fetch to fail.
--- meta/recipes-devtools/m4/m4-native_1.4.16.bb | 3 ++- meta/recipes-devtools/m4/m4.inc | 19 +++++++++++++++++++ meta/recipes-devtools/m4/m4_1.4.16.bb | 19 +------------------ 3 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 meta/recipes-devtools/m4/m4.inc
meta/recipes-devtools/m4/m4-native_1.4.16.bb +2 -1
@@ -1,4 +1,5 @@ -require m4_${PV}.bb +require m4.inc + inherit native INHIBIT_AUTOTOOLS_DEPS = "1"
meta/recipes-devtools/m4/m4.inc new file +19 -0
@@ -0,0 +1,19 @@ +SUMMARY = "Traditional Unix macro processor" +DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \ +compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \ +GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc." +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ + file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" + +PR = "r2" +SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ + file://ac_config_links.patch" + +SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280" +SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da" + +inherit autotools + +EXTRA_OEMAKE += "'infodir=${infodir}'" +
meta/recipes-devtools/m4/m4_1.4.16.bb +1 -18
@@ -1,20 +1,3 @@ -SUMMARY = "Traditional Unix macro processor" -DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro processor. It is mostly SVR4 \ -compatible although it has some extensions (for example, handling more than 9 positional parameters to macros). \ -GNU M4 also has built-in functions for including files, running shell commands, doing arithmetic, etc." -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ - file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" - -PR = "r1" -SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ - file://ac_config_links.patch" - -SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280" -SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da" - -inherit autotools - -EXTRA_OEMAKE += "'infodir=${infodir}'" +require m4.inc BBCLASSEXTEND = "nativesdk"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 43/62] alsa-state: add alsa-state from oe classic
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
alsa-state adds an init script and configuration files to enable a consistent and centralised mechanism for setting and restoring alsa configuration.
--- meta/recipes-bsp/alsa-state/alsa-state.bb | 57 ++++++++++++++++++++ meta/recipes-bsp/alsa-state/alsa-state/alsa-state | 29 ++++++++++ meta/recipes-bsp/alsa-state/alsa-state/asound.conf | 12 ++++ .../recipes-bsp/alsa-state/alsa-state/asound.state | 1 + 4 files changed, 99 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-bsp/alsa-state/alsa-state.bb create mode 100755 meta/recipes-bsp/alsa-state/alsa-state/alsa-state create mode 100644 meta/recipes-bsp/alsa-state/alsa-state/asound.conf create mode 100644 meta/recipes-bsp/alsa-state/alsa-state/asound.state
meta/recipes-bsp/alsa-state/alsa-state.bb new file +57 -0
@@ -0,0 +1,57 @@ +# Copyright Matthias Hentges <[email protected]> (c) 2007 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php +# for a copy of the license) +# +# Filename: alsa-state.bb + +SUMMARY = "Alsa scenario files to enable alsa state restoration." +DESCRIPTION = "Alsa Scenario Files - an init script and state files to restore \ +sound state at system boot and save it at system shut down." +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PV = "0.2.0" +PR = "r0" + +SRC_URI = "\ + file://asound.conf \ + file://asound.state \ + file://alsa-state \ +" + +RDEPENDS = "alsa-utils-alsactl" + +inherit update-rc.d + +INITSCRIPT_NAME = "alsa-state" +INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." + +do_install() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d + + install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir} +} + +PACKAGES += "alsa-states" + +RRECOMMENDS_alsa-state = "alsa-states" + +FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" +CONFFILES_${PN} = "${sysconfdir}/asound.conf" + +FILES_alsa-states = "${sysconfdir}/*.state" + +pkg_postinst_${PN}() { + if test -z "$D" + then + if test -x /usr/sbin/alsactl + then + /usr/sbin/alsactl -f ${sysconfdir}/asound.state restore + fi + # INITSCRIPT_PARAMS changed, so remove the old and + # install the new setting. + update-rc.d -f ${INITSCRIPT_NAME} remove + update-rc.d ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} + fi +}
meta/recipes-bsp/alsa-state/alsa-state/alsa-state new file +29 -0
@@ -0,0 +1,29 @@ +#! /bin/sh +# +# Copyright Matthias Hentges <[email protected]> (c) 2007 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: alsa-state +# Date: 20070308 (YMD) + + +asound_restore(){ + echo "ALSA: Restoring mixer settings..." + if test -x /usr/sbin/alsactl -a -e /etc/asound.state + then + /usr/sbin/alsactl -f /etc/asound.state restore & + fi +} + +asound_store(){ + echo "ALSA: Storing mixer settings..." + if test -x /usr/sbin/alsactl + then + /usr/sbin/alsactl -f /etc/asound.state store + fi +} + +case "$1" in +start) asound_restore ;; +stop) asound_store ;; +esac
meta/recipes-bsp/alsa-state/alsa-state/asound.conf new file +12 -0
@@ -0,0 +1,12 @@ +# default dmix configuration + +pcm.!default { + type plug + slave.pcm "dmix" +} + +ctl.mixer0 { + type hw + card 0 +} +
meta/recipes-bsp/alsa-state/alsa-state/asound.state new file +1 -0
@@ -0,0 +1 @@ +# Dummy file, do not delete
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 42/62] task-base: move default definition of VIRTUAL-RUNTIME_apm
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
This belongs in default-providers.conf
--- meta/conf/distro/include/default-providers.inc | 1 + meta/recipes-core/tasks/task-base.bb | 3 --- 2 files changed, 1 insertions(+), 3 deletions(-)
meta/conf/distro/include/default-providers.inc +1 -0
@@ -15,6 +15,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" # Default virtual runtime providers # VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" +VIRTUAL-RUNTIME_apm ?= "apm" # # Default recipe providers
meta/recipes-core/tasks/task-base.bb +0 -3
@@ -162,9 +162,6 @@ RDEPENDS_task-base-acpi = "\ acpid \ libacpi " -# Distro can override apm provider -VIRTUAL-RUNTIME_apm ?= "apm" - RDEPENDS_task-base-apm = "\ ${VIRTUAL-RUNTIME_apm} \ apmd"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 44/62] alsa-state: move state files to localstatedir
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
alsactl creates the state files in /var/lib/alsa by default so switch alsa-state to use files in that location.
Further, update the alsa-state init script to have the location of the state files sed'ed into the script at do_install time (so as to remove hard coding of directory paths).
--- meta/recipes-bsp/alsa-state/alsa-state.bb | 8 +++++--- meta/recipes-bsp/alsa-state/alsa-state/alsa-state | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-)
meta/recipes-bsp/alsa-state/alsa-state.bb +5 -3
@@ -26,11 +26,13 @@ INITSCRIPT_NAME = "alsa-state" INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ." do_install() { + sed -i -e "s:#STATEDIR#:${localstatedir}/lib/alsa:g" ${WORKDIR}/alsa-state install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d + install -d ${D}/${localstatedir}/lib/alsa install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa } PACKAGES += "alsa-states"
@@ -40,14 +42,14 @@ RRECOMMENDS_alsa-state = "alsa-states" FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" CONFFILES_${PN} = "${sysconfdir}/asound.conf" -FILES_alsa-states = "${sysconfdir}/*.state" +FILES_alsa-states = "${localstatedir}/lib/alsa/*.state" pkg_postinst_${PN}() { if test -z "$D" then if test -x /usr/sbin/alsactl then - /usr/sbin/alsactl -f ${sysconfdir}/asound.state restore + /usr/sbin/alsactl -f ${localstatedir}/lib/alsa/asound.state restore fi # INITSCRIPT_PARAMS changed, so remove the old and # install the new setting.
meta/recipes-bsp/alsa-state/alsa-state/alsa-state +3 -3
@@ -9,9 +9,9 @@ asound_restore(){ echo "ALSA: Restoring mixer settings..." - if test -x /usr/sbin/alsactl -a -e /etc/asound.state + if test -x /usr/sbin/alsactl -a -e #STATEDIR#/asound.state then - /usr/sbin/alsactl -f /etc/asound.state restore & + /usr/sbin/alsactl -f #STATEDIR#/asound.state restore & fi }
@@ -19,7 +19,7 @@ asound_store(){ echo "ALSA: Storing mixer settings..." if test -x /usr/sbin/alsactl then - /usr/sbin/alsactl -f /etc/asound.state store + /usr/sbin/alsactl -f #STATEDIR#/asound.state store fi }
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 53/62] lttng-ust: Update to 2.0
In reply to Saul WoldFrom: Zumeng Chen <[email protected]>
This patch intended to integrate the LTTng UST 2.0 package, which contains the userspace tracer library to trace userspace codes.
--- meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb | 30 ++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb
meta/recipes-kernel/lttng-2.0/lttng-ust_1.9.4.bb new file +30 -0
@@ -0,0 +1,30 @@ +SUMMARY = "Linux Trace Toolkit Userspace Tracer 2.0" +DESCRIPTION = "The LTTng UST 2.0 package contains the userspace tracer library to trace userspace codes." +HOMEPAGE = "http://lttng.org/lttng2.0" +BUGTRACKER = "n/a" + +LICENSE = "LGPLv2.1+ & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=e647752e045a8c45b6f583771bd561ef \ + file://snprintf/snprintf.c;endline=32;md5=d3d544959d8a3782b2e07451be0a903c \ + file://snprintf/various.h;endline=31;md5=89f2509b6b4682c4fc95255eec4abe44" + +inherit autotools + +DEPENDS = "liburcu util-linux" + +SRCREV = "eeee05f35f014a8c068e0d29b18629cafbfdfc1d" +PV = "1.9.4+git${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git" + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ${S}/bootstrap +} + +# Due to liburcu not building for MIPS currently this recipe needs to +# be limited also. +# So here let us first suppport x86/arm/powerpc platforms now. +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 36/62] grub-efi-native: fix errors with automake 1.11.2
In reply to Saul WoldFrom: Nitin A Kamble <[email protected]>
Fixes these errors observed with automake 1.11.2
The useof pkglibhas become more strict compared to the earlier release of
automake resulting in these failures.
Fixed the files related to automake to avoid the issue.
| conf/Makefile.common:140: pkglibdir' is not a legitimate directory for DATA'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:140: pkglibdir' is not a legitimate directory for DATA'
| Makefile.am:6: `conf/Makefile.common' included from here | autoreconf: automake failed with exit status: 1 | ERROR: autoreconf execution failed.
| conf/Makefile.common:150: pkglibdir' is not a legitimate directory for SCRIPTS'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:140: pkglibdir' is not a legitimate directory for DATA'
| grub-core/Makefile.am:5: `conf/Makefile.common' included from here
| conf/Makefile.common:150: pkglibdir' is not a legitimate directory for SCRIPTS'
| Makefile.am:6: `conf/Makefile.common' included from here
| conf/Makefile.common:140: pkglibdir' is not a legitimate directory for DATA'
| Makefile.am:6: `conf/Makefile.common' included from here
| autoreconf: automake failed with exit status: 1
--- .../files/grub-1.99_fix_for_automake_1.11.2.patch | 5888 ++++++++++++++++++++ meta/recipes-bsp/grub/grub-efi-native_1.99.bb | 5 +- 2 files changed, 5891 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch
meta/recipes-bsp/grub/files/grub-1.99_fix_for_automake_1.11.2.patch new file +84 -0
@@ -0,0 +1,5888 @@ +Upstream-Status: Pending + +Fixes these errors observed with automake 1.11.2 +The useof pkglibhas become more strict compared to the earlier release of +automake resulting in these failures. +Fixed the files related to automake to avoid the issue. + +| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' +| grub-core/Makefile.am:5: `conf/Makefile.common' included from here +| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' +| Makefile.am:6: `conf/Makefile.common' included from here +| autoreconf: automake failed with exit status: 1 +| ERROR: autoreconf execution failed. + + + +| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS' +| grub-core/Makefile.am:5: `conf/Makefile.common' included from here +| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' +| grub-core/Makefile.am:5: `conf/Makefile.common' included from here +| conf/Makefile.common:150: `pkglibdir' is not a legitimate directory for `SCRIPTS' +| Makefile.am:6: `conf/Makefile.common' included from here +| conf/Makefile.common:140: `pkglibdir' is not a legitimate directory for `DATA' +| Makefile.am:6: `conf/Makefile.common' included from here +| autoreconf: automake failed with exit status: 1 + +Signed-Off-By: Nitin A Kamble <[email protected]> +2012/01/12 + + +Index: grub-1.99/conf/Makefile.common +=================================================================== +--- grub-1.99.orig/conf/Makefile.common ++++ grub-1.99/conf/Makefile.common +@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES = + + man_MANS = + noinst_DATA = +-pkglib_DATA = ++pkgdata_DATA = + bin_SCRIPTS = + sbin_SCRIPTS = + bin_PROGRAMS = +@@ -147,7 +147,7 @@ check_SCRIPTS = + grubconf_DATA = + check_PROGRAMS = + noinst_SCRIPTS = +-pkglib_SCRIPTS = ++pkglibexec_SCRIPTS = + noinst_PROGRAMS = + grubconf_SCRIPTS = + noinst_LIBRARIES = +Index: grub-1.99/Makefile.am +=================================================================== +--- grub-1.99.orig/Makefile.am ++++ grub-1.99/Makefile.am +@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h + # Install config.h into platformdir + platform_HEADERS = config.h + +-pkglib_DATA += grub-mkconfig_lib +-pkglib_DATA += update-grub_lib ++pkgdata_DATA += grub-mkconfig_lib ++pkgdata_DATA += update-grub_lib + + + if COND_i386_coreboot +Index: grub-1.99/Makefile.tpl +=================================================================== +--- grub-1.99.orig/Makefile.tpl ++++ grub-1.99/Makefile.tpl +@@ -30420,7 +30420,7 @@ CLEANFILES += [+ name +].[+ mansection + + endif + [+ ENDIF +][+ ENDIF +] + [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@ + chmod a+x [+ name +] + + CLEANFILES += [+ name +] +@@ -30461,7 +30461,7 @@ CLEANFILES += [+ name +].[+ mansection + + endif + [+ ENDIF +][+ ENDIF +] + [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +]
[+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30508,7 +30508,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30557,7 +30557,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30607,7 +30607,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +]
[+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30657,7 +30657,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30707,7 +30707,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30756,7 +30756,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30803,7 +30803,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30846,7 +30846,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30887,7 +30887,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30926,7 +30926,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30962,7 +30962,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -30998,7 +30998,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31034,7 +31034,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31070,7 +31070,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31106,7 +31106,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF emu +][+ FOR emu +][+ .emu +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31147,7 +31147,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31193,7 +31193,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31239,7 +31239,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31285,7 +31285,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31331,7 +31331,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31377,7 +31377,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31423,7 +31423,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31469,7 +31469,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31515,7 +31515,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31561,7 +31561,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31607,7 +31607,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_pc +][+ FOR i386_pc +][+ .i386_pc +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31654,7 +31654,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31702,7 +31702,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31750,7 +31750,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31798,7 +31798,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31846,7 +31846,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31894,7 +31894,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31942,7 +31942,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -31990,7 +31990,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32038,7 +32038,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32086,7 +32086,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32134,7 +32134,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32182,7 +32182,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_efi +][+ FOR i386_efi +][+ .i386_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32231,7 +32231,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32281,7 +32281,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32331,7 +32331,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32381,7 +32381,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32431,7 +32431,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32481,7 +32481,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32531,7 +32531,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32581,7 +32581,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32631,7 +32631,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32681,7 +32681,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32731,7 +32731,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32781,7 +32781,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32831,7 +32831,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_qemu +][+ FOR i386_qemu +][+ .i386_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32881,7 +32881,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32931,7 +32931,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -32981,7 +32981,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33031,7 +33031,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +]
[+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33081,7 +33081,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +]
[+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33131,7 +33131,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33181,7 +33181,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33231,7 +33231,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33281,7 +33281,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33331,7 +33331,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33381,7 +33381,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33431,7 +33431,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33481,7 +33481,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_coreboot +][+ FOR i386_coreboot +][+ .i386_coreboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33531,7 +33531,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33581,7 +33581,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33631,7 +33631,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33681,7 +33681,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33731,7 +33731,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33781,7 +33781,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33831,7 +33831,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +]
[+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33881,7 +33881,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33931,7 +33931,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -33981,7 +33981,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34031,7 +34031,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34081,7 +34081,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34131,7 +34131,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_multiboot +][+ FOR i386_multiboot +][+ .i386_multiboot +] [+ ENDFOR +][+ ENDIF +][+ IF i386_coreboot_multiboot_qemu +][+ FOR i386_coreboot_multiboot_qemu +][+ .i386_coreboot_multiboot_qemu +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34181,7 +34181,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34231,7 +34231,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34281,7 +34281,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34331,7 +34331,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34381,7 +34381,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34431,7 +34431,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34481,7 +34481,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34531,7 +34531,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34581,7 +34581,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34631,7 +34631,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34681,7 +34681,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34731,7 +34731,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34781,7 +34781,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF i386_ieee1275 +][+ FOR i386_ieee1275 +][+ .i386_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF i386 +][+ FOR i386 +][+ .i386 +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34830,7 +34830,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34878,7 +34878,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34926,7 +34926,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -34974,7 +34974,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35022,7 +35022,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35070,7 +35070,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35118,7 +35118,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35166,7 +35166,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35214,7 +35214,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35262,7 +35262,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35310,7 +35310,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35358,7 +35358,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF x86_64_efi +][+ FOR x86_64_efi +][+ .x86_64_efi +] [+ ENDFOR +][+ ENDIF +][+ IF x86_64 +][+ FOR x86_64 +][+ .x86_64 +] [+ ENDFOR +][+ ENDIF +][+ IF x86_efi +][+ FOR x86_efi +][+ .x86_efi +] [+ ENDFOR +][+ ENDIF +][+ IF terminfomodule +][+ FOR terminfomodule +][+ .terminfomodule +] [+ ENDFOR +][+ ENDIF +][+ IF x86 +][+ FOR x86 +][+ .x86 +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35405,7 +35405,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35451,7 +35451,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35497,7 +35497,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35543,7 +35543,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35589,7 +35589,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35635,7 +35635,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35681,7 +35681,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35727,7 +35727,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35773,7 +35773,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35819,7 +35819,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35865,7 +35865,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF mips_yeeloong +][+ FOR mips_yeeloong +][+ .mips_yeeloong +] [+ ENDFOR +][+ ENDIF +][+ IF videoinkernel +][+ FOR videoinkernel +][+ .videoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF mips +][+ FOR mips +][+ .mips +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF cmos +][+ FOR cmos +][+ .cmos +] [+ ENDFOR +][+ ENDIF +][+ IF usb +][+ FOR usb +][+ .usb +] [+ ENDFOR +][+ ENDIF +][+ IF pci +][+ FOR pci +][+ .pci +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35908,7 +35908,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35948,7 +35948,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -35988,7 +35988,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36028,7 +36028,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36068,7 +36068,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36108,7 +36108,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36148,7 +36148,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36188,7 +36188,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF sparc64_ieee1275 +][+ FOR sparc64_ieee1275 +][+ .sparc64_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF sparc64 +][+ FOR sparc64 +][+ .sparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36229,7 +36229,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36271,7 +36271,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36313,7 +36313,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36355,7 +36355,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36397,7 +36397,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36439,7 +36439,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36481,7 +36481,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36523,7 +36523,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+@@ -36565,7 +36565,7 @@ CLEANFILES += [+ name +].[+ mansection +
+ endif
+ [+ ENDIF +][+ ENDIF +]
+ [+ name +]: [+ IF powerpc_ieee1275 +][+ FOR powerpc_ieee1275 +][+ .powerpc_ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF powerpc +][+ FOR powerpc +][+ .powerpc +] [+ ENDFOR +][+ ENDIF +][+ IF ieee1275 +][+ FOR ieee1275 +][+ .ieee1275 +] [+ ENDFOR +][+ ENDIF +][+ IF terminfoinkernel +][+ FOR terminfoinkernel +][+ .terminfoinkernel +] [+ ENDFOR +][+ ENDIF +][+ IF nosparc64 +][+ FOR nosparc64 +][+ .nosparc64 +] [+ ENDFOR +][+ ENDIF +][+ IF nopc +][+ FOR nopc +][+ .nopc +] [+ ENDFOR +][+ ENDIF +][+ IF noemu +][+ FOR noemu +][+ .noemu +] [+ ENDFOR +][+ ENDIF +][+ IF videomodules +][+ FOR videomodules +][+ .videomodules +] [+ ENDFOR +][+ ENDIF +][+ IF common +][+ FOR common +][+ .common +] [+ ENDFOR +][+ ENDIF +] $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+
+ CLEANFILES += [+ name +]
+Index: grub-1.99/Makefile.util.am
+=================================================================== +--- grub-1.99.orig/Makefile.util.am
++++ grub-1.99/Makefile.util.am
+@@ -4111,7 +4111,7 @@ if COND_emu
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4122,7 +4122,7 @@ if COND_i386_pc
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4133,7 +4133,7 @@ if COND_i386_efi
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4144,7 +4144,7 @@ if COND_i386_qemu
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4155,7 +4155,7 @@ if COND_i386_coreboot
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4166,7 +4166,7 @@ if COND_i386_multiboot
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4177,7 +4177,7 @@ if COND_i386_ieee1275
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4188,7 +4188,7 @@ if COND_x86_64_efi
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4199,7 +4199,7 @@ if COND_mips_yeeloong
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4210,7 +4210,7 @@ if COND_sparc64_ieee1275
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4221,7 +4221,7 @@ if COND_powerpc_ieee1275
+ grubconf_SCRIPTS += 00_header
+
+ 00_header: util/grub.d/00_header.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 00_header
+
+ CLEANFILES += 00_header
+@@ -4233,7 +4233,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4246,7 +4246,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4259,7 +4259,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4272,7 +4272,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4285,7 +4285,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4298,7 +4298,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4311,7 +4311,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4324,7 +4324,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4337,7 +4337,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4350,7 +4350,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4363,7 +4363,7 @@ if COND_HOST_WINDOWS
+ grubconf_SCRIPTS += 10_windows
+
+ 10_windows: util/grub.d/10_windows.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_windows
+
+ CLEANFILES += 10_windows
+@@ -4376,7 +4376,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4389,7 +4389,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4402,7 +4402,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4415,7 +4415,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4428,7 +4428,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4441,7 +4441,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4454,7 +4454,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4467,7 +4467,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4480,7 +4480,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4493,7 +4493,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4506,7 +4506,7 @@ if COND_HOST_HURD
+ grubconf_SCRIPTS += 10_hurd
+
+ 10_hurd: util/grub.d/10_hurd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_hurd
+
+ CLEANFILES += 10_hurd
+@@ -4519,7 +4519,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4532,7 +4532,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4545,7 +4545,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4558,7 +4558,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4571,7 +4571,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4584,7 +4584,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4597,7 +4597,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4610,7 +4610,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4623,7 +4623,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4636,7 +4636,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4649,7 +4649,7 @@ if COND_HOST_KFREEBSD
+ grubconf_SCRIPTS += 10_kfreebsd
+
+ 10_kfreebsd: util/grub.d/10_kfreebsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_kfreebsd
+
+ CLEANFILES += 10_kfreebsd
+@@ -4662,7 +4662,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4675,7 +4675,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4688,7 +4688,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4701,7 +4701,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4714,7 +4714,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4727,7 +4727,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4740,7 +4740,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4753,7 +4753,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4766,7 +4766,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4779,7 +4779,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4792,7 +4792,7 @@ if COND_HOST_NETBSD
+ grubconf_SCRIPTS += 10_netbsd
+
+ 10_netbsd: util/grub.d/10_netbsd.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_netbsd
+
+ CLEANFILES += 10_netbsd
+@@ -4805,7 +4805,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4818,7 +4818,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4831,7 +4831,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4844,7 +4844,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4857,7 +4857,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4870,7 +4870,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4883,7 +4883,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4896,7 +4896,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4909,7 +4909,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4922,7 +4922,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4935,7 +4935,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 10_linux
+
+ 10_linux: util/grub.d/10_linux.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 10_linux
+
+ CLEANFILES += 10_linux
+@@ -4948,7 +4948,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -4961,7 +4961,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -4974,7 +4974,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -4987,7 +4987,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5000,7 +5000,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5013,7 +5013,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5026,7 +5026,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5039,7 +5039,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5052,7 +5052,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5065,7 +5065,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5078,7 +5078,7 @@ if COND_HOST_LINUX
+ grubconf_SCRIPTS += 20_linux_xen
+
+ 20_linux_xen: util/grub.d/20_linux_xen.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 20_linux_xen
+
+ CLEANFILES += 20_linux_xen
+@@ -5090,7 +5090,7 @@ if COND_emu
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5101,7 +5101,7 @@ if COND_i386_pc
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5112,7 +5112,7 @@ if COND_i386_efi
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5123,7 +5123,7 @@ if COND_i386_qemu
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5134,7 +5134,7 @@ if COND_i386_coreboot
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5145,7 +5145,7 @@ if COND_i386_multiboot
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5156,7 +5156,7 @@ if COND_i386_ieee1275
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5167,7 +5167,7 @@ if COND_x86_64_efi
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5178,7 +5178,7 @@ if COND_mips_yeeloong
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5189,7 +5189,7 @@ if COND_sparc64_ieee1275
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5200,7 +5200,7 @@ if COND_powerpc_ieee1275
+ grubconf_SCRIPTS += 30_os-prober
+
+ 30_os-prober: util/grub.d/30_os-prober.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 30_os-prober
+
+ CLEANFILES += 30_os-prober
+@@ -5211,7 +5211,7 @@ if COND_emu
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5222,7 +5222,7 @@ if COND_i386_pc
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5233,7 +5233,7 @@ if COND_i386_efi
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5244,7 +5244,7 @@ if COND_i386_qemu
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5255,7 +5255,7 @@ if COND_i386_coreboot
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5266,7 +5266,7 @@ if COND_i386_multiboot
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5277,7 +5277,7 @@ if COND_i386_ieee1275
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5288,7 +5288,7 @@ if COND_x86_64_efi
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5299,7 +5299,7 @@ if COND_mips_yeeloong
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5310,7 +5310,7 @@ if COND_sparc64_ieee1275
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5321,7 +5321,7 @@ if COND_powerpc_ieee1275
+ grubconf_SCRIPTS += 40_custom
+
+ 40_custom: util/grub.d/40_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 40_custom
+
+ CLEANFILES += 40_custom
+@@ -5332,7 +5332,7 @@ if COND_emu
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5343,7 +5343,7 @@ if COND_i386_pc
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5354,7 +5354,7 @@ if COND_i386_efi
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5365,7 +5365,7 @@ if COND_i386_qemu
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5376,7 +5376,7 @@ if COND_i386_coreboot
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5387,7 +5387,7 @@ if COND_i386_multiboot
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5398,7 +5398,7 @@ if COND_i386_ieee1275
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5409,7 +5409,7 @@ if COND_x86_64_efi
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5420,7 +5420,7 @@ if COND_mips_yeeloong
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5431,7 +5431,7 @@ if COND_sparc64_ieee1275
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5442,7 +5442,7 @@ if COND_powerpc_ieee1275
+ grubconf_SCRIPTS += 41_custom
+
+ 41_custom: util/grub.d/41_custom.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x 41_custom
+
+ CLEANFILES += 41_custom
+@@ -5462,7 +5462,7 @@ CLEANFILES += grub-mkrescue.1
+ endif
+
+ grub-mkrescue: util/grub-mkrescue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkrescue
+
+ CLEANFILES += grub-mkrescue
+@@ -5482,7 +5482,7 @@ CLEANFILES += grub-mkrescue.1
+ endif
+
+ grub-mkrescue: util/grub-mkrescue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkrescue
+
+ CLEANFILES += grub-mkrescue
+@@ -5502,7 +5502,7 @@ CLEANFILES += grub-mkrescue.1
+ endif
+
+ grub-mkrescue: util/grub-mkrescue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkrescue
+
+ CLEANFILES += grub-mkrescue
+@@ -5522,7 +5522,7 @@ CLEANFILES += grub-mkrescue.1
+ endif
+
+ grub-mkrescue: util/grub-mkrescue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkrescue
+
+ CLEANFILES += grub-mkrescue
+@@ -5542,7 +5542,7 @@ CLEANFILES += grub-mkrescue.1
+ endif
+
+ grub-mkrescue: util/grub-mkrescue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkrescue
+
+ CLEANFILES += grub-mkrescue
+@@ -5562,7 +5562,7 @@ CLEANFILES += grub-mkrescue.1
+ endif
+
+ grub-mkrescue: util/grub-mkrescue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkrescue
+
+ CLEANFILES += grub-mkrescue
+@@ -5582,7 +5582,7 @@ CLEANFILES += grub-mkrescue.1
+ endif
+
+ grub-mkrescue: util/powerpc/ieee1275/grub-mkrescue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkrescue
+
+ CLEANFILES += grub-mkrescue
+@@ -5602,7 +5602,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5622,7 +5622,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5642,7 +5642,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5662,7 +5662,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5682,7 +5682,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5702,7 +5702,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5722,7 +5722,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5742,7 +5742,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5762,7 +5762,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5782,7 +5782,7 @@ CLEANFILES += grub-install.8
+ endif
+
+ grub-install: util/grub-install.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-install
+
+ CLEANFILES += grub-install
+@@ -5802,7 +5802,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5822,7 +5822,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5842,7 +5842,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5862,7 +5862,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5882,7 +5882,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5902,7 +5902,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5922,7 +5922,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5942,7 +5942,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5962,7 +5962,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -5982,7 +5982,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -6002,7 +6002,7 @@ CLEANFILES += grub-mknetdir.8
+ endif
+
+ grub-mknetdir: util/grub-mknetdir.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mknetdir
+
+ CLEANFILES += grub-mknetdir
+@@ -6022,7 +6022,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6042,7 +6042,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6062,7 +6062,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6082,7 +6082,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6102,7 +6102,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6122,7 +6122,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6142,7 +6142,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6162,7 +6162,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6182,7 +6182,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6202,7 +6202,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6222,7 +6222,7 @@ CLEANFILES += grub-mkconfig.8
+ endif
+
+ grub-mkconfig: util/grub-mkconfig.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig
+
+ CLEANFILES += grub-mkconfig
+@@ -6242,7 +6242,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6262,7 +6262,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6282,7 +6282,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6302,7 +6302,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6322,7 +6322,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6342,7 +6342,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6362,7 +6362,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6382,7 +6382,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6402,7 +6402,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6422,7 +6422,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6442,7 +6442,7 @@ CLEANFILES += grub-set-default.8
+ endif
+
+ grub-set-default: util/grub-set-default.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-set-default
+
+ CLEANFILES += grub-set-default
+@@ -6462,7 +6462,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6482,7 +6482,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6502,7 +6502,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6522,7 +6522,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6542,7 +6542,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6562,7 +6562,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6582,7 +6582,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6602,7 +6602,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6622,7 +6622,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6642,7 +6642,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6662,7 +6662,7 @@ CLEANFILES += grub-reboot.8
+ endif
+
+ grub-reboot: util/grub-reboot.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-reboot
+
+ CLEANFILES += grub-reboot
+@@ -6673,7 +6673,7 @@ if COND_emu
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6684,7 +6684,7 @@ if COND_i386_pc
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6695,7 +6695,7 @@ if COND_i386_efi
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6706,7 +6706,7 @@ if COND_i386_qemu
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6717,7 +6717,7 @@ if COND_i386_coreboot
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6728,7 +6728,7 @@ if COND_i386_multiboot
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6739,7 +6739,7 @@ if COND_i386_ieee1275
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6750,7 +6750,7 @@ if COND_x86_64_efi
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6761,7 +6761,7 @@ if COND_mips_yeeloong
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6772,7 +6772,7 @@ if COND_sparc64_ieee1275
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6783,7 +6783,7 @@ if COND_powerpc_ieee1275
+ noinst_SCRIPTS += grub-mkconfig_lib
+
+ grub-mkconfig_lib: util/grub-mkconfig_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-mkconfig_lib
+
+ CLEANFILES += grub-mkconfig_lib
+@@ -6794,7 +6794,7 @@ if COND_emu
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6805,7 +6805,7 @@ if COND_i386_pc
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6816,7 +6816,7 @@ if COND_i386_efi
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6827,7 +6827,7 @@ if COND_i386_qemu
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6838,7 +6838,7 @@ if COND_i386_coreboot
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6849,7 +6849,7 @@ if COND_i386_multiboot
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6860,7 +6860,7 @@ if COND_i386_ieee1275
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6871,7 +6871,7 @@ if COND_x86_64_efi
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6882,7 +6882,7 @@ if COND_mips_yeeloong
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6893,7 +6893,7 @@ if COND_sparc64_ieee1275
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6904,7 +6904,7 @@ if COND_powerpc_ieee1275
+ noinst_SCRIPTS += update-grub_lib
+
+ update-grub_lib: util/update-grub_lib.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x update-grub_lib
+
+ CLEANFILES += update-grub_lib
+@@ -6915,7 +6915,7 @@ if COND_emu
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -6926,7 +6926,7 @@ if COND_i386_pc
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -6937,7 +6937,7 @@ if COND_i386_efi
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -6948,7 +6948,7 @@ if COND_i386_qemu
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -6959,7 +6959,7 @@ if COND_i386_coreboot
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -6970,7 +6970,7 @@ if COND_i386_multiboot
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -6981,7 +6981,7 @@ if COND_i386_ieee1275
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -6992,7 +6992,7 @@ if COND_x86_64_efi
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -7003,7 +7003,7 @@ if COND_mips_yeeloong
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -7014,7 +7014,7 @@ if COND_sparc64_ieee1275
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -7025,7 +7025,7 @@ if COND_powerpc_ieee1275
+ bin_SCRIPTS += grub-kbdcomp
+
+ grub-kbdcomp: util/grub-kbdcomp.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-kbdcomp
+
+ CLEANFILES += grub-kbdcomp
+@@ -7036,7 +7036,7 @@ if COND_emu
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7047,7 +7047,7 @@ if COND_i386_pc
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7058,7 +7058,7 @@ if COND_i386_efi
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7069,7 +7069,7 @@ if COND_i386_qemu
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7080,7 +7080,7 @@ if COND_i386_coreboot
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7091,7 +7091,7 @@ if COND_i386_multiboot
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7102,7 +7102,7 @@ if COND_i386_ieee1275
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7113,7 +7113,7 @@ if COND_x86_64_efi
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7124,7 +7124,7 @@ if COND_mips_yeeloong
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7135,7 +7135,7 @@ if COND_sparc64_ieee1275
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7146,7 +7146,7 @@ if COND_powerpc_ieee1275
+ noinst_SCRIPTS += grub-shell
+
+ grub-shell: tests/util/grub-shell.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell
+
+ CLEANFILES += grub-shell
+@@ -7157,7 +7157,7 @@ if COND_emu
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7168,7 +7168,7 @@ if COND_i386_pc
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7179,7 +7179,7 @@ if COND_i386_efi
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7190,7 +7190,7 @@ if COND_i386_qemu
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7201,7 +7201,7 @@ if COND_i386_coreboot
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7212,7 +7212,7 @@ if COND_i386_multiboot
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7223,7 +7223,7 @@ if COND_i386_ieee1275
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7234,7 +7234,7 @@ if COND_x86_64_efi
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7245,7 +7245,7 @@ if COND_mips_yeeloong
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7256,7 +7256,7 @@ if COND_sparc64_ieee1275
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7267,7 +7267,7 @@ if COND_powerpc_ieee1275
+ noinst_SCRIPTS += grub-shell-tester
+
+ grub-shell-tester: tests/util/grub-shell-tester.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub-shell-tester
+
+ CLEANFILES += grub-shell-tester
+@@ -7279,7 +7279,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7291,7 +7291,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7303,7 +7303,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7315,7 +7315,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7327,7 +7327,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7339,7 +7339,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7351,7 +7351,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7363,7 +7363,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7375,7 +7375,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7387,7 +7387,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7399,7 +7399,7 @@ check_SCRIPTS += example_scripted_test
+ TESTS += example_scripted_test
+
+ example_scripted_test: tests/example_scripted_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_scripted_test
+
+ CLEANFILES += example_scripted_test
+@@ -7411,7 +7411,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7423,7 +7423,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7435,7 +7435,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7447,7 +7447,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7459,7 +7459,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7471,7 +7471,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7483,7 +7483,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7495,7 +7495,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7507,7 +7507,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7519,7 +7519,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7531,7 +7531,7 @@ check_SCRIPTS += example_grub_script_tes
+ TESTS += example_grub_script_test
+
+ example_grub_script_test: tests/example_grub_script_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x example_grub_script_test
+
+ CLEANFILES += example_grub_script_test
+@@ -7543,7 +7543,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7555,7 +7555,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7567,7 +7567,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7579,7 +7579,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7591,7 +7591,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7603,7 +7603,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7615,7 +7615,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7627,7 +7627,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7639,7 +7639,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7651,7 +7651,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7663,7 +7663,7 @@ check_SCRIPTS += grub_script_echo1
+ TESTS += grub_script_echo1
+
+ grub_script_echo1: tests/grub_script_echo1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo1
+
+ CLEANFILES += grub_script_echo1
+@@ -7675,7 +7675,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7687,7 +7687,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7699,7 +7699,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7711,7 +7711,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7723,7 +7723,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7735,7 +7735,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7747,7 +7747,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7759,7 +7759,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7771,7 +7771,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7783,7 +7783,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7795,7 +7795,7 @@ check_SCRIPTS += grub_script_echo_keywor
+ TESTS += grub_script_echo_keywords
+
+ grub_script_echo_keywords: tests/grub_script_echo_keywords.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_echo_keywords
+
+ CLEANFILES += grub_script_echo_keywords
+@@ -7807,7 +7807,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7819,7 +7819,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7831,7 +7831,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7843,7 +7843,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7855,7 +7855,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7867,7 +7867,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7879,7 +7879,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7891,7 +7891,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7903,7 +7903,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7915,7 +7915,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7927,7 +7927,7 @@ check_SCRIPTS += grub_script_vars1
+ TESTS += grub_script_vars1
+
+ grub_script_vars1: tests/grub_script_vars1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_vars1
+
+ CLEANFILES += grub_script_vars1
+@@ -7939,7 +7939,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -7951,7 +7951,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -7963,7 +7963,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -7975,7 +7975,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -7987,7 +7987,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -7999,7 +7999,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -8011,7 +8011,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -8023,7 +8023,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -8035,7 +8035,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -8047,7 +8047,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -8059,7 +8059,7 @@ check_SCRIPTS += grub_script_for1
+ TESTS += grub_script_for1
+
+ grub_script_for1: tests/grub_script_for1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_for1
+
+ CLEANFILES += grub_script_for1
+@@ -8071,7 +8071,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8083,7 +8083,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8095,7 +8095,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8107,7 +8107,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8119,7 +8119,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8131,7 +8131,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8143,7 +8143,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8155,7 +8155,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8167,7 +8167,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8179,7 +8179,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8191,7 +8191,7 @@ check_SCRIPTS += grub_script_while1
+ TESTS += grub_script_while1
+
+ grub_script_while1: tests/grub_script_while1.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_while1
+
+ CLEANFILES += grub_script_while1
+@@ -8203,7 +8203,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8215,7 +8215,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8227,7 +8227,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8239,7 +8239,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8251,7 +8251,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8263,7 +8263,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8275,7 +8275,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8287,7 +8287,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8299,7 +8299,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8311,7 +8311,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8323,7 +8323,7 @@ check_SCRIPTS += grub_script_if
+ TESTS += grub_script_if
+
+ grub_script_if: tests/grub_script_if.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_if
+
+ CLEANFILES += grub_script_if
+@@ -8335,7 +8335,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8347,7 +8347,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8359,7 +8359,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8371,7 +8371,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8383,7 +8383,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8395,7 +8395,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8407,7 +8407,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8419,7 +8419,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8431,7 +8431,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8443,7 +8443,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8455,7 +8455,7 @@ check_SCRIPTS += grub_script_blanklines
+ TESTS += grub_script_blanklines
+
+ grub_script_blanklines: tests/grub_script_blanklines.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blanklines
+
+ CLEANFILES += grub_script_blanklines
+@@ -8467,7 +8467,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8479,7 +8479,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8491,7 +8491,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8503,7 +8503,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8515,7 +8515,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8527,7 +8527,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8539,7 +8539,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8551,7 +8551,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8563,7 +8563,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8575,7 +8575,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8587,7 +8587,7 @@ check_SCRIPTS += grub_script_final_semic
+ TESTS += grub_script_final_semicolon
+
+ grub_script_final_semicolon: tests/grub_script_final_semicolon.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_final_semicolon
+
+ CLEANFILES += grub_script_final_semicolon
+@@ -8599,7 +8599,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8611,7 +8611,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8623,7 +8623,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8635,7 +8635,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8647,7 +8647,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8659,7 +8659,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8671,7 +8671,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8683,7 +8683,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8695,7 +8695,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8707,7 +8707,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8719,7 +8719,7 @@ check_SCRIPTS += grub_script_dollar
+ TESTS += grub_script_dollar
+
+ grub_script_dollar: tests/grub_script_dollar.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_dollar
+
+ CLEANFILES += grub_script_dollar
+@@ -8731,7 +8731,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8743,7 +8743,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8755,7 +8755,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8767,7 +8767,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8779,7 +8779,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8791,7 +8791,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8803,7 +8803,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8815,7 +8815,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8827,7 +8827,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8839,7 +8839,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8851,7 +8851,7 @@ check_SCRIPTS += grub_script_comments
+ TESTS += grub_script_comments
+
+ grub_script_comments: tests/grub_script_comments.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_comments
+
+ CLEANFILES += grub_script_comments
+@@ -8863,7 +8863,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8875,7 +8875,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8887,7 +8887,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8899,7 +8899,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8911,7 +8911,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8923,7 +8923,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8935,7 +8935,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8947,7 +8947,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8959,7 +8959,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8971,7 +8971,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8983,7 +8983,7 @@ check_SCRIPTS += grub_script_functions
+ TESTS += grub_script_functions
+
+ grub_script_functions: tests/grub_script_functions.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_functions
+
+ CLEANFILES += grub_script_functions
+@@ -8995,7 +8995,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9007,7 +9007,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9019,7 +9019,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9031,7 +9031,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9043,7 +9043,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9055,7 +9055,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9067,7 +9067,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9079,7 +9079,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9091,7 +9091,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9103,7 +9103,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9115,7 +9115,7 @@ check_SCRIPTS += grub_script_break
+ TESTS += grub_script_break
+
+ grub_script_break: tests/grub_script_break.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_break
+
+ CLEANFILES += grub_script_break
+@@ -9127,7 +9127,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9139,7 +9139,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9151,7 +9151,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9163,7 +9163,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9175,7 +9175,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9187,7 +9187,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9199,7 +9199,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9211,7 +9211,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9223,7 +9223,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9235,7 +9235,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9247,7 +9247,7 @@ check_SCRIPTS += grub_script_continue
+ TESTS += grub_script_continue
+
+ grub_script_continue: tests/grub_script_continue.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_continue
+
+ CLEANFILES += grub_script_continue
+@@ -9259,7 +9259,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9271,7 +9271,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9283,7 +9283,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9295,7 +9295,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9307,7 +9307,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9319,7 +9319,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9331,7 +9331,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9343,7 +9343,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9355,7 +9355,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9367,7 +9367,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9379,7 +9379,7 @@ check_SCRIPTS += grub_script_shift
+ TESTS += grub_script_shift
+
+ grub_script_shift: tests/grub_script_shift.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_shift
+
+ CLEANFILES += grub_script_shift
+@@ -9391,7 +9391,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9403,7 +9403,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9415,7 +9415,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9427,7 +9427,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9439,7 +9439,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9451,7 +9451,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9463,7 +9463,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9475,7 +9475,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9487,7 +9487,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9499,7 +9499,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9511,7 +9511,7 @@ check_SCRIPTS += grub_script_blockarg
+ TESTS += grub_script_blockarg
+
+ grub_script_blockarg: tests/grub_script_blockarg.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_blockarg
+
+ CLEANFILES += grub_script_blockarg
+@@ -9523,7 +9523,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9535,7 +9535,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9547,7 +9547,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9559,7 +9559,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9571,7 +9571,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9583,7 +9583,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9595,7 +9595,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9607,7 +9607,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9619,7 +9619,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9631,7 +9631,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9643,7 +9643,7 @@ check_SCRIPTS += grub_script_setparams
+ TESTS += grub_script_setparams
+
+ grub_script_setparams: tests/grub_script_setparams.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_setparams
+
+ CLEANFILES += grub_script_setparams
+@@ -9655,7 +9655,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9667,7 +9667,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9679,7 +9679,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9691,7 +9691,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9703,7 +9703,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9715,7 +9715,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9727,7 +9727,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9739,7 +9739,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9751,7 +9751,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9763,7 +9763,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9775,7 +9775,7 @@ check_SCRIPTS += grub_script_return
+ TESTS += grub_script_return
+
+ grub_script_return: tests/grub_script_return.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_return
+
+ CLEANFILES += grub_script_return
+@@ -9787,7 +9787,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9799,7 +9799,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9811,7 +9811,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9823,7 +9823,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9835,7 +9835,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9847,7 +9847,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9859,7 +9859,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9871,7 +9871,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9883,7 +9883,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9895,7 +9895,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9907,7 +9907,7 @@ check_SCRIPTS += grub_cmd_regexp
+ TESTS += grub_cmd_regexp
+
+ grub_cmd_regexp: tests/grub_cmd_regexp.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_regexp
+
+ CLEANFILES += grub_cmd_regexp
+@@ -9919,7 +9919,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -9931,7 +9931,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -9943,7 +9943,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -9955,7 +9955,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -9967,7 +9967,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -9979,7 +9979,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -9991,7 +9991,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -10003,7 +10003,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -10015,7 +10015,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -10027,7 +10027,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -10039,7 +10039,7 @@ check_SCRIPTS += grub_script_expansion
+ TESTS += grub_script_expansion
+
+ grub_script_expansion: tests/grub_script_expansion.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_expansion
+
+ CLEANFILES += grub_script_expansion
+@@ -10051,7 +10051,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10063,7 +10063,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10075,7 +10075,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10087,7 +10087,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10099,7 +10099,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10111,7 +10111,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10123,7 +10123,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10135,7 +10135,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10147,7 +10147,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10159,7 +10159,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10171,7 +10171,7 @@ check_SCRIPTS += grub_script_not
+ TESTS += grub_script_not
+
+ grub_script_not: tests/grub_script_not.in $(top_builddir)/config.status +- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_script_not
+
+ CLEANFILES += grub_script_not
+@@ -10183,7 +10183,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10195,7 +10195,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10207,7 +10207,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10219,7 +10219,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10231,7 +10231,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10243,7 +10243,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10255,7 +10255,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10267,7 +10267,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10279,7 +10279,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10291,7 +10291,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10303,7 +10303,7 @@ check_SCRIPTS += partmap_test
+ TESTS += partmap_test
+
+ partmap_test: tests/partmap_test.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x partmap_test
+
+ CLEANFILES += partmap_test
+@@ -10315,7 +10315,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10327,7 +10327,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10339,7 +10339,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10351,7 +10351,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10363,7 +10363,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10375,7 +10375,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10387,7 +10387,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10399,7 +10399,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10411,7 +10411,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10423,7 +10423,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+@@ -10435,7 +10435,7 @@ check_SCRIPTS += grub_cmd_echo
+ TESTS += grub_cmd_echo
+
+ grub_cmd_echo: tests/grub_cmd_echo.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x grub_cmd_echo
+
+ CLEANFILES += grub_cmd_echo
+Index: grub-1.99/gentpl.py
+=================================================================== +--- grub-1.99.orig/gentpl.py
++++ grub-1.99/gentpl.py
+@@ -440,7 +440,7 @@ def script(platform):
+ r += "[+ ENDIF +]"
+
+ r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """
+-$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x [+ name +]
+ """)
+
+Index: grub-1.99/grub-core/Makefile.core.am
+=================================================================== +--- grub-1.99.orig/grub-core/Makefile.core.am
++++ grub-1.99/grub-core/Makefile.core.am
+@@ -38846,7 +38846,7 @@ if COND_emu
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38857,7 +38857,7 @@ if COND_i386_pc
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38868,7 +38868,7 @@ if COND_i386_efi
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38879,7 +38879,7 @@ if COND_i386_qemu
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38890,7 +38890,7 @@ if COND_i386_coreboot
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38901,7 +38901,7 @@ if COND_i386_multiboot
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38912,7 +38912,7 @@ if COND_i386_ieee1275
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38923,7 +38923,7 @@ if COND_x86_64_efi
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38934,7 +38934,7 @@ if COND_mips_yeeloong
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38945,7 +38945,7 @@ if COND_sparc64_ieee1275
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38956,7 +38956,7 @@ if COND_powerpc_ieee1275
+ noinst_SCRIPTS += gensyminfo.sh
+
+ gensyminfo.sh: gensyminfo.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x gensyminfo.sh
+
+ CLEANFILES += gensyminfo.sh
+@@ -38967,7 +38967,7 @@ if COND_emu
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -38978,7 +38978,7 @@ if COND_i386_pc
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -38989,7 +38989,7 @@ if COND_i386_efi
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39000,7 +39000,7 @@ if COND_i386_qemu
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39011,7 +39011,7 @@ if COND_i386_coreboot
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39022,7 +39022,7 @@ if COND_i386_multiboot
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39033,7 +39033,7 @@ if COND_i386_ieee1275
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39044,7 +39044,7 @@ if COND_x86_64_efi
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39055,7 +39055,7 @@ if COND_mips_yeeloong
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39066,7 +39066,7 @@ if COND_sparc64_ieee1275
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
+@@ -39077,7 +39077,7 @@ if COND_powerpc_ieee1275
+ noinst_SCRIPTS += genmod.sh
+
+ genmod.sh: genmod.sh.in $(top_builddir)/config.status
+- $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++ $(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@
+ chmod a+x genmod.sh
+
+ CLEANFILES += genmod.sh
meta/recipes-bsp/grub/grub-efi-native_1.99.bb +3 -2
@@ -16,13 +16,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # FIXME: We should be able to optionally drop freetype as a dependency DEPENDS = "help2man-native" RDEPENDS_${PN} = "diffutils freetype" -PR = "r2" +PR = "r3" # Native packages do not normally rebuild when the target changes. # Ensure this is built once per HOST-TARGET pair. PN := "grub-efi-${TRANSLATED_TARGET_ARCH}-native" -SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz" +SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ + file://grub-1.99_fix_for_automake_1.11.2.patch" SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" SRC_URI[sha256sum] = "b91f420f2c51f6155e088e34ff99bea09cc1fb89585cf7c0179644e57abd28ff"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 52/62] tcmode-eglibc: Fix PREFERRED_VERSION of eglibc
In reply to Saul Wold--- meta/conf/distro/include/tcmode-default.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.6%" SDKGCCVERSION ?= "4.6%" BINUVERSION ?= "2.22" -EGLIBCVERSION ?= "2.13" +EGLIBCVERSION ?= "2.15" UCLIBCVERSION ?= "0.9.32" LINUXLIBCVERSION ?= "3.1"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 45/62] task-base: add VIRTUAL-RUNTIME_alsa-state to task-base-alsa
In reply to Saul WoldFrom: Joshua Lock <[email protected]>
Define this to be the alsa-state package by default. This enables automatic configuration setting and restoration on systems with alsa.
--- meta/conf/distro/include/default-providers.inc | 1 + meta/recipes-core/tasks/task-base.bb | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
meta/conf/distro/include/default-providers.inc +1 -0
@@ -16,6 +16,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" # VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" VIRTUAL-RUNTIME_apm ?= "apm" +VIRTUAL-RUNTIME-alsa-state ?= "alsa-state" # # Default recipe providers
meta/recipes-core/tasks/task-base.bb +3 -2
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r72" +PR = "r73" inherit task
@@ -180,7 +180,8 @@ RRECOMMENDS_task-base-vfat = "\ RDEPENDS_task-base-alsa = "\ alsa-utils-alsactl \ - alsa-utils-alsamixer" + alsa-utils-alsamixer \ + ${VIRTUAL-RUNTIME-alsa-state}" RRECOMMENDS_task-base-alsa = "\ kernel-module-snd-mixer-oss \
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 54/62] lttng-tools: Update to 2.0-pre16
In reply to Saul WoldFrom: Zumeng Chen <[email protected]>
This patch intended to integrate the Linux trace toolkit, which is a suite of tools designed to extract program execution details from the Linux operating system and interpret them.
lttng-tools 2.0 is currently in pre-release(-pre16), so we have to update it when official released.
--- ...tools-fix-compiling-error-for-powerpc-arm.patch | 27 ++++++++++++++++++ .../lttng-2.0/lttng-tools_2.0-pre16.bb | 30 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb
meta/recipes-kernel/lttng-2.0/lttng-tools/lttng-tools-fix-compiling-error-for-powerpc-arm.patch new file +27 -0
@@ -0,0 +1,27 @@ +Upstream-Status: Pending + +Fix compiling error on powerpc and arm + +For powerpc and arm, some MAP_ are defined asm/mman.h, +so including it in header. + +Signed-off-by: Zumeng Chen <[email protected]> +--- + common/runas.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/common/runas.c b/common/runas.c +index f612ccc..62a2791 100644 +--- a/common/runas.c ++++ b/common/runas.c +@@ -29,6 +29,7 @@ + #include <fcntl.h> + #include <sched.h> + #include <sys/mman.h> ++#include <asm/mman.h> + + #include <lttngerr.h> + +-- +1.7.5.4 +
meta/recipes-kernel/lttng-2.0/lttng-tools_2.0-pre16.bb new file +30 -0
@@ -0,0 +1,30 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit Control" +DESCRIPTION = "The Linux trace toolkit is a suite of tools designed \ +to extract program execution details from the Linux operating system \ +and interpret them." + +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=ab682a4729389c3f11913d758affe98e \ + file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" + +DEPENDS = "liburcu popt lttng-ust" + +SRCREV = "9beed4cb465347c778e4f982c330cef78f2628b7" +PV = "v2.0.pre16+git${SRCREV}" +PR = "r0" + +SRC_URI = "git://git.lttng.org/lttng-tools.git;protocol=git\ + file://lttng-tools-fix-compiling-error-for-powerpc-arm.patch" + +S = "${WORKDIR}/git" + +inherit autotools + +export KERNELDIR="${STAGING_KERNEL_DIR}" + +# Due to liburcu not building for MIPS currently this recipe needs to +# be limited also. +# So here let us first suppport x86/arm/powerpc platforms now. +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 48/62] conf/bitbake.conf: allow wget to output error messages
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
Use the -nv instead of -q command line option for wget so that if fetching from a URL that the wget fetcher handles (e.g. http) fails, we get a possibly useful error message (but it still remains relatively quiet when the fetch succeeds.)
--- meta/conf/bitbake.conf | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/bitbake.conf +3 -3
@@ -562,17 +562,17 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases" FETCHCMD_svn = "/usr/bin/env svn" FETCHCMD_cvs = "/usr/bin/env cvs" -FETCHCMD_wget = "/usr/bin/env wget -t 5 -q --no-check-certificate" +FETCHCMD_wget = "/usr/bin/env wget -t 5 -nv --no-check-certificate" FETCHCMD_bzr = "/usr/bin/env bzr" FETCHCMD_hg = "/usr/bin/env hg" FETCHCOMMAND = "ERROR, this must be a BitBake bug" -FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -q --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" +FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" RESUMECOMMAND = "ERROR, this must be a BitBake bug" -RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -q --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" +RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'" UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 47/62] classes/base: note variable name in COMPATIBLE_* skip messages
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
When raising SkipPackage for COMPATIBLE_MACHINE and COMPATIBLE_HOST exceptions, include the name of the variable as a hint to the user.
--- meta/classes/base.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
meta/classes/base.bbclass +2 -2
@@ -379,7 +379,7 @@ python () { import re this_host = d.getVar('HOST_SYS', 1) if not re.match(need_host, this_host): - raise bb.parse.SkipPackage("incompatible with host %s" % this_host) + raise bb.parse.SkipPackage("incompatible with host %s (not in COMPATIBLE_HOST)" % this_host) need_machine = d.getVar('COMPATIBLE_MACHINE', 1) if need_machine:
@@ -388,7 +388,7 @@ python () { if this_machine and not re.match(need_machine, this_machine): this_soc_family = d.getVar('SOC_FAMILY', 1) if (this_soc_family and not re.match(need_machine, this_soc_family)) or not this_soc_family: - raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine) + raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine) dont_want_license = d.getVar('INCOMPATIBLE_LICENSE', 1)
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 49/62] classes/package: remove out-of-date notice referring to the OE bugtracker
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
OpenEmbedded doesn't officially use a bug tracker anymore, and a message asking the user to fix the metadata could be applied to almost any error that occurs, so just remove the whole message.
--- meta/classes/package.bbclass | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-)
meta/classes/package.bbclass +0 -3
@@ -887,10 +887,7 @@ python populate_packages () { package_list = [] for pkg in packages.split(): if pkg in package_list: - bb.error("-------------------") bb.error("%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg) - bb.error("Please fix the metadata/report this as bug to OE bugtracker.") - bb.error("-------------------") else: package_list.append(pkg)
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 46/62] prelink: Update to latest version
In reply to Saul WoldFrom: Mark Hatle <[email protected]>
The latest version of prelink corrects a problem when attempting to prelink MIPS architectures.
2012-01-04 Mark Hatle <[email protected]>
* exec.c: Check that a section is larger then 0 bytes when determining the section to segment mapping. This matches the behavior of elfutils - readelf. Otherwise an empty PROGBITS section at the end of a segment will cause a failure.
[YOCTO #1463]
--- .../conf/distro/include/distro_tracking_fields.inc | 6 +++--- meta/recipes-devtools/prelink/prelink_git.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +3 -3
@@ -3105,9 +3105,9 @@ RECIPE_MANUAL_CHECK_DATE_pn-perl = "Nov 16, 2011" RECIPE_MAINTAINER_pn-perl = "Nitin A Kamble <[email protected]>" RECIPE_STATUS_pn-prelink="green" -RECIPE_LATEST_VERSION_pn-prelink="1.0+git0+0xbb1b660c5e3859b6c5a2ac8d739713e9989a4dd7" -RECIPE_LAST_UPDATE_pn-prelink = "Dec 15, 2011" -RECIPE_MANUAL_CHECK_DATE_pn-prelink = "Dec 15, 2011" +RECIPE_LATEST_VERSION_pn-prelink="1.0+git0+0x7b47f2f8a15ed13b7905bc120bb2586f3e164f7d" +RECIPE_LAST_UPDATE_pn-prelink = "Jan 13, 2012" +RECIPE_MANUAL_CHECK_DATE_pn-prelink = "Jan 13, 2012" RECIPE_MAINTAINER_pn-prelink = "Mark Hatle <[email protected]>" RECIPE_STATUS_pn-python-dbus="green"
meta/recipes-devtools/prelink/prelink_git.bb +2 -2
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" -SRCREV = "bb1b660c5e3859b6c5a2ac8d739713e9989a4dd7" +SRCREV = "7b47f2f8a15ed13b7905bc120bb2586f3e164f7d" PV = "1.0+git${SRCPV}" -PR = "r8" +PR = "r9" # # The cron script attempts to re-prelink the system daily -- on
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 55/62] lttng-modules: Update to 2.0
In reply to Saul WoldFrom: Zumeng Chen <[email protected]>
This patch intended to integrate the lttng-modules 2.0 package containing the kernel tracer modules.
LTTng-modules 2.0 is currently in pre-release (-pre11), so we have to update it when official released.
lttng-2.0 supports lttng-modules extra builds, which don't need any patches on Linux kernel vs the previous version of lttng. As described in README of lttng-modules-2.0, so far, it has been tested in the latest kernel on x86 32/64-bit, and powerpc 32-bit, , build tested on ARM. So does yocto kernel, the related tests on qemux86 and qemuppc has been validated and a build test on qemuarm passed too with this patcheset.
--- ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 41 ++++++++++++++++++++ .../lttng-2.0/lttng-modules_2.0.pre11.bb | 27 +++++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch create mode 100644 meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb
meta/recipes-kernel/lttng-2.0/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch new file +41 -0
@@ -0,0 +1,41 @@ +Upstream-Status: Inappropriate [embedded specific] + +lttng-modules: replace KERNELDIR with KERNEL_SRC + +Since lttng-modules uses the default way of module.bbclass to +build and install lttng-modules, we do this replacement for +it as-is. + +Signed-off-by: Zumeng Chen <[email protected]> +--- + Makefile | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 5ac13d7..25caad5 100644 +--- a/Makefile ++++ b/Makefile +@@ -38,17 +38,16 @@ obj-m += lib/ + endif + + else +- KERNELDIR ?= /lib/modules/$(shell uname -r)/build + PWD := $(shell pwd) + CFLAGS = $(EXTCFLAGS) + + default: +- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules ++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules + + modules_install: +- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install ++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install + + clean: +- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean ++ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean + + endif +-- +1.7.5.4 +
meta/recipes-kernel/lttng-2.0/lttng-modules_2.0.pre11.bb new file +27 -0
@@ -0,0 +1,27 @@ +SECTION = "devel" +SUMMARY = "Linux Trace Toolkit KERNEL MODULE" +DESCRIPTION = "The lttng-modules 2.0 package contains the kernel tracer modules" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1eb086682a7c65a45acd9bcdf6877b3e \ + file://gpl-2.0.txt;md5=751419260aa954499f7abaabaa882bbe \ + file://lgpl-2.1.txt;md5=243b725d71bb5df4a1e5920b344b86ad" + +DEPENDS = virtual/kernel + +inherit module + +SRCREV = "4d3e89e379fc66480d729abe8daa5c86eb585400" +PV = "2.0.pre11+git${SRCREV}" +PR = "r0" + +SRC_URI = "git://git.lttng.org/lttng-modules.git;protocol=git \ + file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch" + +export INSTALL_MOD_DIR="kernel/lttng-modules" + +S = "${WORKDIR}/git" + +# Due to liburcu not building for MIPS currently this recipe needs to +# be limited also. +# So here let us first suppport x86/arm/powerpc platforms now. +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 57/62] add mfatbu/mfatbl instructions support in Valgrind
In reply to Saul WoldFrom: Aneesh Bansal <[email protected]>
Upstream Status : Pending
--- ...upport-for-PPC-instructions-mfatbu-mfatbl.patch | 94 ++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 3 +- 2 files changed, 96 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/valgrind/valgrind-3.7.0/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch
meta/recipes-devtools/valgrind/valgrind-3.7.0/Added-support-for-PPC-instructions-mfatbu-mfatbl.patch new file +94 -0
@@ -0,0 +1,94 @@ +From 0bf4b0ac18d1ea41b32ad781d214b295ca1998f3 Mon Sep 17 00:00:00 2001 +From: Aneesh Bansal <[email protected]> +Date: Mon, 21 Nov 2011 17:31:39 +0530 +Subject: [PATCH] Added support for PPC instructions mfatbu, mfatbl. + +Signed-off-by: Aneesh Bansal <[email protected]> +--- +Currently Valgrind 3.7.0 does not have support for PPC instructions mfatbu and mfatbl. When we run a USDPAA application with VALGRIND, the following error is given by valgrind : +dis_proc_ctl(ppc)(mfspr,SPR)(0x20F) +disInstr(ppc): unhandled instruction: 0x7C0F82A6 + + + VEX/priv/guest_ppc_defs.h | 2 ++ + VEX/priv/guest_ppc_helpers.c | 18 ++++++++++++++++++ + VEX/priv/guest_ppc_toIR.c | 22 ++++++++++++++++++++++ + 3 files changed, 42 insertions(+), 0 deletions(-) + +diff --git a/VEX/priv/guest_ppc_defs.h b/VEX/priv/guest_ppc_defs.h +index dd3c62e..11a34aa 100644 +--- a/VEX/priv/guest_ppc_defs.h ++++ b/VEX/priv/guest_ppc_defs.h +@@ -146,6 +146,8 @@ extern UInt ppc32g_dirtyhelper_MFSPR_268_269 ( UInt ); + + extern UInt ppc32g_dirtyhelper_MFSPR_287 ( void ); + ++extern UInt ppc32g_dirtyhelper_MFSPR_526_527 ( UInt ); ++ + extern void ppc32g_dirtyhelper_LVS ( VexGuestPPC32State* gst, + UInt vD_idx, UInt sh, + UInt shift_right ); +diff --git a/VEX/priv/guest_ppc_helpers.c b/VEX/priv/guest_ppc_helpers.c +index 11aa428..b49ea3f 100644 +--- a/VEX/priv/guest_ppc_helpers.c ++++ b/VEX/priv/guest_ppc_helpers.c +@@ -119,6 +119,24 @@ UInt ppc32g_dirtyhelper_MFSPR_287 ( void ) + # endif + } + ++/* CALLED FROM GENERATED CODE */ ++/* DIRTY HELPER (non-referentially transparent) */ ++UInt ppc32g_dirtyhelper_MFSPR_526_527 ( UInt r527 ) ++{ ++# if defined(__powerpc__) || defined(_AIX) ++ UInt spr; ++ if (r527) { ++ __asm__ __volatile__("mfspr %0,527" : "=b"(spr)); ++ } else { ++ __asm__ __volatile__("mfspr %0,526" : "=b"(spr)); ++ } ++ return spr; ++# else ++ return 0; ++# endif ++} ++ ++ + + /* CALLED FROM GENERATED CODE */ + /* DIRTY HELPER (reads guest state, writes guest mem) */ +diff --git a/VEX/priv/guest_ppc_toIR.c b/VEX/priv/guest_ppc_toIR.c +index f8d220d..37c8974 100644 +--- a/VEX/priv/guest_ppc_toIR.c ++++ b/VEX/priv/guest_ppc_toIR.c +@@ -5657,6 +5657,28 @@ static Bool dis_proc_ctl ( VexAbiInfo* vbi, UInt theInstr ) + break; + } + ++ ++ case 526 /* 0x20E */: ++ case 527 /* 0x20F */: { ++ UInt arg = SPR==526 ? 0 : 1; ++ IRTemp val = newTemp(Ity_I32); ++ IRExpr** args = mkIRExprVec_1( mkU32(arg) ); ++ IRDirty* d = unsafeIRDirty_1_N( ++ val, ++ 0/*regparms*/, ++ "ppc32g_dirtyhelper_MFSPR_526_527", ++ fnptr_to_fnentry ++ (vbi, &ppc32g_dirtyhelper_MFSPR_526_527), ++ args ++ ); ++ /* execute the dirty call, dumping the result in val. */ ++ stmt( IRStmt_Dirty(d) ); ++ putIReg( rD_addr, ++ mkWidenFrom32(ty, mkexpr(val), False/*unsigned*/) ); ++ DIP("mfspr r%u,%u", rD_addr, (UInt)SPR); ++ break; ++ } ++ + default: + vex_printf("dis_proc_ctl(ppc)(mfspr,SPR)(0x%x)\n", SPR); + return False; +-- +1.7.0.4
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb +2 -1
@@ -14,7 +14,8 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://fix_unsupporting_kernel_3.patch \ file://fixed-perl-path.patch \ file://fix_for_automake_1.11.2.patch \ - file://configure-fix.patch" + file://configure-fix.patch \ + file://Added-support-for-PPC-instructions-mfatbu-mfatbl.patch" SRC_URI[md5sum] = "a855fda56edf05614f099dca316d1775" SRC_URI[sha256sum] = "5d62c0330f1481fe2c593249192fa68ff454c19c34343978cc9ce91aa324cbf6"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 56/62] babeltrace: Integrated from version 0.8
In reply to Saul WoldFrom: Zumeng Chen <[email protected]>
It provides trace read and write libraries, as well as a trace converter.
--- meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb | 28 +++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb
meta/recipes-kernel/lttng-2.0/babeltrace_0.8.bb new file +28 -0
@@ -0,0 +1,28 @@ +SUMMARY = "Babeltrace - Trace Format Babel Tower" +DESCRIPTION = "Babeltrace provides trace read and write libraries in host side, as well as a trace converter, which used to convert LTTng 2.0 traces into human-readable log." +HOMEPAGE = "http://www.efficios.com/babeltrace/" +BUGTRACKER = "n/a" + +LICENSE = "MIT & GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8d1a03b3c17bdd158b3cbb34813b1423" + +inherit autotools + +DEPENDS = "gtk+ util-linux" + +SRCREV = "efc5077568403009493d1d72e94f292838825e51" +PV = "0.8+git${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.efficios.com/babeltrace.git;protocol=git" + +S = "${WORKDIR}/git" + +do_configure_prepend () { + ${S}/bootstrap +} + +# Due to liburcu not building for MIPS currently this recipe needs to +# be limited also. +# So here let us first suppport x86/arm/powerpc platforms now. +COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|powerpc.*)-linux'
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 58/62] valgrind: Update for eglibc 2.15
In reply to Saul Wold--- .../valgrind/valgrind-3.7.0/configure-fix.patch | 25 ++++++++++++++++--- meta/recipes-devtools/valgrind/valgrind_3.7.0.bb | 2 +- 2 files changed, 22 insertions(+), 5 deletions(-)
meta/recipes-devtools/valgrind/valgrind-3.7.0/configure-fix.patch +21 -4
@@ -1,13 +1,16 @@ To recognize gcc version from poky in configure.in +Added GLIBC 2.15 stanza to supported GLIBCs Upstream-Status: Inappropriate [configuration] Signed-off-by: Shane Wang <[email protected]> +Signed-off-by: Saul Wold <[email protected]> -diff -r 91a8df96084a configure.in ---- a/configure.in Fri Dec 23 20:57:01 2011 +0800 -+++ b/configure.in Fri Dec 23 20:59:21 2011 +0800 -@@ -104,11 +104,13 @@ +Index: valgrind-3.7.0/configure.in +=================================================================== +--- valgrind-3.7.0.orig/configure.in ++++ valgrind-3.7.0/configure.in +@@ -104,11 +104,13 @@ AC_MSG_CHECKING([for a supported version # # i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3) # i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
@@ -21,3 +24,17 @@ diff -r 91a8df96084a configure.in | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`] is_clang="notclang" +@@ -779,6 +781,13 @@ case "${GLIBC_VERSION}" in + DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" + DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" + ;; ++ 2.15) ++ AC_MSG_RESULT(2.15 family) ++ AC_DEFINE([GLIBC_2_15], 1, [Define to 1 if you're using glibc 2.15.x]) ++ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" ++ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" ++ ;; + darwin) + AC_MSG_RESULT(Darwin) + AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
meta/recipes-devtools/valgrind/valgrind_3.7.0.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \ file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \ file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" DEPENDS = "virtual/libx11" -PR = "r2" +PR = "r3" SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://fix_issue_caused_by_ccache.patch \
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 60/62] tcl: PR bump for eglibc update
In reply to Saul Wold--- meta/recipes-devtools/tcltk/tcl_8.5.11.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/tcltk/tcl_8.5.11.bb +1 -1
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \ " -PR = "r2" +PR = "r3" BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch"
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 59/62] python: PR bump for eglibc update
In reply to Saul Wold--- meta/recipes-devtools/python/python_2.7.2.bb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/python/python_2.7.2.bb +1 -1
@@ -1,7 +1,7 @@ require python.inc DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = ""
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 62/62] openssl-1.0.0: Update to 1.0.0e and fix QA Warning
In reply to Saul Woldhttp://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4108
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4576
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4577
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4619
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-0027
[YOCTO #1905]
---
.../configure-targets.patch | 0
.../debian/c_rehash-compat.patch | 0
.../debian/ca.patch | 0
.../debian/debian-targets.patch | 0
.../debian/make-targets.patch | 0
.../debian/man-dir.patch | 0
.../debian/man-section.patch | 0
.../debian/no-rpath.patch | 0
.../debian/no-symbolic.patch | 0
.../debian/pic.patch | 0
.../debian/pkg-config.patch | 0
.../debian/version-script.patch | 0
.../engines-install-in-libdir-ssl.patch | 0
.../oe-ldflags.patch | 0
.../openssl-fix-link.patch | 0
.../openssl_fix_for_x32.patch | 0
.../shared-libs.patch | 0
.../{openssl_1.0.0e.bb => openssl_1.0.0f.bb} | 8 ++++----
18 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/c_rehash-compat.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/make-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/pkg-config.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/debian/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/engines-install-in-libdir-ssl.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/oe-ldflags.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/openssl-fix-link.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/openssl_fix_for_x32.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-1.0.0e => openssl-1.0.0f}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl_1.0.0e.bb => openssl_1.0.0f.bb} (84%)meta/recipes-connectivity/openssl/openssl-1.0.0f/configure-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/configure-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/c_rehash-compat.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/c_rehash-compat.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/ca.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/ca.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/debian-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/debian-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/make-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/make-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-dir.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-dir.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/man-section.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/man-section.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-rpath.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-rpath.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/no-symbolic.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/no-symbolic.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pic.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pic.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/pkg-config.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/pkg-config.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/debian/version-script.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/debian/version-script.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/engines-install-in-libdir-ssl.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/engines-install-in-libdir-ssl.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/oe-ldflags.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/oe-ldflags.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl-fix-link.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl-fix-link.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/openssl_fix_for_x32.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch +0 -0
meta/recipes-connectivity/openssl/openssl-1.0.0f/shared-libs.patch renamed from meta/recipes-connectivity/openssl/openssl-1.0.0e/shared-libs.patch +0 -0
meta/recipes-connectivity/openssl/openssl_1.0.0f.bb renamed from meta/recipes-connectivity/openssl/openssl_1.0.0e.bb +4 -4
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux" CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" -PR = "${INC_PR}.2" +PR = "${INC_PR}.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
@@ -32,15 +32,15 @@ SRC_URI += "file://configure-targets.patch \ file://openssl_fix_for_x32.patch \ " -SRC_URI[md5sum] = "7040b89c4c58c7a1016c0dfa6e821c86" -SRC_URI[sha256sum] = "e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7" +SRC_URI[md5sum] = "e358705fb4a8827b5e9224a73f442025" +SRC_URI[sha256sum] = "faf1eab0ef85fd6c3beca271c356b31b5cc831e2c6b7f23cf672e7ab4680fde1" PACKAGES =+ " \ ${PN}-engines \ ${PN}-engines-dbg \ " -FILES_${PN}-engines = "${libdir}/ssl/engines/*.so" +FILES_${PN}-engines = "${libdir}/ssl/engines/*.so ${libdir}/engines" FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug" PARALLEL_MAKEINST = ""
Signature · 1 line
1.7.6.5
[CONSOLIDATED PULL 61/62] openssl-0.9.8: Update to 0.9.8s
In reply to Saul Woldhttp://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4108
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4109
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4576
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4577
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-4619
[YOCTO #1904]
---
.../configure-targets.patch | 0
.../debian/ca.patch | 0
.../debian/config-hurd.patch | 0
.../debian/debian-targets.patch | 0
.../debian/engines-path.patch | 0
.../debian/kfreebsd-pipe.patch | 0
.../debian/make-targets.patch | 0
.../debian/man-dir.patch | 0
.../debian/man-section.patch | 0
.../debian/no-rpath.patch | 0
.../debian/no-symbolic.patch | 0
.../debian/perl-path.diff | 0
.../debian/pic.patch | 0
.../debian/pkg-config.patch | 0
.../debian/rc4-amd64.patch | 0
.../debian/rehash-crt.patch | 0
.../debian/rehash_pod.patch | 0
.../debian/series | 0
.../debian/shared-lib-ext.patch | 0
.../debian/stddef.patch | 0
.../debian/version-script.patch | 0
.../parallel-make-fix.patch | 0
.../shared-libs.patch | 0
.../{openssl_0.9.8r.bb => openssl_0.9.8s.bb} | 8 ++++----
24 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/configure-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/ca.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/config-hurd.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/debian-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/engines-path.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/kfreebsd-pipe.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/make-targets.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/man-dir.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/man-section.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/no-rpath.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/no-symbolic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/perl-path.diff (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/pic.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/pkg-config.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/rc4-amd64.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/rehash-crt.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/rehash_pod.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/series (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/shared-lib-ext.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/stddef.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/debian/version-script.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/parallel-make-fix.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl-0.9.8r => openssl-0.9.8s}/shared-libs.patch (100%)
rename meta/recipes-connectivity/openssl/{openssl_0.9.8r.bb => openssl_0.9.8s.bb} (87%)meta/recipes-connectivity/openssl/openssl-0.9.8s/configure-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/configure-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/ca.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/ca.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/config-hurd.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/config-hurd.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/debian-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/debian-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/engines-path.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/engines-path.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/kfreebsd-pipe.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/kfreebsd-pipe.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/make-targets.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/make-targets.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/man-dir.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-dir.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/man-section.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/man-section.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/no-rpath.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-rpath.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/no-symbolic.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/no-symbolic.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/perl-path.diff renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/perl-path.diff +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/pic.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pic.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/pkg-config.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/pkg-config.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rc4-amd64.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rc4-amd64.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash-crt.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash-crt.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/rehash_pod.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/rehash_pod.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/series renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/series +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/shared-lib-ext.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/shared-lib-ext.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/stddef.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/stddef.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/debian/version-script.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/debian/version-script.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/parallel-make-fix.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/parallel-make-fix.patch +0 -0
meta/recipes-connectivity/openssl/openssl-0.9.8s/shared-libs.patch renamed from meta/recipes-connectivity/openssl/openssl-0.9.8r/shared-libs.patch +0 -0
meta/recipes-connectivity/openssl/openssl_0.9.8s.bb renamed from meta/recipes-connectivity/openssl/openssl_0.9.8r.bb +4 -4
@@ -1,6 +1,6 @@ require openssl.inc -PR = "r7" +PR = "r0" SRC_URI += "file://debian/ca.patch \ file://debian/config-hurd.patch;apply=no \ file://debian/debian-targets.patch \
@@ -21,11 +21,11 @@ SRC_URI += "file://debian/ca.patch \ file://debian/version-script.patch \ file://debian/perl-path.diff" -SRC_URI[md5sum] = "0352932ea863bc02b056cda7c9ac5b79" -SRC_URI[sha256sum] = "42b2368f786b05ed3be846838dce126b4e8e3dba8fb2e0ce83102df28c102fad" - SRC_URI += "file://configure-targets.patch \ file://shared-libs.patch \ file://parallel-make-fix.patch" +SRC_URI[md5sum] = "fbf71e8e050bc1ec290b7468bab1a76e" +SRC_URI[sha256sum] = "edc9639beaf2d5e239d8e5c9d2fe1959e6726a5d7f8ab8430613835f4623f9ba" + BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.6.5
Re: [CONSOLIDATED PULL 52/62] tcmode-eglibc: Fix PREFERRED_VERSION of eglibc
In reply to Saul WoldQuoted 10 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>--- meta/conf/distro/include/tcmode-default.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)meta/conf/distro/include/tcmode-default.inc +0
-0
meta/conf/distro/include/tcmode-default.inc PREFERRED_PROVIDER_virtual/gettext ??= "gettext" · line 25
Quoted 8 lines
meta/conf/distro/include/tcmode-default.inc +1
-1@@ -19,7 +19,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext" GCCVERSION ?= "4.6%" SDKGCCVERSION ?= "4.6%" BINUVERSION ?= "2.22" -EGLIBCVERSION ?= "2.13" +EGLIBCVERSION ?= "2.15" UCLIBCVERSION ?= "0.9.32" LINUXLIBCVERSION ?= "3.1"
We deliberately stayed on 2.13 for various reasons. Have those reasons changed now? If so I'd prefer to see this as a definite change rather than a "fix"...
Cheers,
Richard
Re: [CONSOLIDATED PULL 57/62] add mfatbu/mfatbl instructions support in Valgrind
In reply to Saul WoldQuoted 3 lines · Saul Wold
From: Aneesh Bansal <[email protected]>
Upstream Status : Pending
This commit message isn't in the correct style and the Upstream-Status is in the wrong place. I've corrected it this time but please fix this in future patches.
Cheers,
Richard
Hi Saul,
Quoted 8 lines · Saul Wold
The following changes since commit
91e17c0c0ac2330f826b95e762542cd0d0c82385:pango: Use gnomebase class, not gnome (2012-01-16 18:01:31 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Quoted 5 lines
Andrei Gherzan (1):
wpa-supplicant: Compile withoutCONFIG_GNUTLS_EXTRA(PR BUMP)Aneesh Bansal (1):
add mfatbu/mfatbl instructions support in Valgrind
I've commented on the mailing list about the commit message and patch headers in this. I've taken it and fixed up the issues.
Quoted 66 lines
Bruce Ashfield (1):
linux-yocto: consolidated fix SRCREV updatesChristopher Larson (5):
ncurses-native: install to libdir, notbase_libdir
copyleft_compliance: add control of recipe types to include
copyleft_compliance: add debug message with the reason for exclusion oe.license: addis_includedconvenience function oe.license: avoid the need to catch SyntaxErrorColin Walters (1):
libtool: Put all libltdl headers in the correct libltdl-dev packageDarren Hart (1):
bootimg: Account for FAT filesystem overhead in image sizeDenis 'GNUtoo' Carikli (1):
alsa-utils: depend on libsamplerate0Enrico Scholz (2):
package.bbclass: quote pathname given to objdump bitbake.conf: search /lib for -native buildsJames Limbouris (1):
ghostscript: build cups filtersJoshua Lock (4):
task-base: move default definition of VIRTUAL-RUNTIME_apm
alsa-state: add alsa-state from oe classic
alsa-state: move state files to localstatedir
task-base: add VIRTUAL-RUNTIME_alsa-state to task-base-alsaLiming Wang (4):
qemuppc: replace emulation of qemuppc from prep to mac99
qemuppc: add pointercal file
qemuppc: add machconfig
tslib: enable big endian support for qemuppcMark Hatle (1):
prelink: Update to latest versionMartin Jansa (2):
xorg-*: disable xmlto where it was failing dbus-1.4.16: useINC_PRfrom dbus.inc to fix PR bump after
dbus-launch-helper permission changeMatthew McClintock (2):
image_types.bbclass: Fix generating uncompressed ext2 images image_types_uboot.bbclass: Add uncompressed ext2 image optionNitin A Kamble (7):
locale: fix package's "provides" tag
diffstat: upgrade from 1.54 to 1.55
insane.bbclass: fix elf.arch not matching error for x32 kernel
libpcre: upgrade from 8.20 to 8.21
btrfs-tools: upgrade to newer git commit
distro_tracking: updatemanual_check_datefields
grub-efi-native: fix errors with automake 1.11.2Paul Eggleton (4):
classes/base: note variable name in COMPATIBLE_* skip messagesconf/bitbake.conf: allow wget to output error messages classes/package: remove out-of-date notice referring to the OE
bugtracker
classes/packagehistory: remove now obsolete class
Quoted 5 lines
Saul Wold (7):
m4: refactor .bb and .inc files
valgrind: Update for eglibc 2.15
openssl-0.9.8: Update to 0.9.8s
openssl-1.0.0: Update to 1.0.0e and fix QA Warning
I took all the above.
Quoted 3 lines
tcmode-eglibc: Fix
PREFERRED_VERSIONof eglibc
python: PR bump for eglibc update
tcl: PR bump for eglibc update
I didn't take these since I'd like to make a more concious decision about our eglibc version. (I left the valgrind 2.15 patch since its acceptable now).
Quoted 8 lines
Scott Garman (3):
libpam: upgrade to 1.1.5
e2fsprogs: upgrade to 1.42
distro_tracking: recipe upgrades and manual check infoShane Wang (2):
stat: add recipe stat with version 3.3
hdparm: upgrade to 9.37
I took the above.
Quoted 6 lines
Tom Zanussi (5):
base.bbclass: add support forLICENSE_FLAGS
AddLICENSE_FLAGSto packages mentioned inCOMMERCIAL_LICENSEbase.bbclass: removeCOMMERCIAL_LICENSEcode default-distrovars.inc: removeCOMMERCIAL_LICENSEet aldocumentation-audit.sh: removeCOMMERCIAL_LICENSEwarning
I've held on these as I want to give it a little more thought. I do approve of sorting this out, I'm just wondering if we there are any tweaks we can give the mechanism.
Quoted 8 lines
Xiaofeng Yan (1):
distro_tracking_fields.inc: Modify the status of eds-tools and
mingettyZhai Edwin (2):
distro-tracking: Update info for webkit-gtk, web-webkit
runqemu: Fix the wrong path of libGL.so in 64b Ubuntu 11.10
Quoted 5 lines
Zumeng Chen (4):
lttng-ust: Update to 2.0
lttng-tools: Update to 2.0-pre16
lttng-modules: Update to 2.0
babeltrace: Integrated from version 0.8
I took the above.
Cheers,
Richard
Quoted 7 lines · Saul Wold
I have test build this grouping of changes and theyseem good to me at this point. One issue is with the linux-yocto change set from Bruce seems to introduce a problem with compile perf on some hardware Machine settings.
The openssl changes will need to be backported to 1.1.1, which Joshua is aware of.
Well, I am now...
Joshua
Signature · 3 lines
Joshua Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology CentreRe: [CONSOLIDATED PULL 18/62] qemuppc: replace emulation of qemuppc from prep to mac99
In reply to Saul WoldQuoted 6 lines · Saul Wold
From: Liming Wang <[email protected]>
With this new emulation, existing qemuppc functionality is maintained and other functionality such as framebuffer + sato and NFS boot are added.
We currently tune for 603e when we choose qemuppc machine is that still valid core for G4 cpu ? I think from gcc point of view it should now use -m7400 so may be add another tune-file to oe-core
Quoted 117 lines
Signed-off-by Liming Wang <[email protected]>Signed-off-by Bruce Ashfield <[email protected]>---
meta/conf/machine/qemuppc.conf | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-scripts/runqemu| 7 +------scripts/runqemu-internal| 16 ++++++++--------5 files changed, 12 insertions(+), 17 deletions(-)meta/conf/machine/qemuppc.conf +0
-0@@ -5,7 +5,7 @@require conf/machine/include/qemu.inc
require conf/machine/include/tune-ppc603e.incmeta/conf/machine/qemuppc.conf +1
-1-KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "vmlinux"SERIAL_CONSOLE = "115200 ttyS0"
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +0
-0@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"SRCREV_machine ?= "
bcf4107c7f22d10952618a2ad146e6149d240cd2"SRCREV_machine_qemuppc?= "1e5511ea2cb5f150ffce86071035a81c0499494b"meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1
-1-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"meta/recipes-kernel/linux/linux-yocto_3.0.bb +0
-0@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476"SRCREV_machine_qemux86 ?= "
e04f9f8e564c60b1ce907d64074c18730f8dab4e" SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"SRCREV_machine?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"meta/recipes-kernel/linux/linux-yocto_3.0.bb +1
-1-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"scripts/runqemu +0
-0@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
QEMUMIPS_DEFAULT_FSTYPE=ext3scripts/runqemu +1
-1-QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin +QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.binQEMUPPC_DEFAULT_FSTYPE=ext3
AKITA_DEFAULT_KERNEL=zImage-akita.bin
scripts/runqemu +0
-0@@ -365,11 +365,6 @@ if [ -z "$FSTYPE" ]; thenfi
fiscripts/runqemu +0
-5-if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then - echo "Error: usermode NFS boot is not available for qemuppc." - exit 1 -fi -# FSTYPE is now set for all cases
# Handle cases where a ROOTFS type is given instead of a filename, e.g.
scripts/runqemu-internal +0
-0@@ -389,13 +389,13 @@ fiif [ "$MACHINE" = "qemuppc" ]; then
QEMU=qemu-system-ppc
- MACHINE_SUBTYPE=prep
- CPU_SUBTYPE=603e
- BIOS=powerpc_rom.bin
- QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic"
+ MACHINE_SUBTYPE=mac99
+ CPU_SUBTYPE=G4
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+ QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
- KERNCMDLINE="root=/dev/hda rw console=ttyS0 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
+ KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" fi
if [ "$FSTYPE" = "nfs" ]; then
if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; thenscripts/runqemu-internal +0
-0@@ -403,8 +403,8 @@ if [ "$MACHINE" = "qemuppc" ]; thencleanup
return
fi
- KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS"
+ KERNCMDLINE="root=/dev/nfs console=ttyS0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS"
fi
fi--
1.7.6.5_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [CONSOLIDATED PULL 18/62] qemuppc: replace emulation of qemuppc from prep to mac99
Quoted 11 lines · Khem Raj
Quoted 6 lines · Saul Wold
From: Liming Wang <[email protected]>
With this new emulation, existing qemuppc functionality is maintained and other functionality such as framebuffer + sato and NFS boot are added.
We currently tune for 603e when we choose qemuppc machine is that still valid core for G4 cpu ? I think from gcc point of view it should now use -m7400 so may be add another tune-file to oe-core
That was the plan, to fix the tuning of this and the other PPC reference boards at the same time. Liming and I had discussed this before, and we wanted to get this into the tree, and tweak it there.
Liming: we can open a bug to track the update of the tuning .. just so we don't forget.
Cheers,
Bruce
Quoted 123 lines
Quoted 110 lines
Signed-off-by Liming Wang <[email protected]>Signed-off-by Bruce Ashfield <[email protected]>---
meta/conf/machine/qemuppc.conf | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-scripts/runqemu| 7 +------scripts/runqemu-internal| 16 ++++++++--------5 files changed, 12 insertions(+), 17 deletions(-)meta/conf/machine/qemuppc.conf +0
-0@@ -5,7 +5,7 @@require conf/machine/include/qemu.inc
require conf/machine/include/tune-ppc603e.incmeta/conf/machine/qemuppc.conf +1
-1-KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "vmlinux"SERIAL_CONSOLE = "115200 ttyS0"
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +0
-0@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"SRCREV_machine ?= "
bcf4107c7f22d10952618a2ad146e6149d240cd2"SRCREV_machine_qemuppc?= "1e5511ea2cb5f150ffce86071035a81c0499494b"meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1
-1-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"meta/recipes-kernel/linux/linux-yocto_3.0.bb +0
-0@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476"SRCREV_machine_qemux86 ?= "
e04f9f8e564c60b1ce907d64074c18730f8dab4e" SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"SRCREV_machine?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"meta/recipes-kernel/linux/linux-yocto_3.0.bb +1
-1-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"scripts/runqemu +0
-0@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
QEMUMIPS_DEFAULT_FSTYPE=ext3scripts/runqemu +1
-1-QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin +QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.binQEMUPPC_DEFAULT_FSTYPE=ext3
AKITA_DEFAULT_KERNEL=zImage-akita.bin
scripts/runqemu +0
-0@@ -365,11 +365,6 @@ if [ -z "$FSTYPE" ]; thenfi
fiscripts/runqemu +0
-5-if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then - echo "Error: usermode NFS boot is not available for qemuppc." - exit 1 -fi -# FSTYPE is now set for all cases
# Handle cases where a ROOTFS type is given instead of a filename, e.g.
scripts/runqemu-internal +0
-0@@ -389,13 +389,13 @@ fiif [ "$MACHINE" = "qemuppc" ]; then
QEMU=qemu-system-ppc
- MACHINE_SUBTYPE=prep
- CPU_SUBTYPE=603e
- BIOS=powerpc_rom.bin
- QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic"
+ MACHINE_SUBTYPE=mac99
+ CPU_SUBTYPE=G4
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+ QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
- KERNCMDLINE="root=/dev/hda rw console=ttyS0 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
+ KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" fi
if [ "$FSTYPE" = "nfs" ]; then
if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; thenscripts/runqemu-internal +0
-0@@ -403,8 +403,8 @@ if [ "$MACHINE" = "qemuppc" ]; thencleanup
return
fi
- KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS"
+ KERNCMDLINE="root=/dev/nfs console=ttyS0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS"
fi
fiQuoted 8 lines
--
1.7.6.5_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [CONSOLIDATED PULL 18/62] qemuppc: replace emulation of qemuppc from prep to mac99
Quoted 11 lines · Bruce Ashfield
Quoted 10 lines · Khem Raj
Quoted 6 lines · Saul Wold
From: Liming Wang<[email protected]>
With this new emulation, existing qemuppc functionality is maintained and other functionality such as framebuffer + sato and NFS boot are added.
We currently tune for 603e when we choose qemuppc machine is that still valid core for G4 cpu ? I think from gcc point of view it should now use -m7400 so may be add another tune-file to oe-core
Quoted 6 lines
That was the plan, to fix the tuning of this and the other PPC reference boards at the same time. Liming and I had discussed this before, and we wanted to get this into the tree, and tweak it there.
Liming: we can open a bug to track the update of the tuning .. just so we don't forget.
OK, Bug 1914 - modify the tune files of ppc targets is opened.
Liming Wang
Quoted 128 lines
Cheers,
Bruce
Quoted 121 lines
Quoted 113 lines
Signed-off-by Liming Wang<[email protected]>Signed-off-by Bruce Ashfield<[email protected]>--- meta/conf/machine/qemuppc.conf | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +- scripts/runqemu | 7 +------ scripts/runqemu-internal | 16 ++++++++-------- 5 files changed, 12 insertions(+), 17 deletions(-)meta/conf/machine/qemuppc.conf +1
-1@@ -5,7 +5,7 @@ require conf/machine/include/qemu.inc require conf/machine/include/tune-ppc603e.inc -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "vmlinux" SERIAL_CONSOLE = "115200 ttyS0"meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1
-1@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt" SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2" SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b" -SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r1" PV = "${LINUX_VERSION}+git${SRCPV}"meta/recipes-kernel/linux/linux-yocto_3.0.bb +1
-1@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476" SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e" SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b" SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf" -SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r2" PV = "${LINUX_VERSION}+git${SRCPV}"scripts/runqemu +1
-6@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3 QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin QEMUMIPS_DEFAULT_FSTYPE=ext3 -QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin +QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin QEMUPPC_DEFAULT_FSTYPE=ext3 AKITA_DEFAULT_KERNEL=zImage-akita.bin@@ -365,11 +365,6 @@ if [ -z "$FSTYPE" ]; then fi fi -if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then - echo "Error: usermode NFS boot is not available for qemuppc." - exit 1 -fi - # FSTYPE is now set for all cases # Handle cases where a ROOTFS type is given instead of a filename, e.g.scripts/runqemu-internal +8
-9@@ -389,13 +389,13 @@ fi if [ "$MACHINE" = "qemuppc" ]; then QEMU=qemu-system-ppc - MACHINE_SUBTYPE=prep - CPU_SUBTYPE=603e - BIOS=powerpc_rom.bin - QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic" + MACHINE_SUBTYPE=mac99 + CPU_SUBTYPE=G4 + QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" + QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD" if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then - KERNCMDLINE="root=/dev/hda rw console=ttyS0 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" - QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" + KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" + QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" fi if [ "$FSTYPE" = "nfs" ]; then if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then@@ -403,8 +403,8 @@ if [ "$MACHINE" = "qemuppc" ]; then cleanup return fi - KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" - QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS" + KERNCMDLINE="root=/dev/nfs console=ttyS0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" + QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS" fi fi --1.7.6.5
Quoted 4 lines
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [CONSOLIDATED PULL 18/62] qemuppc: replace emulation of qemuppc from prep to mac99
Quoted 23 lines · Liming Wang
Quoted 22 lines · Bruce Ashfield
Quoted 5 lines · Khem Raj
Quoted 3 lines · Saul Wold
From: Liming Wang<[email protected]>
Quoted 8 lines
Quoted 4 lines
With this new emulation, existing qemuppc functionality is maintained and other functionality such as framebuffer + sato and NFS boot are added.
We currently tune for 603e when we choose qemuppc machine is that still valid
core for G4 cpu ? I think from gcc point of view it should now use -m7400 so may be add another tune-file to oe-coreThat was the plan, to fix the tuning of this and the other PPC reference boards
at the same time. Liming and I had discussed this before, and we wanted to get
this into the tree, and tweak it there.
Quoted 5 lines
Quoted 3 lines
Liming: we can open a bug to track the update of the tuning .. just so we don't
forget.OK, Bug 1914 - modify the tune files of ppc targets is opened.
Thanks!
Bruce
Quoted 148 lines
Liming Wang
Quoted 144 lines
Cheers,
Bruce
Quoted 136 lines
Quoted 123 lines
Signed-off-by Liming Wang<[email protected]>Signed-off-by Bruce Ashfield<[email protected]>---
meta/conf/machine/qemuppc.conf | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-scripts/runqemu| 7 +------scripts/runqemu-internal| 16 ++++++++--------5 files changed, 12 insertions(+), 17 deletions(-)meta/conf/machine/qemuppc.conf +0
-0@@ -5,7 +5,7 @@require conf/machine/include/qemu.inc
require conf/machine/include/tune-ppc603e.incmeta/conf/machine/qemuppc.conf +1
-1-KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "vmlinux"SERIAL_CONSOLE = "115200 ttyS0"
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +0
-0@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"SRCREV_machine ?= "
bcf4107c7f22d10952618a2ad146e6149d240cd2"SRCREV_machine_qemuppc?= "1e5511ea2cb5f150ffce86071035a81c0499494b"meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1
-1-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"meta/recipes-kernel/linux/linux-yocto_3.0.bb +0
-0@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?="
10e808d1c304b14cf42903fd637f239766b78476"SRCREV_machine_qemux86?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e" SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b"SRCREV_machine?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf"meta/recipes-kernel/linux/linux-yocto_3.0.bb +1
-1-SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"scripts/runqemu +0
-0@@ -262,7 +262,7 @@ QEMUARM_DEFAULT_FSTYPE=ext3QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
QEMUMIPS_DEFAULT_FSTYPE=ext3scripts/runqemu +1
-1-QEMUPPC_DEFAULT_KERNEL=zImage-qemuppc.bin +QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.binQEMUPPC_DEFAULT_FSTYPE=ext3
AKITA_DEFAULT_KERNEL=zImage-akita.bin
scripts/runqemu +0
-0@@ -365,11 +365,6 @@ if [ -z "$FSTYPE" ]; thenfi
fiscripts/runqemu +0
-5-if [ "$FSTYPE" = "nfs" -a "$MACHINE" = "qemuppc" ]; then - echo "Error: usermode NFS boot is not available for qemuppc." - exit 1 -fi -# FSTYPE is now set for all cases
# Handle cases where a ROOTFS type is given instead of a filename, e.g.
scripts/runqemu-internal +0
-0@@ -389,13 +389,13 @@ fiif [ "$MACHINE" = "qemuppc" ]; then
QEMU=qemu-system-ppc
- MACHINE_SUBTYPE=prep
- CPU_SUBTYPE=603e
- BIOS=powerpc_rom.bin
- QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic"
+ MACHINE_SUBTYPE=mac99
+ CPU_SUBTYPE=G4
+ QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+ QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD" if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
- KERNCMDLINE="root=/dev/hda rw console=ttyS0 3 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
+ KERNCMDLINE="root=/dev/hda rw console=ttyS0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" fi
if [ "$FSTYPE" = "nfs" ]; then
if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; thenscripts/runqemu-internal +0
-0@@ -403,8 +403,8 @@ if [ "$MACHINE" = "qemuppc" ]; thencleanup
return
fi
- KERNCMDLINE="root=/dev/nfs console=ttyS0 3 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -no-reboot $QEMU_UI_OPTIONS"
+ KERNCMDLINE="root=/dev/nfs console=ttyS0 nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS"
fi
fiQuoted 8 lines
--
1.7.6.5_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"