diff options
Diffstat (limited to 'meta-initramfs')
12 files changed, 83 insertions, 87 deletions
diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb index 6f70edd09a..0b305f085c 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot-cfg_0.1.bb @@ -50,9 +50,9 @@ APPEND=${CMDLINE} ${CMDLINE_DEBUG} } do_install () { - install -d ${D}/boot - install -m 0644 boot.cfg ${D}/boot/boot.cfg - install -m 0644 icon.xpm ${D}/boot/icon.xpm + install -d ${D}/boot + install -m 0644 boot.cfg ${D}/boot/boot.cfg + install -m 0644 icon.xpm ${D}/boot/icon.xpm } PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc b/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc index 2a53f96ac3..b06293cc1b 100644 --- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc +++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot.inc @@ -38,12 +38,12 @@ inherit autotools EXTRA_OECONF = "--enable-delay=2 --enable-evdev-rate=1000,250" do_install () { - install -d ${D}${bindir} - install -m 0755 kexecboot ${D}${bindir}/ - install -d ${D}/proc - install -d ${D}/mnt - install -d ${D}/dev - install -d ${D}/sys + install -d ${D}${bindir} + install -m 0755 kexecboot ${D}${bindir}/ + install -d ${D}/proc + install -d ${D}/mnt + install -d ${D}/dev + install -d ${D}/sys } PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -51,5 +51,5 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" FILES_${PN} += " ${bindir}/kexecboot /init /proc /mnt /dev /sys" pkg_postinst_${PN} () { - ln -sf ${bindir}/kexecboot $D/init + ln -sf ${bindir}/kexecboot $D/init } diff --git a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb index 56456f7a82..0c187d2a3e 100644 --- a/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klcc-cross_2.0.2.bb @@ -14,14 +14,14 @@ FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" inherit cross do_configure () { - : + : } do_compile() { - oe_runmake klcc + oe_runmake klcc } do_install() { - install -d ${D}${base_bindir} - install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc + install -d ${D}${base_bindir} + install -m 0755 klcc/klcc ${D}${base_bindir}/${TARGET_PREFIX}klcc } diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb index 484134e44b..ffad585d6a 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-static-utils_2.0.2.bb @@ -6,7 +6,7 @@ KLIBC_UTILS_PKGNAME = "klibc-static-utils" FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" do_install() { - : + : } PACKAGES_${PN} = "${PN}" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc index cdcaafa55b..a626c9696e 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils.inc @@ -4,55 +4,54 @@ KLIBC_UTILS_PKGNAME ?= "klibc-utils" # losetup goes in ${base_sbindir} do_install_append() { + install -d ${D}${base_bindir} + install -d ${D}${base_sbindir} - install -d ${D}${base_bindir} - install -d ${D}${base_sbindir} + # debian packages kinit + kinit.shared but only sh.shared + if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then + install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit + install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared + install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared + else + install -m 755 usr/dash/sh ${D}${base_bindir}/sh + install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit + fi - # debian packages kinit + kinit.shared but only sh.shared - if [ "${KLIBC_UTILS_VARIANT}" = "shared" ]; then - install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit - install -m 755 usr/kinit/kinit.shared ${D}${base_bindir}/kinit.shared - install -m 755 usr/dash/sh.shared ${D}${base_bindir}/sh.shared - else - install -m 755 usr/dash/sh ${D}${base_bindir}/sh - install -m 755 usr/kinit/kinit ${D}${base_bindir}/kinit - fi - - install -m 755 usr/gzip/gzip ${D}${base_bindir} - install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir} - install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir} - install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir} - install -m 755 usr/kinit/resume/${KLIBC_UTILS_VARIANT}/resume ${D}${base_bindir} - install -m 755 usr/kinit/run-init/${KLIBC_UTILS_VARIANT}/run-init ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cat ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/chroot ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cpio ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dd ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/false ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/halt ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/kill ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ln ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/minips ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/poweroff ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/readlink ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/reboot ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sleep ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} - install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} - ln -s gzip ${D}${base_bindir}/gunzip - ln -s gzip ${D}${base_bindir}/zcat + install -m 755 usr/gzip/gzip ${D}${base_bindir} + install -m 755 usr/kinit/fstype/${KLIBC_UTILS_VARIANT}/fstype ${D}${base_bindir} + install -m 755 usr/kinit/ipconfig/${KLIBC_UTILS_VARIANT}/ipconfig ${D}${base_bindir} + install -m 755 usr/kinit/nfsmount/${KLIBC_UTILS_VARIANT}/nfsmount ${D}${base_bindir} + install -m 755 usr/kinit/resume/${KLIBC_UTILS_VARIANT}/resume ${D}${base_bindir} + install -m 755 usr/kinit/run-init/${KLIBC_UTILS_VARIANT}/run-init ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cat ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/chroot ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/cpio ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dd ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/dmesg ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/false ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/halt ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/kill ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ln ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/losetup ${D}${base_sbindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/ls ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/minips ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkdir ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mkfifo ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mknod ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mount ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/mv ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/nuke ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/pivot_root ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/poweroff ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/readlink ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/reboot ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sleep ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/sync ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/true ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/umount ${D}${base_bindir} + install -m 755 usr/utils/${KLIBC_UTILS_VARIANT}/uname ${D}${base_bindir} + ln -s gzip ${D}${base_bindir}/gunzip + ln -s gzip ${D}${base_bindir}/zcat } EXTRA_KLIBC_DEPS = '${@base_conditional("KLIBC_UTILS_VARIANT", "shared", "${THIS_LIBKLIBC}", "", d)}' diff --git a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb index 37cab84c52..96fd19e507 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc-utils_2.0.2.bb @@ -6,7 +6,7 @@ KLIBC_UTILS_PKGNAME = "klibc-utils" FILESPATH =. "${FILE_DIRNAME}/klibc-${PV}:" do_install() { - : + : } PACKAGES_${PN} = "${PN}" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index fa31f73d15..a4937fa5ec 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -28,26 +28,25 @@ SRC_URI = "git://git.kernel.org/pub/scm/libs/klibc/klibc.git;protocol=git" SRC_URI_append_linux-gnueabi = " file://klibc-config-eabi.patch \ file://armv4-fix-v4bx.patch \ - " +" SRC_URI_append_linux-uclibceabi = " file://klibc-config-eabi.patch \ file://armv4-fix-v4bx.patch \ - " +" SRC_URI += "file://klibc-linux-libc-dev.patch \ file://prefix.patch \ file://staging.patch \ - " +" S = "${WORKDIR}/git" EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 'CROSS_COMPILE=${TARGET_PREFIX}' \ 'KLIBCKERNELSRC=${STAGING_DIR_TARGET}${exec_prefix}' \ - " +" do_configure () { - - ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux + ln -sf "${STAGING_DIR_TARGET}${exec_prefix}" linux } THIS_LIBKLIBC = "libklibc (= ${PV}-${PR})" diff --git a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb index 8eaab2c447..4ec989fafd 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb +++ b/meta-initramfs/recipes-devtools/klibc/klibc_2.0.2.bb @@ -3,19 +3,17 @@ PR = "${INC_PR}.0" export INST = "${D}" do_install() { + oe_runmake install - oe_runmake install - - # the crosscompiler is packaged by klcc-cross - # remove klcc - rm ${D}${base_bindir}/klcc - # remove now empty dir - rmdir ${D}${base_bindir} - - install -d ${D}${base_libdir} - install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} - (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) + # the crosscompiler is packaged by klcc-cross + # remove klcc + rm ${D}${base_bindir}/klcc + # remove now empty dir + rmdir ${D}${base_bindir} + install -d ${D}${base_libdir} + install -m 755 usr/klibc/klibc-*.so ${D}${base_libdir} + (cd ${D}${base_libdir}; ln -s klibc-*.so klibc.so) } PACKAGES = "libklibc libklibc-staticdev libklibc-dev" @@ -24,5 +22,5 @@ FILES_libklibc-staticdev = "${base_libdir}/klibc/lib/libc.a" FILES_libklibc-dev = "${base_libdir}/klibc.so \ ${base_libdir}/klibc/lib/* \ ${base_libdir}/klibc/include/* \ - " +" require klibc.inc diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb index 5cdd984b2b..e00fc3065b 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.0.bb @@ -16,7 +16,7 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=ca39eb1d98e736 file://libubi.c.patch \ file://libiniparser.c.patch \ file://ubiformat.c.patch \ - " +" S = "${WORKDIR}/git/" diff --git a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb index 9c804bece3..90b876cdde 100644 --- a/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb +++ b/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb @@ -12,7 +12,7 @@ SRC_URI += "file://elf.patch \ file://string.patch \ file://syscall.patch \ file://other.patch \ - " +" S = "${WORKDIR}/kexec-tools-${PV}" diff --git a/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.2.bb b/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.2.bb index edf8f3fb61..d4798e8991 100644 --- a/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.2.bb +++ b/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.2.bb @@ -9,9 +9,9 @@ KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-yocto-tiny-kexecboot-${MACHINE} INITRAMFS_IMAGE = "initramfs-kexecboot-klibc-image" do_populate_sysroot() { - : + : } do_install() { - : + : } diff --git a/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.4.bb b/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.4.bb index 47215b5087..189f87b7ac 100644 --- a/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.4.bb +++ b/meta-initramfs/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.4.bb @@ -9,9 +9,9 @@ KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-yocto-tiny-kexecboot-${MACHINE} INITRAMFS_IMAGE = "initramfs-kexecboot-klibc-image" do_populate_sysroot() { - : + : } do_install() { - : + : } |