From 83cb9a11a2b04f954575bf4f2bc35d0d1743c393 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 17 May 2009 00:41:05 +0100 Subject: linux-kirkwood_2.6.29.2.bb : add CPUIDLE support so hopefully we waste less power while idle --- .../0001--ARM-Kirkwood-CPU-idle-driver.patch | 162 +++++++++++++++++++++ ...wood-peripherals-clock-gating-for-power-m.patch | 131 +++++++++++++++++ recipes/linux/linux-kirkwood/defconfig | 6 +- recipes/linux/linux-kirkwood_2.6.29.2.bb | 2 + 4 files changed, 299 insertions(+), 2 deletions(-) create mode 100644 recipes/linux/linux-kirkwood/0001--ARM-Kirkwood-CPU-idle-driver.patch create mode 100644 recipes/linux/linux-kirkwood/0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch (limited to 'recipes') diff --git a/recipes/linux/linux-kirkwood/0001--ARM-Kirkwood-CPU-idle-driver.patch b/recipes/linux/linux-kirkwood/0001--ARM-Kirkwood-CPU-idle-driver.patch new file mode 100644 index 0000000000..29e7851c7f --- /dev/null +++ b/recipes/linux/linux-kirkwood/0001--ARM-Kirkwood-CPU-idle-driver.patch @@ -0,0 +1,162 @@ +From 286f96f0b2e1ee5a124effba59a01f8d4bf69ddf Mon Sep 17 00:00:00 2001 +From: Rabeeh Khoury +Date: Tue, 24 Mar 2009 16:10:15 +0200 +Subject: [PATCH] [ARM] Kirkwood: CPU idle driver + +The patch adds support for Kirkwood cpu idle. +Two idle states are defined: +1. Wait-for-interrupt (replacing default kirkwood wfi) +2. Wait-for-interrupt and DDR self refresh + +Signed-off-by: Rabeeh Khoury +Signed-off-by: Nicolas Pitre +--- + arch/arm/configs/kirkwood_defconfig | 4 +- + arch/arm/mach-kirkwood/Makefile | 2 + + arch/arm/mach-kirkwood/cpuidle.c | 96 ++++++++++++++++++++++++ + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 + + 4 files changed, 102 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-kirkwood/cpuidle.c + +diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig +index c367ae4..a99b3eb 100644 +--- a/arch/arm/configs/kirkwood_defconfig ++++ b/arch/arm/configs/kirkwood_defconfig +@@ -263,7 +263,9 @@ CONFIG_CMDLINE="" + # + # CPU Power Management + # +-# CONFIG_CPU_IDLE is not set ++CONFIG_CPU_IDLE=y ++CONFIG_CPU_IDLE_GOV_LADDER=y ++CONFIG_CPU_IDLE_GOV_MENU=y + + # + # Floating point emulation +diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile +index 8f03c9b..f21f35d 100644 +--- a/arch/arm/mach-kirkwood/Makefile ++++ b/arch/arm/mach-kirkwood/Makefile +@@ -5,3 +5,5 @@ obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o + obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o + obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o + obj-$(CONFIG_MACH_TS219) += ts219-setup.o ++ ++obj-$(CONFIG_CPU_IDLE) += cpuidle.o +diff --git a/arch/arm/mach-kirkwood/cpuidle.c b/arch/arm/mach-kirkwood/cpuidle.c +new file mode 100644 +index 0000000..43052c7 +--- /dev/null ++++ b/arch/arm/mach-kirkwood/cpuidle.c +@@ -0,0 +1,96 @@ ++/* ++ * arch/arm/mach-kirkwood/cpuidle.c ++ * ++ * CPU idle Marvell Kirkwood SoCs ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ * ++ * The cpu idle uses wait-for-interrupt and DDR self refresh in order ++ * to implement two idle states - ++ * #1 wait-for-interrupt ++ * #2 wait-for-interrupt and DDR self refresh ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define KIRKWOOD_MAX_STATES 2 ++ ++static struct cpuidle_driver kirkwood_idle_driver = { ++ .name = "kirkwood_idle", ++ .owner = THIS_MODULE, ++}; ++ ++static DEFINE_PER_CPU(struct cpuidle_device, kirkwood_cpuidle_device); ++ ++/* Actual code that puts the SoC in different idle states */ ++static int kirkwood_enter_idle(struct cpuidle_device *dev, ++ struct cpuidle_state *state) ++{ ++ struct timeval before, after; ++ int idle_time; ++ ++ local_irq_disable(); ++ do_gettimeofday(&before); ++ if (state == &dev->states[0]) ++ /* Wait for interrupt state */ ++ cpu_do_idle(); ++ else if (state == &dev->states[1]) { ++ /* ++ * Following write will put DDR in self refresh. ++ * Note that we have 256 cycles before DDR puts it ++ * self in self-refresh, so the wait-for-interrupt ++ * call afterwards won't get the DDR from self refresh ++ * mode. ++ */ ++ writel(0x7, DDR_OPERATION_BASE); ++ cpu_do_idle(); ++ } ++ do_gettimeofday(&after); ++ local_irq_enable(); ++ idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + ++ (after.tv_usec - before.tv_usec); ++ return idle_time; ++} ++ ++/* Initialize CPU idle by registering the idle states */ ++static int kirkwood_init_cpuidle(void) ++{ ++ struct cpuidle_device *device; ++ ++ cpuidle_register_driver(&kirkwood_idle_driver); ++ ++ device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id()); ++ device->state_count = KIRKWOOD_MAX_STATES; ++ ++ /* Wait for interrupt state */ ++ device->states[0].enter = kirkwood_enter_idle; ++ device->states[0].exit_latency = 1; ++ device->states[0].target_residency = 10000; ++ device->states[0].flags = CPUIDLE_FLAG_TIME_VALID; ++ strcpy(device->states[0].name, "WFI"); ++ strcpy(device->states[0].desc, "Wait for interrupt"); ++ ++ /* Wait for interrupt and DDR self refresh state */ ++ device->states[1].enter = kirkwood_enter_idle; ++ device->states[1].exit_latency = 10; ++ device->states[1].target_residency = 10000; ++ device->states[1].flags = CPUIDLE_FLAG_TIME_VALID; ++ strcpy(device->states[1].name, "DDR SR"); ++ strcpy(device->states[1].desc, "WFI and DDR Self Refresh"); ++ ++ if (cpuidle_register_device(device)) { ++ printk(KERN_ERR "kirkwood_init_cpuidle: Failed registering\n"); ++ return -EIO; ++ } ++ return 0; ++} ++ ++device_initcall(kirkwood_init_cpuidle); +diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h +index 38c9868..e9ae73d 100644 +--- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h ++++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h +@@ -86,6 +86,7 @@ + */ + #define DDR_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x00000) + #define DDR_WINDOW_CPU_BASE (DDR_VIRT_BASE | 0x1500) ++#define DDR_OPERATION_BASE (DDR_VIRT_BASE | 0x1418) + + #define DEV_BUS_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x10000) + #define DEV_BUS_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x10000) +-- +1.6.0.4 + diff --git a/recipes/linux/linux-kirkwood/0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch b/recipes/linux/linux-kirkwood/0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch new file mode 100644 index 0000000000..b1c7f7ce00 --- /dev/null +++ b/recipes/linux/linux-kirkwood/0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch @@ -0,0 +1,131 @@ +From 17589962c1787310e6373478a9fcb7641184cd91 Mon Sep 17 00:00:00 2001 +From: Rabeeh Khoury +Date: Sun, 22 Mar 2009 17:30:32 +0200 +Subject: [PATCH] [ARM] Kirkwood: peripherals clock gating for power management + +1. Enabling clock gating of unused peripherals +2. PLL and PHY of the units are also disabled (when possible. + +Signed-off-by: Rabeeh Khoury + +[ This needs to be revisited to make power handling dynamic and + per device. -- Nico ] +--- + arch/arm/mach-kirkwood/common.c | 32 ++++++++++++++++++++++++ + arch/arm/mach-kirkwood/common.h | 1 + + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 23 +++++++++++++++++ + arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 + + 4 files changed, 58 insertions(+), 0 deletions(-) + +Index: git/arch/arm/mach-kirkwood/common.c +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/common.c ++++ git/arch/arm/mach-kirkwood/common.c +@@ -779,6 +779,38 @@ static void __init kirkwood_l2_init(void + #endif + } + ++void __init kirkwood_clock_gate(u32 reg) ++{ ++ printk(KERN_INFO "Kirkwood: Gating clock using mask 0x%x\n", reg); ++ /* First make sure that the units are accessible */ ++ writel(readl(CLOCK_GATING_CTRL) | reg, CLOCK_GATING_CTRL); ++ /* For SATA first shutdown the phy */ ++ if (reg & CGC_SATA0) { ++ /* Disable PLL and IVREF */ ++ writel(readl(SATA0_PHY_MODE_2) & ~0xf, SATA0_PHY_MODE_2); ++ /* Disable PHY */ ++ writel(readl(SATA0_IF_CTRL) | 0x200, SATA0_IF_CTRL); ++ } ++ if (reg & CGC_SATA1) { ++ /* Disable PLL and IVREF */ ++ writel(readl(SATA1_PHY_MODE_2) & ~0xf, SATA1_PHY_MODE_2); ++ /* Disable PHY */ ++ writel(readl(SATA1_IF_CTRL) | 0x200, SATA1_IF_CTRL); ++ } ++ /* For PCI-E first shutdown the phy */ ++ if (reg & CGC_PEX0) { ++ writel(readl(PCIE_LINK_CTRL) | 0x10, PCIE_LINK_CTRL); ++ while (1) { ++ if (readl(PCIE_STATUS) & 0x1) ++ break; ++ } ++ writel(readl(PCIE_LINK_CTRL) & ~0x10, PCIE_LINK_CTRL); ++ } ++ /* Now gate clock the required units */ ++ writel(readl(CLOCK_GATING_CTRL) & ~reg, CLOCK_GATING_CTRL); ++ return; ++} ++ + void __init kirkwood_init(void) + { + printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n", +Index: git/arch/arm/mach-kirkwood/common.h +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/common.h ++++ git/arch/arm/mach-kirkwood/common.h +@@ -22,6 +22,7 @@ struct mvsdio_platform_data; + void kirkwood_map_io(void); + void kirkwood_init(void); + void kirkwood_init_irq(void); ++void __init kirkwood_clock_gate(u32 reg); + + extern struct mbus_dram_target_info kirkwood_mbus_dram_info; + void kirkwood_setup_cpu_mbus(void); +Index: git/arch/arm/mach-kirkwood/include/mach/kirkwood.h +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h ++++ git/arch/arm/mach-kirkwood/include/mach/kirkwood.h +@@ -65,6 +65,8 @@ + #define BRIDGE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x20000) + + #define PCIE_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x40000) ++#define PCIE_LINK_CTRL (PCIE_VIRT_BASE | 0x70) ++#define PCIE_STATUS (PCIE_VIRT_BASE | 0x1a04) + + #define USB_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x50000) + +@@ -81,9 +83,30 @@ + #define GE01_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x74000) + + #define SATA_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x80000) ++#define SATA_VIRT_BASE (KIRKWOOD_REGS_VIRT_BASE | 0x80000) ++#define SATA0_IF_CTRL (SATA_VIRT_BASE | 0x2050) ++#define SATA0_PHY_MODE_2 (SATA_VIRT_BASE | 0x2330) ++#define SATA1_IF_CTRL (SATA_VIRT_BASE | 0x4050) ++#define SATA1_PHY_MODE_2 (SATA_VIRT_BASE | 0x4330) + + #define SDIO_PHYS_BASE (KIRKWOOD_REGS_PHYS_BASE | 0x90000) + ++#define CLOCK_GATING_CTRL (BRIDGE_VIRT_BASE | 0x11c) ++#define CGC_GE0 0x1 ++#define CGC_PEX0 0x4 ++#define CGC_USB0 0x8 ++#define CGC_SDIO 0x10 ++#define CGC_TSU 0x20 ++#define CGC_NAND_SPI 0x80 ++#define CGC_XOR0 0x100 ++#define CGC_AUDIO 0x200 ++#define CGC_SATA0 0x4000 ++#define CGC_SATA1 0x8000 ++#define CGC_XOR1 0x10000 ++#define CGC_CRYPTO 0x20000 ++#define CGC_GE1 0x80000 ++#define CGC_TDM 0x100000 ++ + /* + * Supported devices and revisions. + */ +Index: git/arch/arm/mach-kirkwood/sheevaplug-setup.c +=================================================================== +--- git.orig/arch/arm/mach-kirkwood/sheevaplug-setup.c ++++ git/arch/arm/mach-kirkwood/sheevaplug-setup.c +@@ -122,6 +122,8 @@ static void __init sheevaplug_init(void) + + platform_device_register(&sheevaplug_nand_flash); + platform_device_register(&sheevaplug_leds); ++ kirkwood_clock_gate(CGC_PEX0 | CGC_TSU | CGC_AUDIO | CGC_SATA0 |\ ++ CGC_SATA1 | CGC_CRYPTO | CGC_GE1 | CGC_TDM); + } + + MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") diff --git a/recipes/linux/linux-kirkwood/defconfig b/recipes/linux/linux-kirkwood/defconfig index 23bf5d9820..c28a803478 100644 --- a/recipes/linux/linux-kirkwood/defconfig +++ b/recipes/linux/linux-kirkwood/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29.2 -# Sat May 16 20:08:52 2009 +# Sun May 17 00:12:54 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -267,7 +267,9 @@ CONFIG_ATAGS_PROC=y # # CPU Power Management # -# CONFIG_CPU_IDLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Floating point emulation diff --git a/recipes/linux/linux-kirkwood_2.6.29.2.bb b/recipes/linux/linux-kirkwood_2.6.29.2.bb index 4dceb7601b..b3b87a632e 100644 --- a/recipes/linux/linux-kirkwood_2.6.29.2.bb +++ b/recipes/linux/linux-kirkwood_2.6.29.2.bb @@ -14,6 +14,8 @@ SRCREV = "10a12868405319fbf114af2bde9789aa64c34144" SRC_URI = "git://git.marvell.com/orion.git;protocol=git;branch=stable-2.6.29 \ file://fw.patch;patch=1 \ file://mvsdio.patch;patch=1 \ + file://0001--ARM-Kirkwood-CPU-idle-driver.patch;patch=1 \ + file://0002--ARM-Kirkwood-peripherals-clock-gating-for-power-m.patch;patch=1 \ file://defconfig \ " -- cgit v1.2.3 From 6d64144303ee883e6248578a2027eb29b5d8e6e8 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Fri, 15 May 2009 15:24:53 +0400 Subject: (e)glibc-package: fix kernel version passed to qemu Binary locale generation fails with FATAL: kernel too old if (e)glibc is configured for kernels newer than 2.6.16. This comes from kernel version check in sysdeps/unix/sysv/linux/dl-osinfo.h. We configure (e)glibc with "--enable-kernel=${OLDEST_KERNEL}", so to pass this check we need kernel version reported from QEMU to (e)glibc be $OLDEST_KERNEL or higher. Fix qemu "-r" parameter to match OLDEST_KERNEL. Acked-by: Tom Rini --- recipes/eglibc/eglibc-package.bbclass | 6 +++++- recipes/glibc/glibc-package.bbclass | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index 7fcb558399..01f698adaf 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -287,7 +287,11 @@ python package_do_split_gconvs () { def output_locale_binary(name, locale, encoding): target_arch = bb.data.getVar("TARGET_ARCH", d, 1) - qemu = "qemu-%s -r 2.6.16" % target_arch + kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) + if kernel_ver is None: + qemu = "qemu-%s -s 1048576" % target_arch + else: + qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) if m: diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 89fbd1ca72..8db8c5cb6f 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -252,7 +252,11 @@ python package_do_split_gconvs () { if target_arch in ("i486", "i586", "i686"): target_arch = "i386" - qemu = "qemu-%s -s 1048576 -r 2.6.16" % target_arch + kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) + if kernel_ver is None: + qemu = "qemu-%s -s 1048576" % target_arch + else: + qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) m = re.match("(.*)\.(.*)", name) if m: -- cgit v1.2.3 From 6065fa491c009118ae282ae933215649cccfcd24 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Fri, 15 May 2009 16:25:49 +0400 Subject: (e)glibc-package: set LD_LIBRARY_PATH on binary locale generation Locale generation might fail with SIGSEGV if host libs get messed with target libs, that might easily happen via /etc/ld.so.cache when building x86(_64) target on x86(_64) host. So explicitly specify LD_LIBRARY_PATH to prevent that. Acked-by: Tom Rini --- recipes/eglibc/eglibc-package.bbclass | 3 ++- recipes/glibc/glibc-package.bbclass | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index 01f698adaf..241499f4a8 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -309,11 +309,12 @@ python package_do_split_gconvs () { bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + ldlibdir = "%s/lib" % treedir path = bb.data.getVar("PATH", d, 1) i18npath = base_path_join(treedir, datadir, "i18n") localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 8db8c5cb6f..46f809e22b 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -273,6 +273,7 @@ python package_do_split_gconvs () { bb.data.setVar('PACKAGES', '%s %s' % (pkgname, bb.data.getVar('PACKAGES', d, 1)), d) treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") + ldlibdir = "%s/lib" % treedir path = bb.data.getVar("PATH", d, 1) i18npath = base_path_join(treedir, datadir, "i18n") @@ -282,7 +283,7 @@ python package_do_split_gconvs () { if not qemu_options: qemu_options = bb.data.getVar('QEMU_OPTIONS', d, 1) - cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, qemu_options, treedir, localedef_opts) + cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s -E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, ldlibdir, qemu_options, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): raise bb.build.FuncFailed("localedef returned an error (command was %s)." % cmd) -- cgit v1.2.3 From 2b198cea9ddc51911823f5af12632c138766d024 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Sat, 16 May 2009 21:52:03 +0400 Subject: (e)glibc-package: enable binary locale generation on x86 and x86_64 Works well for this targets, so we can add that to BINARY_LOCALE_ARCHES whitelist. Acked-by: Tom Rini --- recipes/eglibc/eglibc-package.bbclass | 4 +++- recipes/glibc/glibc-package.bbclass | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index 241499f4a8..22ff52b3ff 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -24,7 +24,7 @@ python __anonymous () { ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.*" +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64" PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*" @@ -287,6 +287,8 @@ python package_do_split_gconvs () { def output_locale_binary(name, locale, encoding): target_arch = bb.data.getVar("TARGET_ARCH", d, 1) + if target_arch in ("i486", "i586", "i686"): + target_arch = "i386" kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) if kernel_ver is None: qemu = "qemu-%s -s 1048576" % target_arch diff --git a/recipes/glibc/glibc-package.bbclass b/recipes/glibc/glibc-package.bbclass index 46f809e22b..ac7e0f3670 100644 --- a/recipes/glibc/glibc-package.bbclass +++ b/recipes/glibc/glibc-package.bbclass @@ -24,7 +24,7 @@ python __anonymous () { ENABLE_BINARY_LOCALE_GENERATION ?= "0" # BINARY_LOCALE_ARCHES is a space separated list of regular expressions -BINARY_LOCALE_ARCHES ?= "arm.*" +BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64" # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -- cgit v1.2.3 From 979d795dcd0cc1c21e46122996b62521ab556c6b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 17 May 2009 12:52:55 +0200 Subject: midori git: bump SRCREV --- recipes/gtk-webcore/midori_git.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'recipes') diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb index a21058bcbf..d7eacd575a 100644 --- a/recipes/gtk-webcore/midori_git.bb +++ b/recipes/gtk-webcore/midori_git.bb @@ -3,13 +3,18 @@ require midori.inc DEPENDS += "python-native python-docutils-native" # increment PR every time SRCREV is updated! -PR = "r2" -PV = "0.1.2+${PR}+gitr${SRCREV}" +PR = "r0" +PV = "0.1.6+${PR}+gitr${SRCREV}" + +SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git \ + file://waf" -SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git" S = "${WORKDIR}/git" + + do_configure() { + cp -f ${WORKDIR}/waf ${S}/ ./configure \ --prefix=${prefix} \ --bindir=${bindir} \ -- cgit v1.2.3 From 447d858f5ed91bb19d96d7b65155e3e833ab890f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 17 May 2009 18:52:48 +0200 Subject: libusb1: update to 1.0.1 --- recipes/libusb/libusb1_1.0.1.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/libusb/libusb1_1.0.1.bb (limited to 'recipes') diff --git a/recipes/libusb/libusb1_1.0.1.bb b/recipes/libusb/libusb1_1.0.1.bb new file mode 100644 index 0000000000..1af46bcf98 --- /dev/null +++ b/recipes/libusb/libusb1_1.0.1.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "libusb is a library to provide userspace \ +access to USB devices." +HOMEPAGE = "http://libusb.sf.net" +SECTION = "libs" +LICENSE = "LGPL" + + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ +" +S = "${WORKDIR}/libusb-${PV}" + +inherit autotools_stage binconfig lib_package + +PARALLEL_MAKE = "" +EXTRA_OECONF = "--disable-build-docs" + +export CXXFLAGS += "-lstdc++ -I${STAGING_INCDIR}" + +LIBTOOL = "${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +PACKAGES =+ "libusbpp" +FILES_libusbpp = "${libdir}/libusbpp*.so.*" -- cgit v1.2.3 From 3edb5ad048d14852989f885ba03b8bb9f47e01c1 Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Sun, 17 May 2009 21:50:09 +0100 Subject: krb5: Force cp to work due to an permissions issue --- recipes/krb/files/copyperms.patch | 12 ++++++++++++ recipes/krb/krb5_1.6.3.bb | 6 ++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 recipes/krb/files/copyperms.patch (limited to 'recipes') diff --git a/recipes/krb/files/copyperms.patch b/recipes/krb/files/copyperms.patch new file mode 100644 index 0000000000..b0abb72cf0 --- /dev/null +++ b/recipes/krb/files/copyperms.patch @@ -0,0 +1,12 @@ +diff -urN src.old/config/pre.in src/config/pre.in +--- src.old/config/pre.in 2006-10-15 19:19:28.000000000 +0100 ++++ src/config/pre.in 2009-05-17 21:28:54.000000000 +0100 +@@ -258,7 +258,7 @@ + transform = @program_transform_name@ + + RM = rm -f +-CP = cp ++CP = cp -f + MV = mv -f + CHMOD=chmod + RANLIB = @RANLIB@ diff --git a/recipes/krb/krb5_1.6.3.bb b/recipes/krb/krb5_1.6.3.bb index 5fc75b4c7e..a1694b2d5c 100644 --- a/recipes/krb/krb5_1.6.3.bb +++ b/recipes/krb/krb5_1.6.3.bb @@ -1,14 +1,15 @@ DESCRIPTION = "A network authentication protocol" HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" -PR = "r5" +PR = "r6" LICENSE = "MIT" DEPENDS = "perl-native ncurses e2fsprogs-libs" inherit autotools binconfig SRC_URI = "http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.3-signed.tar \ - file://fix-uclibc-ruserpass-collision.patch" + file://fix-uclibc-ruserpass-collision.patch \ + file://copyperms.patch" S = "${WORKDIR}/${PN}-${PV}/src/" # Will clean this up... @@ -23,6 +24,7 @@ FILES_${PN}-doc += /usr/share/examples krb5_do_unpack() { tar xzf ${WORKDIR}/krb5-1.6.3.tar.gz -C ${WORKDIR}/ patch -d ${S} -p1 < ${WORKDIR}/fix-uclibc-ruserpass-collision.patch + patch -d ${S} -p1 < ${WORKDIR}/copyperms.patch } python do_unpack() { -- cgit v1.2.3 From b90bc146cdd0db2f49e52a27a158cc617ff28562 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Sun, 17 May 2009 22:16:17 +0100 Subject: transmission_1.61.bb : add new version of transmission make init run transmission and transmission user. transmission_1.40.bb : catchup old version with fixes from new checksums.ini : add transmission 1.61 --- recipes/transmission/files/init | 6 +++--- recipes/transmission/transmission_1.40.bb | 17 ++++++++-------- recipes/transmission/transmission_1.61.bb | 32 +++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 recipes/transmission/transmission_1.61.bb (limited to 'recipes') diff --git a/recipes/transmission/files/init b/recipes/transmission/files/init index 415a662f9f..85945a76a0 100755 --- a/recipes/transmission/files/init +++ b/recipes/transmission/files/init @@ -11,12 +11,12 @@ # Exit if the package is not installed test -f /usr/bin/transmission-daemon || exit 0 - +SSDOPTIONS="--chuid transmission:transmission" case "$1" in start) echo "Starting transmission-daemon" - /sbin/start-stop-daemon --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config + /sbin/start-stop-daemon $SSDOPTIONS --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config ;; stop) echo "Stopping transmission-daemon" @@ -31,7 +31,7 @@ case "$1" in echo -n "." done echo "Restarting transmission-daemon" - /sbin/start-stop-daemon --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config + /sbin/start-stop-daemon $SSDOPTIONS --start --quiet --exec /usr/bin/transmission-daemon -- -w /home/transmission -g /home/transmission/.config ;; *) echo "Usage: /etc/init.d/tranmission {start|stop|restart}" diff --git a/recipes/transmission/transmission_1.40.bb b/recipes/transmission/transmission_1.40.bb index 52438efa4e..081c2e8aff 100644 --- a/recipes/transmission/transmission_1.40.bb +++ b/recipes/transmission/transmission_1.40.bb @@ -3,7 +3,7 @@ SECTION = "network" HOMEPAGE = "www.transmissionbt.com/" DEPENDS = "openssl gettext libtool intltool-native curl glib-2.0-native" LICENSE = "GPLv2" -PR = "r0" +PR = "r1" SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ file://init" @@ -17,15 +17,16 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission } -pkg_postinst_append() { -#!/bin/sh - -if [ "x$D" != "x" ] ; then - exit 1 -fi - +pkg_postinst_${PN}() { grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission mkdir -p /home/transmission/.config chown transmission:transmission /home/transmission/.config } + +pkg_postrm_${PN}() { +#!/bin/sh +delgroup transmission +deluser transmission +} + diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb new file mode 100644 index 0000000000..1692147fcf --- /dev/null +++ b/recipes/transmission/transmission_1.61.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Transmission is a BitTorrent client w/ a built-in Ajax-Powered Webif GUI." +SECTION = "network" +HOMEPAGE = "www.transmissionbt.com/" +DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native" +LICENSE = "GPLv2" +PR = "r3" +SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ + file://init" + +INITSCRIPT_NAME = "transmission" +INITSCRIPT_PARAMS = "defaults 60 " + +inherit autotools update-rc.d + +do_install_append() { + install -d -p ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission +} + +pkg_postinst_${PN}() { +grep -q transmission ${sysconfdir}/group || addgroup transmission +grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission +mkdir -p /home/transmission/.config +chown transmission:transmission /home/transmission/.config +} + +pkg_postrm_${PN}() { +#!/bin/sh +delgroup transmission +deluser transmission +} + -- cgit v1.2.3 From 0533f8261c387f1f047aa12a1226a096e4fa5284 Mon Sep 17 00:00:00 2001 From: Ottavio Campana Date: Mon, 18 May 2009 02:51:32 +0200 Subject: libmicrohttpd: new recipe --- recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb (limited to 'recipes') diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb new file mode 100644 index 0000000000..39860dcef3 --- /dev/null +++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r1" + +SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.1.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake DESTDIR="${D}" install + autotools_stage_all +} + +PN = "libmicrohttpd" -- cgit v1.2.3 From 1b4f3b70c8e445a866b5fe5e721db2b7092d5472 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 May 2009 03:26:51 +0200 Subject: libmicrohttpd: remove unnecessary PN, add AUTHOR and improve DESCRIPTION and SRC_URI --- recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'recipes') diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb index 39860dcef3..cdf721c26e 100644 --- a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb +++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb @@ -1,10 +1,11 @@ -DESCRIPTION = "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application" +DESCRIPTION = "easy to embed and small HTTP server as a C library" +AUTHOR = "Christian Grothoff " HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" SECTION = "libs" LICENSE = "LGPL" -PR = "r1" +PR = "r2" -SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.4.1.tar.gz" +SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz" inherit autotools pkgconfig @@ -12,5 +13,3 @@ do_stage() { oe_runmake DESTDIR="${D}" install autotools_stage_all } - -PN = "libmicrohttpd" -- cgit v1.2.3 From f2f3e71e9fcc0fdd0aa73bfa5960ff27d0a70c2a Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 May 2009 03:27:48 +0200 Subject: libmicrohttpd: update to 0.4.2 --- recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb | 15 --------------- recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb create mode 100644 recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb (limited to 'recipes') diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb deleted file mode 100644 index cdf721c26e..0000000000 --- a/recipes/libmicrohttpd/libmicrohttpd_0.4.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "easy to embed and small HTTP server as a C library" -AUTHOR = "Christian Grothoff " -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -SECTION = "libs" -LICENSE = "LGPL" -PR = "r2" - -SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - oe_runmake DESTDIR="${D}" install - autotools_stage_all -} diff --git a/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb new file mode 100644 index 0000000000..cdf721c26e --- /dev/null +++ b/recipes/libmicrohttpd/libmicrohttpd_0.4.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "easy to embed and small HTTP server as a C library" +AUTHOR = "Christian Grothoff " +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake DESTDIR="${D}" install + autotools_stage_all +} -- cgit v1.2.3 From d62d49a2858fa2b389c60008ba9ee92c46b66151 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 May 2009 03:43:20 +0200 Subject: xmms-embedded: fix -dbg packaging --- recipes/xmms-embedded/xmms-embedded_20040327.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/xmms-embedded/xmms-embedded_20040327.bb b/recipes/xmms-embedded/xmms-embedded_20040327.bb index a8b24e709a..48c543948c 100644 --- a/recipes/xmms-embedded/xmms-embedded_20040327.bb +++ b/recipes/xmms-embedded/xmms-embedded_20040327.bb @@ -63,4 +63,4 @@ do_install() { done } -FILES-${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug" +FILES_${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug" -- cgit v1.2.3 From 4dde753d39367674125634dde61715e8a5ce4870 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 May 2009 09:28:12 +0200 Subject: transmission: only run *inst scripts online --- recipes/transmission/transmission_1.40.bb | 9 ++++++++- recipes/transmission/transmission_1.61.bb | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) (limited to 'recipes') diff --git a/recipes/transmission/transmission_1.40.bb b/recipes/transmission/transmission_1.40.bb index 081c2e8aff..47d674941a 100644 --- a/recipes/transmission/transmission_1.40.bb +++ b/recipes/transmission/transmission_1.40.bb @@ -3,7 +3,7 @@ SECTION = "network" HOMEPAGE = "www.transmissionbt.com/" DEPENDS = "openssl gettext libtool intltool-native curl glib-2.0-native" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ file://init" @@ -18,6 +18,10 @@ do_install_append() { } pkg_postinst_${PN}() { +#!/bin/sh +if [ "x$D" != "x" ] ; then + exit 1 +fi grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission mkdir -p /home/transmission/.config @@ -26,6 +30,9 @@ chown transmission:transmission /home/transmission/.config pkg_postrm_${PN}() { #!/bin/sh +if [ "x$D" != "x" ] ; then + exit 1 +fi delgroup transmission deluser transmission } diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb index 1692147fcf..a9fb8c9edd 100644 --- a/recipes/transmission/transmission_1.61.bb +++ b/recipes/transmission/transmission_1.61.bb @@ -3,7 +3,7 @@ SECTION = "network" HOMEPAGE = "www.transmissionbt.com/" DEPENDS = "gtk+ gnutls openssl gettext libtool intltool-native curl glib-2.0-native" LICENSE = "GPLv2" -PR = "r3" +PR = "r4" SRC_URI = "http://mirrors.m0k.org/transmission/files/transmission-${PV}.tar.bz2 \ file://init" @@ -18,6 +18,10 @@ do_install_append() { } pkg_postinst_${PN}() { +#!/bin/sh +if [ "x$D" != "x" ] ; then + exit 1 +fi grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission mkdir -p /home/transmission/.config @@ -26,6 +30,9 @@ chown transmission:transmission /home/transmission/.config pkg_postrm_${PN}() { #!/bin/sh +if [ "x$D" != "x" ] ; then + exit 1 +fi delgroup transmission deluser transmission } -- cgit v1.2.3 From dba4943a54c97d1479b60ff05a6f36aee91082ee Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 May 2009 09:39:22 +0200 Subject: transmission: update-rc.d handles online check, so add a note saying that, fix packaging --- recipes/transmission/transmission_1.40.bb | 9 +-------- recipes/transmission/transmission_1.61.bb | 11 +++-------- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'recipes') diff --git a/recipes/transmission/transmission_1.40.bb b/recipes/transmission/transmission_1.40.bb index 47d674941a..c40939fd3b 100644 --- a/recipes/transmission/transmission_1.40.bb +++ b/recipes/transmission/transmission_1.40.bb @@ -17,11 +17,8 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission } +# No need for online check, since update-rc.d will prepend it to here pkg_postinst_${PN}() { -#!/bin/sh -if [ "x$D" != "x" ] ; then - exit 1 -fi grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission mkdir -p /home/transmission/.config @@ -29,10 +26,6 @@ chown transmission:transmission /home/transmission/.config } pkg_postrm_${PN}() { -#!/bin/sh -if [ "x$D" != "x" ] ; then - exit 1 -fi delgroup transmission deluser transmission } diff --git a/recipes/transmission/transmission_1.61.bb b/recipes/transmission/transmission_1.61.bb index a9fb8c9edd..e898953dff 100644 --- a/recipes/transmission/transmission_1.61.bb +++ b/recipes/transmission/transmission_1.61.bb @@ -17,11 +17,10 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/transmission } +FILES_${PN} += "${datadir}/icons" + +# No need for online check, since update-rc.d will prepend it to here pkg_postinst_${PN}() { -#!/bin/sh -if [ "x$D" != "x" ] ; then - exit 1 -fi grep -q transmission ${sysconfdir}/group || addgroup transmission grep -q transmission ${sysconfdir}/passwd || adduser -h /home/transmission -S -D -G transmission -s ${base_bindir}/false transmission mkdir -p /home/transmission/.config @@ -29,10 +28,6 @@ chown transmission:transmission /home/transmission/.config } pkg_postrm_${PN}() { -#!/bin/sh -if [ "x$D" != "x" ] ; then - exit 1 -fi delgroup transmission deluser transmission } -- cgit v1.2.3 From 4fb5e283e611b87c4d55079c12a1a4ca1c5624a7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 May 2009 10:24:05 +0200 Subject: xserver-common: add xdg-autostart support (from poky) --- recipes/xserver-common/files/89xdgautostart.sh | 7 +++++++ recipes/xserver-common/xserver-common_1.24.bb | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 recipes/xserver-common/files/89xdgautostart.sh (limited to 'recipes') diff --git a/recipes/xserver-common/files/89xdgautostart.sh b/recipes/xserver-common/files/89xdgautostart.sh new file mode 100644 index 0000000000..db7aa229d2 --- /dev/null +++ b/recipes/xserver-common/files/89xdgautostart.sh @@ -0,0 +1,7 @@ +XDGAUTOSTART=/etc/xdg/autostart +if [ -d $XDGAUTOSTART ]; then + for SCRIPT in $XDGAUTOSTART/*; do + CMD=`grep ^Exec= $SCRIPT | cut -d '=' -f 2` + $CMD & + done +fi \ No newline at end of file diff --git a/recipes/xserver-common/xserver-common_1.24.bb b/recipes/xserver-common/xserver-common_1.24.bb index a30a37c893..27b4ba6a70 100644 --- a/recipes/xserver-common/xserver-common_1.24.bb +++ b/recipes/xserver-common/xserver-common_1.24.bb @@ -2,15 +2,18 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "all" # we are using a gpe-style Makefile inherit gpe -SRC_URI_append = " file://setDPI.sh " +SRC_URI_append = " file://setDPI.sh \ + file://89xdgautostart.sh \ +" do_install_append() { install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" + install -m 0755 "${WORKDIR}/89xdgautostart.sh" "${D}/etc/X11/Xinit.d/89xdgautostart.sh" } -- cgit v1.2.3 From cc4e74ff5f3ee6677f84d5194028953de3cd3ef7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 May 2009 10:28:30 +0200 Subject: util-linux-ng: update to 2.15 --- recipes/util-linux-ng/util-linux-ng_2.15.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/util-linux-ng/util-linux-ng_2.15.bb (limited to 'recipes') diff --git a/recipes/util-linux-ng/util-linux-ng_2.15.bb b/recipes/util-linux-ng/util-linux-ng_2.15.bb new file mode 100644 index 0000000000..d8cb0a714d --- /dev/null +++ b/recipes/util-linux-ng/util-linux-ng_2.15.bb @@ -0,0 +1,6 @@ +require util-linux-ng.inc + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/util-linux-ng-2.15', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +LDFLAGS_append_libc-uclibc = " -lintl" + -- cgit v1.2.3 From 393066c818047a5cf6c90455e6874c4e901f5edf Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 18 May 2009 09:52:45 +0100 Subject: libnss-mdns_0.10.bb : add new version of the mdns resolver --- recipes/libnss-mdns/libnss-mdns_0.10.bb | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 recipes/libnss-mdns/libnss-mdns_0.10.bb (limited to 'recipes') diff --git a/recipes/libnss-mdns/libnss-mdns_0.10.bb b/recipes/libnss-mdns/libnss-mdns_0.10.bb new file mode 100644 index 0000000000..b325f826d6 --- /dev/null +++ b/recipes/libnss-mdns/libnss-mdns_0.10.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "NSS module for Multicast DNS name resolution" +HOMEPAGE = "http://0pointer.de/lennart/projects/nss-mdns/" +LICENSE = "GPL" +SECTION = "libs" +PRIORITY = "optional" + +RRECOMMENDS_${PN} = "zeroconf" +PR = "r0" + +EXTRA_OECONF = "--libdir=/lib" +S = "${WORKDIR}/nss-mdns-${PV}" + +SRC_URI = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${PV}.tar.gz" + +inherit autotools + +pkg_postinst_${PN} () { + # can't do this offline + if [ "x$D" != "x" ]; then + exit 1 + fi + cat /etc/nsswitch.conf | grep "hosts:\s*files dns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)dns/\1mdns4_minimal [NOTFOUND=return] dns mdns4/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} + +pkg_prerm_${PN} () { + cat /etc/nsswitch.conf | grep "hosts:\s*files dns mdns$" > /dev/null && { + cat /etc/nsswitch.conf | sed 's/\(hosts:\s*files \)mdns4_minimal [NOTFOUND=return] dns mdns4/\1dns/' > /tmp/nsswitch.conf + mv /tmp/nsswitch.conf /etc/nsswitch.conf + } +} -- cgit v1.2.3 From 385172bb047b57145770a547950c2e3bed044227 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 18 May 2009 10:35:43 +0100 Subject: avahi.inc : fix override to libc-glibc instead of linux to get it to always work the right way avahi_0.6.24.bb : bump PR to pick up change --- recipes/avahi/avahi.inc | 2 +- recipes/avahi/avahi_0.6.24.bb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'recipes') diff --git a/recipes/avahi/avahi.inc b/recipes/avahi/avahi.inc index cbd6ac3d03..f5e68e26fe 100644 --- a/recipes/avahi/avahi.inc +++ b/recipes/avahi/avahi.inc @@ -7,7 +7,7 @@ LICENSE = "GPL" DEPENDS = "expat virtual/libintl libdaemon dbus glib-2.0" # uclibc has no nss -RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" +RRECOMMENDS_avahi-daemon_append_libc-glibc = "libnss-mdns" RDEPENDS_avahi-daemon += "sysvinit-pidof update-rc.d" RDEPENDS_avahi-autoipd += "update-rc.d" diff --git a/recipes/avahi/avahi_0.6.24.bb b/recipes/avahi/avahi_0.6.24.bb index 15f56ffa95..61a62a54a4 100644 --- a/recipes/avahi/avahi_0.6.24.bb +++ b/recipes/avahi/avahi_0.6.24.bb @@ -1,5 +1,7 @@ require avahi.inc +PR = "r1" + DEPENDS += "intltool-native" PACKAGES =+ "libavahi-gobject" -- cgit v1.2.3 From c7747266beb91d1ed16ac85bf6d0ea539f4bc556 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 18 May 2009 10:50:13 +0200 Subject: e2fsprogs(-native): update to 1.41.5 * add staging tweak from poky to get stuff into /bin instead of /sbin --- .../e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch | 289 --------------------- recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb | 8 +- recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb | 19 ++ recipes/e2fsprogs/e2fsprogs.inc | 5 + recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch | 289 +++++++++++++++++++++ recipes/e2fsprogs/e2fsprogs_1.41.5.bb | 96 +++++++ 6 files changed, 415 insertions(+), 291 deletions(-) delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch create mode 100644 recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb create mode 100644 recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.5.bb (limited to 'recipes') diff --git a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch deleted file mode 100644 index 759e84edb0..0000000000 --- a/recipes/e2fsprogs/e2fsprogs-1.41.4/mkinstalldirs.patch +++ /dev/null @@ -1,289 +0,0 @@ -This patch is based on the following: - -http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch - -Index: e2fsprogs-1.41.4/configure.in -=================================================================== ---- e2fsprogs-1.41.4.orig/configure.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/configure.in 2009-04-09 21:19:28.000000000 +0100 -@@ -577,6 +577,7 @@ - fi - AC_SUBST(MAKEINFO) - AC_PROG_INSTALL -+AC_PROG_MKDIR_P - # See if we need a separate native compiler. - if test $cross_compiling = no; then - BUILD_CC="$CC" -Index: e2fsprogs-1.41.4/debugfs/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/debugfs/Makefile.in 2008-06-18 04:53:42.000000000 +0100 -+++ e2fsprogs-1.41.4/debugfs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -47,8 +47,8 @@ - @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ @echo " MKDIR_P $(root_sbindir) $(man8dir)" -+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) - - install: $(PROGS) $(MANPAGES) installdirs -Index: e2fsprogs-1.41.4/doc/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/doc/Makefile.in 2008-05-26 00:52:27.000000000 +0100 -+++ e2fsprogs-1.41.4/doc/Makefile.in 2009-04-09 21:20:09.000000000 +0100 -@@ -20,8 +20,8 @@ - - install-doc-libs: libext2fs.info libext2fs.dvi - @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* -- @echo " MKINSTALLDIRS $(infodir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir) -+ @echo " MKDIR_P $(infodir)" -+ @$(MKDIR_P) $(DESTDIR)$(infodir) - -@for i in libext2fs.info* ; do \ - echo " INSTALL_DATA $(infodir)/$$i" ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ -Index: e2fsprogs-1.41.4/e2fsck/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in 2008-11-15 04:19:57.000000000 +0000 -+++ e2fsprogs-1.41.4/e2fsck/Makefile.in 2009-04-09 21:20:44.000000000 +0100 -@@ -185,8 +185,8 @@ - @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ @echo " MKDIR_P $(root_sbindir) $(man8dir)" -+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) - - install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs -Index: e2fsprogs-1.41.4/intl/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/intl/Makefile.in 2007-06-30 13:58:34.000000000 +0100 -+++ e2fsprogs-1.41.4/intl/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -40,8 +40,8 @@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) -+MKDIR_P = @MKDIR_P@ -+mkdir_p = @MKDIR_P@ - - l = @INTL_LIBTOOL_SUFFIX_PREFIX@ - -Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/blkid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -142,8 +142,8 @@ - @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/blkid" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig - - install:: all installdirs -Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/e2p/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -79,8 +79,8 @@ - ./tst_feature - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/e2p" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/e2p" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/e2p $(DESTDIR)$(libdir)/pkgconfig - - install:: all installdirs -Index: e2fsprogs-1.41.4/lib/et/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/et/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/et/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -74,8 +74,8 @@ - $(TAGS) $(SRCS) - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/et $(datadir)/et $(bindir) $(man1dir) $(man3dir)" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/et $(DESTDIR)$(datadir)/et \ - $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) \ - $(DESTDIR)$(man3dir) $(DESTDIR)$(libdir)/pkgconfig -Index: e2fsprogs-1.41.4/lib/ext2fs/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/ext2fs/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/ext2fs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -330,8 +330,8 @@ - LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_csum - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/ext2fs" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig - - install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc -Index: e2fsprogs-1.41.4/lib/Makefile.elf-lib -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/Makefile.elf-lib 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/Makefile.elf-lib 2009-04-09 21:19:28.000000000 +0100 -@@ -33,8 +33,8 @@ - @$(LN) ../$(ELF_LIB) ../$(ELF_SONAME) - - installdirs-elf-lib:: -- @echo " MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(ELF_INSTALL_DIR) \ -+ @echo " MKDIR_P $(ELF_INSTALL_DIR) $(libdir)" -+ @$(MKDIR_P) $(DESTDIR)$(ELF_INSTALL_DIR) \ - $(DESTDIR)$(libdir) - - installdirs:: installdirs-elf-lib -Index: e2fsprogs-1.41.4/lib/ss/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/ss/Makefile.in 2008-10-07 15:22:39.000000000 +0100 -+++ e2fsprogs-1.41.4/lib/ss/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -129,8 +129,8 @@ - @cd $(top_builddir); CONFIG_FILES=lib/ss/ss.pc ./config.status - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/ss $(datadir)/ss $(bindir)" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss \ - $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)/pkgconfig - -Index: e2fsprogs-1.41.4/lib/uuid/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/lib/uuid/Makefile.in 2008-02-19 04:33:10.000000000 +0000 -+++ e2fsprogs-1.41.4/lib/uuid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -126,8 +126,8 @@ - @cd $(top_builddir); CONFIG_FILES=lib/uuid/uuid.pc ./config.status - - installdirs:: -- @echo " MKINSTALLDIRS $(libdir) $(includedir)/uuid $(man3dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ -+ @echo " MKDIR_P $(libdir) $(includedir)/uuid $(man3dir)" -+ @$(MKDIR_P) $(DESTDIR)$(libdir) \ - $(DESTDIR)$(includedir)/uuid $(DESTDIR)$(man3dir) \ - $(DESTDIR)$(libdir)/pkgconfig - -Index: e2fsprogs-1.41.4/MCONFIG.in -=================================================================== ---- e2fsprogs-1.41.4.orig/MCONFIG.in 2008-11-15 17:17:22.000000000 +0000 -+++ e2fsprogs-1.41.4/MCONFIG.in 2009-04-09 21:19:28.000000000 +0100 -@@ -64,7 +64,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKDIR_P = @MKDIR_P@ - - # - # Library definitions -Index: e2fsprogs-1.41.4/misc/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/misc/Makefile.in 2008-11-15 17:33:33.000000000 +0000 -+++ e2fsprogs-1.41.4/misc/Makefile.in 2009-04-09 21:21:22.000000000 +0100 -@@ -366,8 +366,8 @@ - @$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8 - - installdirs: -- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \ -+ @echo " MKDIR_P $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)" -+ @$(MKDIR_P) $(DESTDIR)$(sbindir) \ - $(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \ - $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \ -Index: e2fsprogs-1.41.4/po/Makefile.in.in -=================================================================== ---- e2fsprogs-1.41.4.orig/po/Makefile.in.in 2007-06-30 13:58:34.000000000 +0100 -+++ e2fsprogs-1.41.4/po/Makefile.in.in 2009-04-09 21:19:28.000000000 +0100 -@@ -26,11 +26,10 @@ - datadir = @datadir@ - localedir = $(datadir)/locale - gettextsrcdir = $(datadir)/gettext/po -+mkdir_p = @MKDIR_P@ - - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ --MKINSTALLDIRS = @MKINSTALLDIRS@ --mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) - - GMSGFMT = @GMSGFMT@ - MSGFMT = @MSGFMT@ -@@ -148,7 +147,7 @@ - install-exec: - install-data: install-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common) Makevars.template; do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ -@@ -161,13 +160,13 @@ - fi - install-data-no: all - install-data-yes: all -- $(mkinstalldirs) $(DESTDIR)$(datadir) -+ $(mkdir_p) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkinstalldirs) $(DESTDIR)$$dir; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ - if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ - $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ - echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ -@@ -207,19 +206,19 @@ - installdirs-exec: - installdirs-data: installdirs-data-@USE_NLS@ - if test "$(PACKAGE)" = "gettext-tools"; then \ -- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ -+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ - else \ - : ; \ - fi - installdirs-data-no: - installdirs-data-yes: -- $(mkinstalldirs) $(DESTDIR)$(datadir) -+ $(mkdir_p) $(DESTDIR)$(datadir) - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ -- $(mkinstalldirs) $(DESTDIR)$$dir; \ -+ $(mkdir_p) $(DESTDIR)$$dir; \ - for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ - if test -n "$$lc"; then \ - if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ -Index: e2fsprogs-1.41.4/resize/Makefile.in -=================================================================== ---- e2fsprogs-1.41.4.orig/resize/Makefile.in 2007-06-30 13:58:35.000000000 +0100 -+++ e2fsprogs-1.41.4/resize/Makefile.in 2009-04-09 21:19:28.000000000 +0100 -@@ -57,8 +57,8 @@ - @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS) - - installdirs: -- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" -- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ -+ @echo " MKDIR_P $(root_sbindir) $(man8dir)" -+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ - $(DESTDIR)$(man8dir) - - install: $(PROGS) $(MANPAGES) installdirs diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb index f2c3898dbe..e79958cb2f 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.2.bb @@ -2,7 +2,7 @@ SECTION = "base" require e2fsprogs.inc inherit native -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" EXTRA_OECONF = "" @@ -12,5 +12,9 @@ PACKAGES = "" DEPENDS = "" do_stage () { - oe_runmake install + oe_runmake install + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done } diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb new file mode 100644 index 0000000000..b29064f5c8 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs-native_1.41.5.bb @@ -0,0 +1,19 @@ +SECTION = "base" +require e2fsprogs.inc +inherit native + +SRC_URI += "file://mkinstalldirs.patch;patch=1" + +EXTRA_OECONF = "" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" +DEPENDS = "" + +do_stage () { + autotools_stage_all + install -d ${STAGING_BINDIR_NATIVE}/ + for b in ${e2miscbins}; do + install -m 0755 misc/$b ${STAGING_BINDIR_NATIVE}/ || die "failed to install $b" + done +} diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc index b7a1223cc9..6821d71004 100644 --- a/recipes/e2fsprogs/e2fsprogs.inc +++ b/recipes/e2fsprogs/e2fsprogs.inc @@ -15,3 +15,8 @@ EXTRA_OECONF = "${@['','--disable-tls'][bb.data.getVar('ARM_ABI', d, 1) == 'oabi --enable-dynamic-e2fsck --disable-nls --sbindir=${base_sbindir}" PARALLEL_MAKE = "" + +e2miscbins = "mke2fs badblocks tune2fs dumpe2fs blkid logsave e2image fsck \ + e2undo chattr lsattr uuidgen mklost+found filefrag uuidd e2initrd_helper" + + diff --git a/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch new file mode 100644 index 0000000000..759e84edb0 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs/mkinstalldirs.patch @@ -0,0 +1,289 @@ +This patch is based on the following: + +http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch + +Index: e2fsprogs-1.41.4/configure.in +=================================================================== +--- e2fsprogs-1.41.4.orig/configure.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/configure.in 2009-04-09 21:19:28.000000000 +0100 +@@ -577,6 +577,7 @@ + fi + AC_SUBST(MAKEINFO) + AC_PROG_INSTALL ++AC_PROG_MKDIR_P + # See if we need a separate native compiler. + if test $cross_compiling = no; then + BUILD_CC="$CC" +Index: e2fsprogs-1.41.4/debugfs/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/debugfs/Makefile.in 2008-06-18 04:53:42.000000000 +0100 ++++ e2fsprogs-1.41.4/debugfs/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -47,8 +47,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) + + install: $(PROGS) $(MANPAGES) installdirs +Index: e2fsprogs-1.41.4/doc/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/doc/Makefile.in 2008-05-26 00:52:27.000000000 +0100 ++++ e2fsprogs-1.41.4/doc/Makefile.in 2009-04-09 21:20:09.000000000 +0100 +@@ -20,8 +20,8 @@ + + install-doc-libs: libext2fs.info libext2fs.dvi + @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info* +- @echo " MKINSTALLDIRS $(infodir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir) ++ @echo " MKDIR_P $(infodir)" ++ @$(MKDIR_P) $(DESTDIR)$(infodir) + -@for i in libext2fs.info* ; do \ + echo " INSTALL_DATA $(infodir)/$$i" ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \ +Index: e2fsprogs-1.41.4/e2fsck/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/e2fsck/Makefile.in 2008-11-15 04:19:57.000000000 +0000 ++++ e2fsprogs-1.41.4/e2fsck/Makefile.in 2009-04-09 21:20:44.000000000 +0100 +@@ -185,8 +185,8 @@ + @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5 + + installdirs: +- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)" +- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \ ++ @echo " MKDIR_P $(root_sbindir) $(man8dir)" ++ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \ + $(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir) + + install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs +Index: e2fsprogs-1.41.4/intl/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/intl/Makefile.in 2007-06-30 13:58:34.000000000 +0100 ++++ e2fsprogs-1.41.4/intl/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -40,8 +40,8 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ +-MKINSTALLDIRS = @MKINSTALLDIRS@ +-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) ++MKDIR_P = @MKDIR_P@ ++mkdir_p = @MKDIR_P@ + + l = @INTL_LIBTOOL_SUFFIX_PREFIX@ + +Index: e2fsprogs-1.41.4/lib/blkid/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/blkid/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/blkid/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -142,8 +142,8 @@ + @cd $(top_builddir); CONFIG_FILES=lib/blkid/blkid.pc ./config.status + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(includedir)/blkid" +- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ ++ @echo " MKDIR_P $(libdir) $(includedir)/blkid" ++ @$(MKDIR_P) $(DESTDIR)$(libdir) \ + $(DESTDIR)$(includedir)/blkid $(DESTDIR)$(libdir)/pkgconfig + + install:: all installdirs +Index: e2fsprogs-1.41.4/lib/e2p/Makefile.in +=================================================================== +--- e2fsprogs-1.41.4.orig/lib/e2p/Makefile.in 2008-10-07 15:22:39.000000000 +0100 ++++ e2fsprogs-1.41.4/lib/e2p/Makefile.in 2009-04-09 21:19:28.000000000 +0100 +@@ -79,8 +79,8 @@ + ./tst_feature + + installdirs:: +- @echo " MKINSTALLDIRS $(libdir) $(include