From patchwork Thu Jul 30 14:47:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?No=C3=A9=20Rubinstein?= X-Patchwork-Id: 502182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id BD5C81402A5 for ; Fri, 31 Jul 2015 00:48:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=jHm7YlKd; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 04D47A46D5; Thu, 30 Jul 2015 14:48:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vD35rIOgvj0t; Thu, 30 Jul 2015 14:47:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DAD20A46DF; Thu, 30 Jul 2015 14:47:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 148181C226C for ; Thu, 30 Jul 2015 14:47:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1016591E55 for ; Thu, 30 Jul 2015 14:47:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LyFHyZTyOR8p for ; Thu, 30 Jul 2015 14:47:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2018E91E65 for ; Thu, 30 Jul 2015 14:47:43 +0000 (UTC) Received: by wicgb10 with SMTP id gb10so247398283wic.1 for ; Thu, 30 Jul 2015 07:47:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=QmLXXZ68S17RIn3Dhi9qLIBeLDcWYK7XKKN1vh/WBTc=; b=jHm7YlKdXPiTiegVEJ54NogJe+dMhuuQky2eHnh1126BPx/DikvVquSdRleOUUNHhC Ok59AAu5wwLrDDJ2W5bHaTillzJ40NBlEZ8ypeRJevYGxgJDfZgNeFXbqH5WDJD3Mwbl q4ZUAN/+giLyhepkoT+yItpA2TKr/cgEL3pCU+9XdK6xOcGald3m5euUDiaVMVC3PGR7 BCpIIbjLrXiHSdaHa7h10AjREE1wm0hTZynpOFWraSU1ablmFFMtn+W2nFFsyZKfbqBj etAO412oVqlaD4MEADYZXmXrzmkuOjvO+lnfAYSrfTzY3n25z5zhEDkeCdS2EC/k2iha LjNw== X-Received: by 10.180.149.206 with SMTP id uc14mr7406248wib.12.1438267662374; Thu, 30 Jul 2015 07:47:42 -0700 (PDT) Received: from nrubinstein-de.aldebaran.lan ([195.190.86.18]) by smtp.gmail.com with ESMTPSA id ul1sm2221745wjc.30.2015.07.30.07.47.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Jul 2015 07:47:41 -0700 (PDT) From: "=?UTF-8?q?No=C3=A9=20Rubinstein?=" X-Google-Original-From: =?UTF-8?q?No=C3=A9=20Rubinstein?= To: buildroot@busybox.net Date: Thu, 30 Jul 2015 16:47:30 +0200 Message-Id: <1438267651-16818-1-git-send-email-nrubinstein@aldebaran.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 1/2] fs/iso9660: fix hybrid image support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" *_POST_GEN_HOOKS was never merged. Suggested by Thomas Petazzoni Signed-off-by: Noé Rubinstein --- fs/iso9660/iso9660.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk index d836194..9100547 100644 --- a/fs/iso9660/iso9660.mk +++ b/fs/iso9660/iso9660.mk @@ -146,15 +146,14 @@ endif # ROOTFS_ISO9660_USE_INITRD define ROOTFS_ISO9660_CMD $(HOST_DIR)/usr/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - -o $@ $(ROOTFS_ISO9660_TARGET_DIR) + -o $@ $(ROOTFS_ISO9660_TARGET_DIR) \ + $(if $(ROOTFS_ISO9660_GEN_HYBRID), && $(ROOTFS_ISO9660_GEN_HYBRID)) endef ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y) define ROOTFS_ISO9660_GEN_HYBRID $(HOST_DIR)/usr/bin/isohybrid -t 0x96 $@ endef - -ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_GEN_HYBRID endif $(eval $(call ROOTFS_TARGET,iso9660))