From 68e1462d95f8bdac57ce74e4583d92af8f754b40 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 27 Jan 2007 21:01:31 +0000 Subject: ixp4xx-related files: Replaced IXP4XX_MACHINE_ENDIAN with SITEINFO_ENDIANESS throughout OE, removing all instances of ixp4xx-specific ENDIAN checks in the OE metadata. --- packages/images/slugos-image.bb | 6 ++-- packages/ixp425-eth/ixp400-eth_1.4.bb | 2 +- packages/ixp425-eth/ixp400-eth_1.5.1.bb | 2 +- packages/ixp425-eth/ixp400-eth_1.5.bb | 2 +- packages/ixp4xx/ixp-osal_2.0.bb | 2 +- packages/ixp4xx/ixp-osal_2.1.1.bb | 2 +- packages/ixp4xx/ixp-osal_2.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.0.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.1.1.bb | 2 +- packages/ixp4xx/ixp4xx-csr_2.1.bb | 2 +- packages/linux/ixp4xx-kernel.inc | 62 ++++++++++++++++---------------- packages/obsolete/nslu2/nslu2-kernel.inc | 4 +-- 12 files changed, 45 insertions(+), 45 deletions(-) (limited to 'packages') diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index a0be935613..64b7d8b8e0 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -123,7 +123,7 @@ slugos_pack_image() { ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ ${DEPLOY_DIR_IMAGE}/slug/ install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${IXP4XX_MACHINE_ENDIAN} \ + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/slug/vmlinuz install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 @@ -137,7 +137,7 @@ slugos_pack_image() { # Create an image for the DSM-G600 as well install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${IXP4XX_MACHINE_ENDIAN} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz @@ -154,7 +154,7 @@ slugos_pack_image() { # Create an image for the NAS 100d as well install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${IXP4XX_MACHINE_ENDIAN} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb index ad20f51b6b..6b1ff0c8d2 100644 --- a/packages/ixp425-eth/ixp400-eth_1.4.bb +++ b/packages/ixp425-eth/ixp400-eth_1.4.bb @@ -28,7 +28,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb index 66e765940e..2fa04fc672 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb @@ -39,7 +39,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1" # The following controls the name of the ethernet devices which get diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index a708bd96f4..5e25deb1d4 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -38,7 +38,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1" # The following controls the name of the ethernet devices which get diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb index 03fb7fbdb3..009d45d67a 100644 --- a/packages/ixp4xx/ixp-osal_2.0.bb +++ b/packages/ixp4xx/ixp-osal_2.0.bb @@ -33,7 +33,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb index 8a43d49117..481033fd0a 100644 --- a/packages/ixp4xx/ixp-osal_2.1.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.1.bb @@ -49,7 +49,7 @@ do_pre_patch () { addtask pre_patch before do_patch -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb index 8b1bce6720..dd70289598 100644 --- a/packages/ixp4xx/ixp-osal_2.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.bb @@ -37,7 +37,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb index fefb98858f..a160fe4609 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.0.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb @@ -38,7 +38,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" OSAL_PATH = "lib/ixp425/linux/${IX_TARGET}" # This is a somewhat arbitrary choice: diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb index 6d4c9d8c02..cc063b523e 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb @@ -53,7 +53,7 @@ do_pre_patch () { addtask pre_patch before do_patch -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index 9be5072f29..e72de05071 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -46,7 +46,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 28b8d3b559..1a064a17e5 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -186,7 +186,7 @@ EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'" do_configure_prepend() { rm -f ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${IXP4XX_MACHINE_ENDIAN}' = be + if test '${SITEINFO_ENDIANESS}' = be then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi @@ -246,70 +246,70 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${MACHINE_ARCH}-${KERNEL_VERSION nslu2_MACHID = "597" PACKAGES += "kernel-image-nslu2" PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2" -FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-nslu2 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-nslu2 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for Loft: loft_MACHID = "849" PACKAGES += "kernel-image-loft" PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-loft = "loft${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-loft = "loft${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board" -FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-loft () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-loft () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the NAS100D board: nas100d_MACHID = "865" PACKAGES += "kernel-image-nas100d" PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-nas100d = "nas100d${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-nas100d = "nas100d${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D" -FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-nas100d () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-nas100d () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the DSMG600 board: dsmg600_MACHID = "964" PACKAGES += "kernel-image-dsmg600" PKG_kernel-image-dsmg600 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-dsmg600 = "Linux kernel for the D-Link DSM-G600" -FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-dsmg600 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-dsmg600 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the FSG-3 board: fsg3_MACHID = "1091" PACKAGES += "kernel-image-fsg3" PKG_kernel-image-fsg3 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-fsg3 = "Linux kernel for the Freecom FSG-3" -FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-fsg3 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-fsg3 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } #FIXUP: the correct instructions to copy the kernel prepended with the le fixup @@ -356,11 +356,11 @@ do_install_append() { install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes - install_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}' - install_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}' - install_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}' - install_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}' - install_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}' + install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' + install_image 'loft${SITEINFO_ENDIANESS}' '${loft_MACHID}' + install_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' + install_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' + install_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' } do_deploy[dirs] = "${S}" @@ -374,11 +374,11 @@ do_deploy() { deploy_image '${MACHINE_ARCH}' # And the machine specific images - deploy_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}' - deploy_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}' - deploy_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}' - deploy_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}' - deploy_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}' + deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' + deploy_image 'loft${SITEINFO_ENDIANESS}' '${loft_MACHID}' + deploy_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}' + deploy_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}' + deploy_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}' } addtask deploy before do_build after do_compile diff --git a/packages/obsolete/nslu2/nslu2-kernel.inc b/packages/obsolete/nslu2/nslu2-kernel.inc index a622c50f08..6b866100ca 100644 --- a/packages/obsolete/nslu2/nslu2-kernel.inc +++ b/packages/obsolete/nslu2/nslu2-kernel.inc @@ -150,7 +150,7 @@ N2K_PATCHES ?= "" # Image suffix - actually set in conf/machine/nslu2.conf as it is also # used by anything which needs to know the name of the generated image. # Should be overridden in the distro if patches or defconfig are changed. -N2K_SUFFIX ?= "nslu2${IXP4XX_MACHINE_ENDIAN}" +N2K_SUFFIX ?= "nslu2${SITEINFO_ENDIANESS}" SRC_URI = "${N2K_SRCURI}" SRC_URI += "${N2K_PATCHES}" @@ -186,7 +186,7 @@ addtask unpacklocal before do_patch after do_unpack do_configure_prepend() { rm -f ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${IXP4XX_MACHINE_ENDIAN}' = be + if test '${SITEINFO_ENDIANESS}' = be then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi -- cgit v1.2.3