From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6737648137041608704 X-Received: by 2002:a17:907:215a:: with SMTP id rk26mr5022167ejb.49.1568730952083; Tue, 17 Sep 2019 07:35:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:9796:: with SMTP id e22ls892012edb.14.gmail; Tue, 17 Sep 2019 07:35:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyFym3Jrf/b0jNCblVMQC6e0NoKy8PBH6FkxvGu+flOducxdBgRcEfHYcjwWqCItBXrSXut X-Received: by 2002:a50:9fe5:: with SMTP id c92mr5024654edf.280.1568730951698; Tue, 17 Sep 2019 07:35:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568730951; cv=none; d=google.com; s=arc-20160816; b=v1jP2FD8PpJMaKgSC+oS2clrVZ5LQps7t2SpjdBC0pC47ZrHr005hpmgy7SI/qI5IY k027nPulj6s9f6/HWkxO2AGOIFr0Da1ODSGJw7F3ti84phmCmE2HNkFiSaoG78vG3hP+ fioAl/oxgace+hsYUOXWCy737VIzIYN6bqSLRyTMnmuYIY16PosciqyKmH2UD1OGa1ya j717pE1tANeZ14p/U8ZsiyobSg6LhGm7+kz2Kg7aPsmOISb6k1GlIJQHW/P3lQwEMSoU 70vGnNA35yGk1t+awkgJ5m1UYnboGfyLp3L+j+Vv4uAeBmx0T6RJV3tM1RriVBfFVcuK qqEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=KzUtARKPPe7Nqm8+kkrdMnAz9L3al97C9fKKY4mvaAA=; b=yVw2XmjId0vkSXUZuXySKDk4uPW9QX5TaoYsWECAvRUkQKwClL/wNaQuWiqzQ/s8xo 4pVe3JQhwk3mj2kvWb8no5vkX6mypteGyADKueye1+DSOfDbECVn1b8gL6F6jQPDdgej TezBnsHo3VjiHaZqDR40ZSSkwUli0Y9TuInbpAK++zN9aQQPnQU2GGNvIzGwZfBEKgdf rAz6zGf62QiJCHXrwxBq9WUgVcnkD2LlD6gQ0fa1s6Z+FRcZvyLhon0XaNNgUd+zMgyQ CX25E762S+Gtf39kuyyapkf9Gwv0j8U9Zh9vokv1EH1TOxSZYqU/aJXVnVOe0iVqfJ7b 9hig== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id v25si177335edw.5.2019.09.17.07.35.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Sep 2019 07:35:51 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x8HEZpm7019222 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 17 Sep 2019 16:35:51 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.68.240]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x8HEZpBd008004; Tue, 17 Sep 2019 16:35:51 +0200 From: Henning Schild To: isar-users Cc: Henning Schild Subject: [PATCH] meta: correct CamelCase spelling of APT options Date: Tue, 17 Sep 2019 16:35:50 +0200 Message-Id: <20190917143550.18641-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: qh2I7YqrckWF From: Henning Schild This is a purely cosmetic change aligning us with the spelling used in the documentation, no functional change. The other spelling obviously worked as well, but better stick to what the docs say. Signed-off-by: Henning Schild --- meta/classes/dpkg-base.bbclass | 4 ++-- meta/classes/image-tools-extension.bbclass | 4 ++-- meta/classes/rootfs.bbclass | 4 ++-- meta/recipes-devtools/buildchroot/files/deps.sh | 8 ++++---- meta/recipes-kernel/linux/linux-custom.inc | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 39c8acb..99f3edf 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -32,8 +32,8 @@ do_apt_fetch() { dpkg_do_mounts E="${@ bb.utils.export_proxies(d)}" sudo -E chroot ${BUILDCHROOT_DIR} /usr/bin/apt-get update \ - -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \ - -o Dir::Etc::sourceparts="-" \ + -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ + -o Dir::Etc::SourceParts="-" \ -o APT::Get::List-Cleanup="0" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ sh -c 'cd ${PP} && apt-get -y source ${SRC_APT}' diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index ca94d49..2d8a777 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -27,8 +27,8 @@ do_install_imager_deps() { E="${@bb.utils.export_proxies(d)}" sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get update \ - -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \ - -o Dir::Etc::sourceparts="-" \ + -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ + -o Dir::Etc::SourceParts="-" \ -o APT::Get::List-Cleanup="0" apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index c7e0435..83c2475 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -95,8 +95,8 @@ ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update" rootfs_install_pkgs_update[weight] = "5" rootfs_install_pkgs_update() { sudo -E chroot '${ROOTFSDIR}' /usr/bin/apt-get update \ - -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \ - -o Dir::Etc::sourceparts="-" \ + -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ + -o Dir::Etc::SourceParts="-" \ -o APT::Get::List-Cleanup="0" } diff --git a/meta/recipes-devtools/buildchroot/files/deps.sh b/meta/recipes-devtools/buildchroot/files/deps.sh index 1963943..545adcd 100644 --- a/meta/recipes-devtools/buildchroot/files/deps.sh +++ b/meta/recipes-devtools/buildchroot/files/deps.sh @@ -16,13 +16,13 @@ install_cmd="apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends \ # Make sure that we have latest isar-apt content. # Options meaning: -# Dir::Etc::sourcelist - specifies which source to be used -# Dir::Etc::sourceparts - disables looking for the other sources +# Dir::Etc::SourceList - specifies which source to be used +# Dir::Etc::SourceParts - disables looking for the other sources # APT::Get::List-Cleanup - do not erase obsolete packages list for # upstream in '/var/lib/apt/lists' apt-get update \ - -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \ - -o Dir::Etc::sourceparts="-" \ + -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ + -o Dir::Etc::SourceParts="-" \ -o APT::Get::List-Cleanup="0" # Install all build deps diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index ee5f20c..007d9e2 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -31,8 +31,8 @@ do_install_builddeps() { E="${@ bb.utils.export_proxies(d)}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get update \ - -o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \ - -o Dir::Etc::sourceparts="-" \ + -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ + -o Dir::Etc::SourceParts="-" \ -o APT::Get::List-Cleanup="0" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install \ -- 2.21.0